nand_block_t -> struct nand_block

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

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 26eb63ad20ae92bb86ba2f9f49e3059029db623e..1100205a906922b5a0f5f3af6f3a647a5bda4898 100644 (file)
--- 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,
@@ -602,7 +602,7 @@ int nand_probe(struct nand_device_s *nand)
        }
 
        nand->num_blocks = (nand->device->chip_size * 1024) / (nand->erase_size / 1024);
-       nand->blocks = malloc(sizeof(nand_block_t) * nand->num_blocks);
+       nand->blocks = malloc(sizeof(struct nand_block) * nand->num_blocks);
 
        for (i = 0; i < nand->num_blocks; i++)
        {
@@ -1292,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)
@@ -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;