ioutil: make the file compile on MacOS

[fw/openocd] / src / flash / ocl / at91sam7x / main.c

diff --git a/src/flash/ocl/at91sam7x/main.c b/src/flash/ocl/at91sam7x/main.c
index c65a171da2aea08e61adbf699d34f0f93c81754c..e4c0c3faa87a9fb81717c5895d557b3e2aac203f 100644 (file)
--- a/src/flash/ocl/at91sam7x/main.c
+++ b/src/flash/ocl/at91sam7x/main.c
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "platform.h"
 
-#include "ocl.h"
+#include <flash/nor/ocl.h>
 #include "dcc.h"
 #include "samflash.h"
 
@@ -43,15 +43,15 @@ void cmd_flash(uint32 cmd)
        len = cmd&0xffff;
        ofs = adr%flash_page_size;
        bi_start = ofs/4;
-       bi_end = (ofs+len+3)/4;
+       bi_end = (ofs + len + 3)/4;
 
-       if (bi_end>BUFSIZE) {
+       if (bi_end > BUFSIZE) {
                dcc_wr(OCL_BUFF_OVER);
                return;
        }
 
        chksum = OCL_CHKS_INIT;
-       for (bi = 0; bi<bi_end; bi++) chksum^=buffer[bi]=dcc_rd();
+       for (bi = 0; bi < bi_end; bi++) chksum^=buffer[bi]=dcc_rd();
 
        if (dcc_rd() != chksum) {
                dcc_wr(OCL_CHKS_FAIL);
@@ -59,20 +59,20 @@ void cmd_flash(uint32 cmd)
        }
 
        /* fill in unused positions with unprogrammed values */
-       for (bi = 0; bi<bi_start; bi++) buffer[bi]=0xffffffff;
+       for (bi = 0; bi < bi_start; bi++) buffer[bi]=0xffffffff;
        for (bi = bi_end; bi%flash_page_size; bi++) buffer[bi]=0xffffffff;
 
        result = 0;
        pagenum = adr/flash_page_size;
-       for (bi = 0; bi<bi_end; bi += flash_page_size/4) {
-               result = flash_page_program(buffer+bi, pagenum++);
+       for (bi = 0; bi < bi_end; bi += flash_page_size/4) {
+               result = flash_page_program(buffer + bi, pagenum++);
                if (result) break;
        }
 
        /* verify written data */
-       if (!result) result = flash_verify(adr, len, ((uint8 *)buffer)+ofs);
+       if (!result) result = flash_verify(adr, len, ((uint8 *)buffer) + ofs);
 
-       dcc_wr(OCL_CMD_DONE|result);
+       dcc_wr(OCL_CMD_DONE | result);
 }
 
 
@@ -84,14 +84,14 @@ int main (void)
                cmd = dcc_rd();
                switch (cmd&OCL_CMD_MASK) {
                        case OCL_PROBE:
-                               dcc_wr(OCL_CMD_DONE|flash_init());
+                               dcc_wr(OCL_CMD_DONE | flash_init());
                                dcc_wr(0x100000); /* base */
                                dcc_wr(flash_page_count*flash_page_size); /* size */
                                dcc_wr(1); /* num_sectors */
                                dcc_wr(4096 | ((unsigned long) flash_page_size << 16)); /* buflen and bufalign */
                                break;
                        case OCL_ERASE_ALL:
-                               dcc_wr(OCL_CMD_DONE|flash_erase_all());
+                               dcc_wr(OCL_CMD_DONE | flash_erase_all());
                                break;
                        case OCL_FLASH_BLOCK:
                                cmd_flash(cmd);