X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Fnand.c;h=794836127d166944459a2a1f176d7adc5783341f;hb=92fc7a6fdecac39ebc890ee3c2ae91f3fd50fdc5;hp=181700d04f183170e0274f7e17a702c5e66dd9df;hpb=cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e;p=openocd

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 181700d0..79483612 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -35,18 +35,18 @@ static int nand_write_page(struct nand_device_s *nand, uint32_t page, uint8_t *d
 
 /* NAND flash controller
  */
-extern nand_flash_controller_t davinci_nand_controller;
-extern nand_flash_controller_t lpc3180_nand_controller;
-extern nand_flash_controller_t orion_nand_controller;
-extern nand_flash_controller_t s3c2410_nand_controller;
-extern nand_flash_controller_t s3c2412_nand_controller;
-extern nand_flash_controller_t s3c2440_nand_controller;
-extern nand_flash_controller_t s3c2443_nand_controller;
-extern nand_flash_controller_t imx31_nand_flash_controller;
-
-/* extern nand_flash_controller_t boundary_scan_nand_controller; */
-
-static nand_flash_controller_t *nand_flash_controllers[] =
+extern struct nand_flash_controller davinci_nand_controller;
+extern struct nand_flash_controller lpc3180_nand_controller;
+extern struct nand_flash_controller orion_nand_controller;
+extern struct nand_flash_controller s3c2410_nand_controller;
+extern struct nand_flash_controller s3c2412_nand_controller;
+extern struct nand_flash_controller s3c2440_nand_controller;
+extern struct nand_flash_controller s3c2443_nand_controller;
+extern struct nand_flash_controller imx31_nand_flash_controller;
+
+/* extern struct nand_flash_controller boundary_scan_nand_controller; */
+
+static struct nand_flash_controller *nand_flash_controllers[] =
 {
 	&davinci_nand_controller,
 	&lpc3180_nand_controller,
@@ -74,7 +74,7 @@ static command_t *nand_cmd;
  *	256	256 Byte page size
  *	512	512 Byte page size
  */
-static nand_info_t nand_flash_ids[] =
+static struct nand_info nand_flash_ids[] =
 {
 	/* start "museum" IDs */
 	{"NAND 1MiB 5V 8-bit",		0x6e, 256, 1, 0x1000, 0},
@@ -154,7 +154,7 @@ static nand_info_t nand_flash_ids[] =
 
 /* Manufacturer ID list
  */
-static nand_manufacturer_t nand_manuf_ids[] =
+static struct nand_manufacturer nand_manuf_ids[] =
 {
 	{0x0, "unknown"},
 	{NAND_MFR_TOSHIBA, "Toshiba"},
@@ -173,7 +173,7 @@ static nand_manufacturer_t nand_manuf_ids[] =
  */
 
 #if 0
-static nand_ecclayout_t nand_oob_8 = {
+static struct nand_ecclayout nand_oob_8 = {
 	.eccbytes = 3,
 	.eccpos = {0, 1, 2},
 	.oobfree = {
@@ -184,7 +184,7 @@ static nand_ecclayout_t nand_oob_8 = {
 };
 #endif
 
-static nand_ecclayout_t nand_oob_16 = {
+static struct nand_ecclayout nand_oob_16 = {
 	.eccbytes = 6,
 	.eccpos = {0, 1, 2, 3, 6, 7},
 	.oobfree = {
@@ -192,7 +192,7 @@ static nand_ecclayout_t nand_oob_16 = {
 		 . length = 8}}
 };
 
-static nand_ecclayout_t nand_oob_64 = {
+static struct nand_ecclayout nand_oob_64 = {
 	.eccbytes = 24,
 	.eccpos = {
 		   40, 41, 42, 43, 44, 45, 46, 47,
@@ -241,7 +241,8 @@ COMMAND_HANDLER(handle_nand_device_command)
 			c->use_raw = 0;
 			c->next = NULL;
 
-			if ((retval = nand_flash_controllers[i]->nand_device_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK)
+			retval = CALL_COMMAND_HANDLER(nand_flash_controllers[i]->nand_device_command, c);
+			if (ERROR_OK != retval)
 			{
 				LOG_ERROR("'%s' driver rejected nand flash", c->controller->name);
 				free(c);
@@ -1291,7 +1292,7 @@ COMMAND_HANDLER(handle_nand_write_command)
 	uint32_t buf_cnt;
 	enum oob_formats oob_format = NAND_OOB_NONE;
 
-	fileio_t fileio;
+	struct fileio fileio;
 
 
 	if (argc < 3)
@@ -1314,8 +1315,7 @@ COMMAND_HANDLER(handle_nand_write_command)
 
 	if (argc > 3)
 	{
-		int i;
-		for (i = 3; i < argc; i++)
+		for (unsigned i = 3; i < argc; i++)
 		{
 			if (!strcmp(args[i], "oob_raw"))
 				oob_format |= NAND_OOB_RAW;
@@ -1469,7 +1469,7 @@ COMMAND_HANDLER(handle_nand_dump_command)
 		return ERROR_OK;
 	}
 
-	fileio_t fileio;
+	struct fileio fileio;
 
 	uint8_t *page = NULL;
 	uint32_t page_size = 0;
@@ -1484,8 +1484,7 @@ COMMAND_HANDLER(handle_nand_dump_command)
 
 	if (argc > 4)
 	{
-		int i;
-		for (i = 4; i < argc; i++)
+		for (unsigned i = 4; i < argc; i++)
 		{
 			if (!strcmp(args[i], "oob_raw"))
 				oob_format |= NAND_OOB_RAW;