delete long retired commented out code (daemon_startup)

[openocd.git] / src / flash / nand.c

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 87ab48711944e10b80601b35cce3bfc5018680ac..f27224115c4d6685bceb931f0a5a2d029bcf22ad 100644 (file)
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -311,9 +311,9 @@ int nand_init(struct command_context_s *cmd_ctx)
                                                 "erase blocks on NAND flash device <num> <offset> <length>");
                register_command(cmd_ctx, nand_cmd, "dump", handle_nand_dump_command, COMMAND_EXEC,
                                                 "dump from NAND flash device <num> <filename> "
-                                                "<offset> <length> [oob_raw|oob_only]");
+                                                "<offset> <length> [oob_raw | oob_only]");
                register_command(cmd_ctx, nand_cmd, "write", handle_nand_write_command, COMMAND_EXEC,
-                                                "write to NAND flash device <num> <filename> <offset> [oob_raw|oob_only|oob_softecc|oob_softecc_kw]");
+                                                "write to NAND flash device <num> <filename> <offset> [oob_raw | oob_only | oob_softecc | oob_softecc_kw]");
                register_command(cmd_ctx, nand_cmd, "raw_access", handle_nand_raw_access_command, COMMAND_EXEC,
                                                 "raw access to NAND flash device <num> ['enable'|'disable']");
        }
@@ -518,9 +518,9 @@ int nand_probe(struct nand_device_s *device)
        {
                if (device->bus_width == 8)
                {
-                       device->controller->read_data(device, id_buff+3);
-                       device->controller->read_data(device, id_buff+4);
-                       device->controller->read_data(device, id_buff+5);
+                       device->controller->read_data(device, id_buff + 3);
+                       device->controller->read_data(device, id_buff + 4);
+                       device->controller->read_data(device, id_buff + 5);
                }
                else
                {
@@ -736,7 +736,7 @@ static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8
 
        page = malloc(device->page_size);
 
-       while (data_size > 0 )
+       while (data_size > 0)
        {
                uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size;
                uint32_t page_address;
@@ -773,7 +773,7 @@ static int nand_write_plain(struct nand_device_s *device, uint32_t address, uint
 
        page = malloc(device->page_size);
 
-       while (data_size > 0 )
+       while (data_size > 0)
        {
                uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size;
                uint32_t page_address;
@@ -1138,9 +1138,13 @@ static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd
                                else
                                        bad_state = " (block condition unknown)";
 
-                               command_print(cmd_ctx, "\t#%i: 0x%8.8x (%dkB) %s%s",
-                                                       j, p->blocks[j].offset, p->blocks[j].size / 1024,
-                                                       erase_state, bad_state);
+                               command_print(cmd_ctx,
+                                             "\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
+                                             j,
+                                             p->blocks[j].offset,
+                                             p->blocks[j].size / 1024,
+                                             erase_state,
+                                             bad_state);
                        }
                }
                else
@@ -1416,7 +1420,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
                                uint8_t ecc[3];
                                memset(oob, 0xff, oob_size);
                                for (i = 0, j = 0; i < page_size; i += 256) {
-                                       nand_calculate_ecc(p, page+i, ecc);
+                                       nand_calculate_ecc(p, page + i, ecc);
                                        oob[eccpos[j++]] = ecc[0];
                                        oob[eccpos[j++]] = ecc[1];
                                        oob[eccpos[j++]] = ecc[2];
@@ -1433,7 +1437,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
                                uint8_t *ecc = oob + oob_size - page_size/512 * 10;
                                memset(oob, 0xff, oob_size);
                                for (i = 0; i < page_size; i += 512) {
-                                       nand_calculate_ecc_kw(p, page+i, ecc);
+                                       nand_calculate_ecc_kw(p, page + i, ecc);
                                        ecc += 10;
                                }
                        }
@@ -1449,7 +1453,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
 
                        if (nand_write_page(p, offset / p->page_size, page, page_size, oob, oob_size) != ERROR_OK)
                        {
-                               command_print(cmd_ctx, "failed writing file %s to NAND flash %s at offset 0x%8.8x",
+                               command_print(cmd_ctx, "failed writing file %s to NAND flash %s at offset 0x%8.8" PRIx32 "",
                                        args[1], args[0], offset);
 
                                fileio_close(&fileio);
@@ -1467,7 +1471,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
                oob = NULL;
                page = NULL;
                duration_stop_measure(&duration, &duration_text);
-               command_print(cmd_ctx, "wrote file %s to NAND flash %s up to offset 0x%8.8x in %s",
+               command_print(cmd_ctx, "wrote file %s to NAND flash %s up to offset 0x%8.8" PRIx32 " in %s",
                        args[1], args[0], offset, duration_text);
                free(duration_text);
                duration_text = NULL;