C99 printf() -Werror fixes
[fw/openocd] / src / flash / lpc3180_nand_controller.c
index ffe7ce2b825b0544cdb1f39ecda05f6cb646ce1a..de6d4e2bf8f7fccc62f439ae381e493e3c3b4b23 100644 (file)
@@ -28,12 +28,12 @@ static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char *
 static int lpc3180_register_commands(struct command_context_s *cmd_ctx);
 static int lpc3180_init(struct nand_device_s *device);
 static int lpc3180_reset(struct nand_device_s *device);
-static int lpc3180_command(struct nand_device_s *device, u8 command);
-static int lpc3180_address(struct nand_device_s *device, u8 address);
-static int lpc3180_write_data(struct nand_device_s *device, u16 data);
+static int lpc3180_command(struct nand_device_s *device, uint8_t command);
+static int lpc3180_address(struct nand_device_s *device, uint8_t address);
+static int lpc3180_write_data(struct nand_device_s *device, uint16_t data);
 static int lpc3180_read_data(struct nand_device_s *device, void *data);
-static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size);
-static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size);
+static int lpc3180_write_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
+static int lpc3180_read_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
 static int lpc3180_controller_ready(struct nand_device_s *device, int timeout);
 static int lpc3180_nand_ready(struct nand_device_s *device, int timeout);
 
@@ -61,46 +61,46 @@ nand_flash_controller_t lpc3180_nand_controller =
 static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device)
 {
        lpc3180_nand_controller_t *lpc3180_info;
-       
+
        if (argc < 3)
        {
                LOG_WARNING("incomplete 'lpc3180' nand flash configuration");
                return ERROR_FLASH_BANK_INVALID;
        }
-       
+
        lpc3180_info = malloc(sizeof(lpc3180_nand_controller_t));
        device->controller_priv = lpc3180_info;
 
-       lpc3180_info->target = get_target_by_num(strtoul(args[1], NULL, 0));
+       lpc3180_info->target = get_target(args[1]);
        if (!lpc3180_info->target)
        {
-               LOG_ERROR("no target '%s' configured", args[1]);
+               LOG_ERROR("target '%s' not defined", args[1]);
                return ERROR_NAND_DEVICE_INVALID;
        }
 
        lpc3180_info->osc_freq = strtoul(args[2], NULL, 0);
        if ((lpc3180_info->osc_freq < 1000) || (lpc3180_info->osc_freq > 20000))
        {
-               LOG_WARNING("LPC3180 oscillator frequency should be between 1000 and 20000 kHz, was %i", lpc3180_info->osc_freq); 
+               LOG_WARNING("LPC3180 oscillator frequency should be between 1000 and 20000 kHz, was %i", lpc3180_info->osc_freq);
        }
        lpc3180_info->selected_controller = LPC3180_NO_CONTROLLER;
        lpc3180_info->sw_write_protection = 0;
        lpc3180_info->sw_wp_lower_bound = 0x0;
        lpc3180_info->sw_wp_upper_bound = 0x0;
-               
+
        return ERROR_OK;
 }
 
 static int lpc3180_register_commands(struct command_context_s *cmd_ctx)
 {
        command_t *lpc3180_cmd = register_command(cmd_ctx, NULL, "lpc3180", NULL, COMMAND_ANY, "commands specific to the LPC3180 NAND flash controllers");
-       
+
        register_command(cmd_ctx, lpc3180_cmd, "select", handle_lpc3180_select_command, COMMAND_EXEC, "select <'mlc'|'slc'> controller (default is mlc)");
-       
+
        return ERROR_OK;
 }
 
-static int lpc3180_pll(int fclkin, u32 pll_ctrl)
+static int lpc3180_pll(int fclkin, uint32_t pll_ctrl)
 {
        int bypass = (pll_ctrl & 0x8000) >> 15;
        int direct = (pll_ctrl & 0x4000) >> 14;
@@ -112,44 +112,44 @@ static int lpc3180_pll(int fclkin, u32 pll_ctrl)
 
        if (!lock)
                LOG_WARNING("PLL is not locked");
-       
+
        if (!bypass && direct)  /* direct mode */
                return (m * fclkin) / n;
-       
+
        if (bypass && !direct)  /* bypass mode */
                return fclkin / (2 * p);
-       
+
        if (bypass & direct)    /* direct bypass mode */
                return fclkin;
-       
+
        if (feedback)                   /* integer mode */
                return m * (fclkin / n);
        else                                    /* non-integer mode */
-               return (m / (2 * p)) * (fclkin / n); 
+               return (m / (2 * p)) * (fclkin / n);
 }
 
 static float lpc3180_cycle_time(lpc3180_nand_controller_t *lpc3180_info)
 {
        target_t *target = lpc3180_info->target;
-       u32 sysclk_ctrl, pwr_ctrl, hclkdiv_ctrl, hclkpll_ctrl;
+       uint32_t sysclk_ctrl, pwr_ctrl, hclkdiv_ctrl, hclkpll_ctrl;
        int sysclk;
        int hclk;
        int hclk_pll;
        float cycle;
-       
+
        /* calculate timings */
-       
-       /* determine current SYSCLK (13'MHz or main oscillator) */ 
+
+       /* determine current SYSCLK (13'MHz or main oscillator) */
        target_read_u32(target, 0x40004050, &sysclk_ctrl);
-       
+
        if ((sysclk_ctrl & 1) == 0)
                sysclk = lpc3180_info->osc_freq;
        else
                sysclk = 13000;
-       
+
        /* determine selected HCLK source */
        target_read_u32(target, 0x40004044, &pwr_ctrl);
-       
+
        if ((pwr_ctrl & (1 << 2)) == 0) /* DIRECT RUN mode */
        {
                hclk = sysclk;
@@ -160,21 +160,21 @@ static float lpc3180_cycle_time(lpc3180_nand_controller_t *lpc3180_info)
                hclk_pll = lpc3180_pll(sysclk, hclkpll_ctrl);
 
                target_read_u32(target, 0x40004040, &hclkdiv_ctrl);
-               
+
                if (pwr_ctrl & (1 << 10)) /* ARM_CLK and HCLK use PERIPH_CLK */
                {
                        hclk = hclk_pll / (((hclkdiv_ctrl & 0x7c) >> 2) + 1);
                }
                else /* HCLK uses HCLK_PLL */
                {
-                       hclk = hclk_pll / (1 << (hclkdiv_ctrl & 0x3)); 
+                       hclk = hclk_pll / (1 << (hclkdiv_ctrl & 0x3));
                }
        }
-       
+
        LOG_DEBUG("LPC3180 HCLK currently clocked at %i kHz", hclk);
-       
+
        cycle = (1.0 / hclk) * 1000000.0;
-       
+
        return cycle;
 }
 
@@ -185,20 +185,20 @@ static int lpc3180_init(struct nand_device_s *device)
        int bus_width = (device->bus_width) ? (device->bus_width) : 8;
        int address_cycles = (device->address_cycles) ? (device->address_cycles) : 3;
        int page_size = (device->page_size) ? (device->page_size) : 512;
-               
+
        if (target->state != TARGET_HALTED)
        {
                LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-       
+
        /* sanitize arguments */
        if ((bus_width != 8) && (bus_width != 16))
        {
                LOG_ERROR("LPC3180 only supports 8 or 16 bit bus width, not %i", bus_width);
                return ERROR_NAND_OPERATION_NOT_SUPPORTED;
        }
-       
+
        /* The LPC3180 only brings out 8 bit NAND data bus, but the controller
         * would support 16 bit, too, so we just warn about this for now
         */
@@ -206,44 +206,44 @@ static int lpc3180_init(struct nand_device_s *device)
        {
                LOG_WARNING("LPC3180 only supports 8 bit bus width");
        }
-       
+
        /* inform calling code about selected bus width */
        device->bus_width = bus_width;
-       
+
        if ((address_cycles != 3) && (address_cycles != 4))
        {
                LOG_ERROR("LPC3180 only supports 3 or 4 address cycles, not %i", address_cycles);
                return ERROR_NAND_OPERATION_NOT_SUPPORTED;
        }
-       
+
        if ((page_size != 512) && (page_size != 2048))
        {
                LOG_ERROR("LPC3180 only supports 512 or 2048 byte pages, not %i", page_size);
                return ERROR_NAND_OPERATION_NOT_SUPPORTED;
        }
-       
+
        /* select MLC controller if none is currently selected */
        if (lpc3180_info->selected_controller == LPC3180_NO_CONTROLLER)
        {
                LOG_DEBUG("no LPC3180 NAND flash controller selected, using default 'mlc'");
                lpc3180_info->selected_controller = LPC3180_MLC_CONTROLLER;
        }
-       
+
        if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER)
        {
-               u32 mlc_icr_value = 0x0;
+               uint32_t mlc_icr_value = 0x0;
                float cycle;
                int twp, twh, trp, treh, trhz, trbwb, tcea;
-               
+
                /* FLASHCLK_CTRL = 0x22 (enable clock for MLC flash controller) */
                target_write_u32(target, 0x400040c8, 0x22);
-               
+
                /* MLC_CEH = 0x0 (Force nCE assert) */
                target_write_u32(target, 0x200b804c, 0x0);
-               
+
                /* MLC_LOCK = 0xa25e (unlock protected registers) */
                target_write_u32(target, 0x200b8044, 0xa25e);
-               
+
                /* MLC_ICR = configuration */
                if (lpc3180_info->sw_write_protection)
                        mlc_icr_value |= 0x8;
@@ -254,10 +254,10 @@ static int lpc3180_init(struct nand_device_s *device)
                if (bus_width == 16)
                        mlc_icr_value |= 0x1;
                target_write_u32(target, 0x200b8030, mlc_icr_value);
-               
+
                /* calculate NAND controller timings */
                cycle = lpc3180_cycle_time(lpc3180_info);
-               
+
                twp = ((40 / cycle) + 1);
                twh = ((20 / cycle) + 1);
                trp = ((30 / cycle) + 1);
@@ -265,14 +265,14 @@ static int lpc3180_init(struct nand_device_s *device)
                trhz = ((30 / cycle) + 1);
                trbwb = ((100 / cycle) + 1);
                tcea = ((45 / cycle) + 1);
-               
+
                /* MLC_LOCK = 0xa25e (unlock protected registers) */
                target_write_u32(target, 0x200b8044, 0xa25e);
-       
+
                /* MLC_TIME_REG */
-               target_write_u32(target, 0x200b8034, (twp & 0xf) | ((twh & 0xf) << 4) | 
-                       ((trp & 0xf) << 8) | ((treh & 0xf) << 12) | ((trhz & 0x7) << 16) | 
-                       ((trbwb & 0x1f) << 19) | ((tcea & 0x3) << 24)); 
+               target_write_u32(target, 0x200b8034, (twp & 0xf) | ((twh & 0xf) << 4) |
+                       ((trp & 0xf) << 8) | ((treh & 0xf) << 12) | ((trhz & 0x7) << 16) |
+                       ((trbwb & 0x1f) << 19) | ((tcea & 0x3) << 24));
 
                lpc3180_reset(device);
        }
@@ -281,30 +281,30 @@ static int lpc3180_init(struct nand_device_s *device)
                float cycle;
                int r_setup, r_hold, r_width, r_rdy;
                int w_setup, w_hold, w_width, w_rdy;
-               
+
                /* FLASHCLK_CTRL = 0x05 (enable clock for SLC flash controller) */
                target_write_u32(target, 0x400040c8, 0x05);
-               
+
                /* SLC_CFG = 0x (Force nCE assert, ECC enabled, WIDTH = bus_width) */
                target_write_u32(target, 0x20020014, 0x28 | (bus_width == 16) ? 1 : 0);
-               
+
                /* calculate NAND controller timings */
                cycle = lpc3180_cycle_time(lpc3180_info);
-               
+
                r_setup = w_setup = 0;
                r_hold = w_hold = 10 / cycle;
                r_width = 30 / cycle;
                w_width = 40 / cycle;
                r_rdy = w_rdy = 100 / cycle;
-               
+
                /* SLC_TAC: SLC timing arcs register */
                target_write_u32(target, 0x2002002c, (r_setup & 0xf) | ((r_hold & 0xf) << 4) |
                        ((r_width & 0xf) << 8) | ((r_rdy & 0xf) << 12) |  ((w_setup & 0xf) << 16) |
-                       ((w_hold & 0xf) << 20) | ((w_width & 0xf) << 24) | ((w_rdy & 0xf) << 28)); 
-               
+                       ((w_hold & 0xf) << 20) | ((w_width & 0xf) << 24) | ((w_rdy & 0xf) << 28));
+
                lpc3180_reset(device);
        }
-       
+
        return ERROR_OK;
 }
 
@@ -312,13 +312,13 @@ static int lpc3180_reset(struct nand_device_s *device)
 {
        lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
        target_t *target = lpc3180_info->target;
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-       
+
        if (lpc3180_info->selected_controller == LPC3180_NO_CONTROLLER)
        {
                LOG_ERROR("BUG: no LPC3180 NAND flash controller selected");
@@ -339,28 +339,28 @@ static int lpc3180_reset(struct nand_device_s *device)
        {
                /* SLC_CTRL = 0x6 (ECC_CLEAR, SW_RESET) */
                target_write_u32(target, 0x20020010, 0x6);
-               
+
                if (!lpc3180_controller_ready(device, 100))
                {
                        LOG_ERROR("LPC3180 NAND controller timed out after reset");
                        return ERROR_NAND_OPERATION_TIMEOUT;
                }
        }
-       
+
        return ERROR_OK;
 }
 
-static int lpc3180_command(struct nand_device_s *device, u8 command)
+static int lpc3180_command(struct nand_device_s *device, uint8_t command)
 {
        lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
        target_t *target = lpc3180_info->target;
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-       
+
        if (lpc3180_info->selected_controller == LPC3180_NO_CONTROLLER)
        {
                LOG_ERROR("BUG: no LPC3180 NAND flash controller selected");
@@ -375,22 +375,22 @@ static int lpc3180_command(struct nand_device_s *device, u8 command)
        {
                /* SLC_CMD = command */
                target_write_u32(target, 0x20020008, command);
-       }       
-       
+       }
+
        return ERROR_OK;
 }
 
-static int lpc3180_address(struct nand_device_s *device, u8 address)
+static int lpc3180_address(struct nand_device_s *device, uint8_t address)
 {
        lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
        target_t *target = lpc3180_info->target;
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-       
+
        if (lpc3180_info->selected_controller == LPC3180_NO_CONTROLLER)
        {
                LOG_ERROR("BUG: no LPC3180 NAND flash controller selected");
@@ -406,21 +406,21 @@ static int lpc3180_address(struct nand_device_s *device, u8 address)
                /* SLC_ADDR = address */
                target_write_u32(target, 0x20020004, address);
        }
-               
+
        return ERROR_OK;
 }
 
-static int lpc3180_write_data(struct nand_device_s *device, u16 data)
+static int lpc3180_write_data(struct nand_device_s *device, uint16_t data)
 {
        lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
        target_t *target = lpc3180_info->target;
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-       
+
        if (lpc3180_info->selected_controller == LPC3180_NO_CONTROLLER)
        {
                LOG_ERROR("BUG: no LPC3180 NAND flash controller selected");
@@ -436,7 +436,7 @@ static int lpc3180_write_data(struct nand_device_s *device, u16 data)
                /* SLC_DATA = data */
                target_write_u32(target, 0x20020000, data);
        }
-       
+
        return ERROR_OK;
 }
 
@@ -444,13 +444,13 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data)
 {
        lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
        target_t *target = lpc3180_info->target;
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-       
+
        if (lpc3180_info->selected_controller == LPC3180_NO_CONTROLLER)
        {
                LOG_ERROR("BUG: no LPC3180 NAND flash controller selected");
@@ -461,12 +461,12 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data)
                /* data = MLC_DATA, use sized access */
                if (device->bus_width == 8)
                {
-                       u8 *data8 = data;
+                       uint8_t *data8 = data;
                        target_read_u8(target, 0x200b0000, data8);
                }
                else if (device->bus_width == 16)
                {
-                       u16 *data16 = data;
+                       uint16_t *data16 = data;
                        target_read_u16(target, 0x200b0000, data16);
                }
                else
@@ -477,19 +477,19 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data)
        }
        else if (lpc3180_info->selected_controller == LPC3180_SLC_CONTROLLER)
        {
-               u32 data32;
+               uint32_t data32;
 
                /* data = SLC_DATA, must use 32-bit access */
                target_read_u32(target, 0x20020000, &data32);
-               
+
                if (device->bus_width == 8)
                {
-                       u8 *data8 = data;
+                       uint8_t *data8 = data;
                        *data8 = data32 & 0xff;
                }
                else if (device->bus_width == 16)
                {
-                       u16 *data16 = data;
+                       uint16_t *data16 = data;
                        *data16 = data32 & 0xffff;
                }
                else
@@ -497,24 +497,24 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data)
                        LOG_ERROR("BUG: bus_width neither 8 nor 16 bit");
                        return ERROR_NAND_OPERATION_FAILED;
                }
-       }       
-       
+       }
+
        return ERROR_OK;
 }
 
-static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size)
+static int lpc3180_write_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
 {
        lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
        target_t *target = lpc3180_info->target;
        int retval;
-       u8 status;
-       
+       uint8_t status;
+
        if (target->state != TARGET_HALTED)
        {
                LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-       
+
        if (lpc3180_info->selected_controller == LPC3180_NO_CONTROLLER)
        {
                LOG_ERROR("BUG: no LPC3180 NAND flash controller selected");
@@ -522,33 +522,33 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data,
        }
        else if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER)
        {
-               u8 *page_buffer;
-               u8 *oob_buffer;
+               uint8_t *page_buffer;
+               uint8_t *oob_buffer;
                int quarter, num_quarters;
-               
+
                if (!data && oob)
                {
                        LOG_ERROR("LPC3180 MLC controller can't write OOB data only");
                        return ERROR_NAND_OPERATION_NOT_SUPPORTED;
                }
-               
+
                if (oob && (oob_size > 6))
                {
                        LOG_ERROR("LPC3180 MLC controller can't write more than 6 bytes of OOB data");
                        return ERROR_NAND_OPERATION_NOT_SUPPORTED;
                }
-               
-               if (data_size > (u32)device->page_size)
+
+               if (data_size > (uint32_t)device->page_size)
                {
                        LOG_ERROR("data size exceeds page size");
                        return ERROR_NAND_OPERATION_NOT_SUPPORTED;
                }
-               
+
                /* MLC_CMD = sequential input */
                target_write_u32(target, 0x200b8000, NAND_CMD_SEQIN);
 
                page_buffer = malloc(512);
-               oob_buffer = malloc(6);         
+               oob_buffer = malloc(6);
 
                if (device->page_size == 512)
                {
@@ -558,7 +558,7 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data,
                        /* MLC_ADDR = row */
                        target_write_u32(target, 0x200b8004, page & 0xff);
                        target_write_u32(target, 0x200b8004, (page >> 8) & 0xff);
-                       
+
                        if (device->address_cycles == 4)
                                target_write_u32(target, 0x200b8004, (page >> 16) & 0xff);
                }
@@ -572,17 +572,17 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data,
                        target_write_u32(target, 0x200b8004, page & 0xff);
                        target_write_u32(target, 0x200b8004, (page >> 8) & 0xff);
                }
-               
+
                /* when using the MLC controller, we have to treat a large page device
                 * as being made out of four quarters, each the size of a small page device
                 */
                num_quarters = (device->page_size == 2048) ? 4 : 1;
-                
+
                for (quarter = 0; quarter < num_quarters; quarter++)
                {
                        int thisrun_data_size = (data_size > 512) ? 512 : data_size;
                        int thisrun_oob_size = (oob_size > 6) ? 6 : oob_size;
-                       
+
                        memset(page_buffer, 0xff, 512);
                        if (data)
                        {
@@ -590,7 +590,7 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data,
                                data_size -= thisrun_data_size;
                                data += thisrun_data_size;
                        }
-                       
+
                        memset(oob_buffer, 0xff, (device->page_size == 512) ? 6 : 24);
                        if (oob)
                        {
@@ -598,38 +598,38 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data,
                                oob_size -= thisrun_oob_size;
                                oob += thisrun_oob_size;
                        }
-                       
+
                        /* write MLC_ECC_ENC_REG to start encode cycle */
                        target_write_u32(target, 0x200b8008, 0x0);
-                       
-                       target->type->write_memory(target, 0x200a8000, 4, 128, page_buffer + (quarter * 512));
-                       target->type->write_memory(target, 0x200a8000, 1, 6, oob_buffer + (quarter * 6));
-                       
+
+                       target_write_memory(target, 0x200a8000, 4, 128, page_buffer + (quarter * 512));
+                       target_write_memory(target, 0x200a8000, 1, 6, oob_buffer + (quarter * 6));
+
                        /* write MLC_ECC_AUTO_ENC_REG to start auto encode */
                        target_write_u32(target, 0x200b8010, 0x0);
-                       
+
                        if (!lpc3180_controller_ready(device, 1000))
                        {
                                LOG_ERROR("timeout while waiting for completion of auto encode cycle");
                                return ERROR_NAND_OPERATION_FAILED;
                        }
                }
-               
+
                /* MLC_CMD = auto program command */
                target_write_u32(target, 0x200b8000, NAND_CMD_PAGEPROG);
-               
+
                if ((retval = nand_read_status(device, &status)) != ERROR_OK)
                {
                        LOG_ERROR("couldn't read status");
                        return ERROR_NAND_OPERATION_FAILED;
                }
-                       
+
                if (status & NAND_STATUS_FAIL)
                {
                        LOG_ERROR("write operation didn't pass, status: 0x%2.2x", status);
                        return ERROR_NAND_OPERATION_FAILED;
                }
-       
+
                free(page_buffer);
                free(oob_buffer);
        }
@@ -637,21 +637,21 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, u8 *data,
        {
                return nand_write_page_raw(device, page, data, data_size, oob, oob_size);
        }
-       
+
        return ERROR_OK;
 }
 
-static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size)
+static int lpc3180_read_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
 {
        lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
        target_t *target = lpc3180_info->target;
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-       
+
        if (lpc3180_info->selected_controller == LPC3180_NO_CONTROLLER)
        {
                LOG_ERROR("BUG: no LPC3180 NAND flash controller selected");
@@ -659,11 +659,11 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u
        }
        else if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER)
        {
-               u8 *page_buffer;
-               u8 *oob_buffer;
-               u32 page_bytes_done = 0;
-               u32 oob_bytes_done = 0;
-               u32 mlc_isr;
+               uint8_t *page_buffer;
+               uint8_t *oob_buffer;
+               uint32_t page_bytes_done = 0;
+               uint32_t oob_bytes_done = 0;
+               uint32_t mlc_isr;
 
 #if 0
                if (oob && (oob_size > 6))
@@ -672,13 +672,13 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u
                        return ERROR_NAND_OPERATION_NOT_SUPPORTED;
                }
 #endif
-               
-               if (data_size > (u32)device->page_size)
+
+               if (data_size > (uint32_t)device->page_size)
                {
                        LOG_ERROR("data size exceeds page size");
                        return ERROR_NAND_OPERATION_NOT_SUPPORTED;
                }
-               
+
                if (device->page_size == 2048)
                {
                        page_buffer = malloc(2048);
@@ -689,10 +689,10 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u
                        page_buffer = malloc(512);
                        oob_buffer = malloc(16);
                }
-               
+
                if (!data && oob)
                {
-                       /* MLC_CMD = Read OOB 
+                       /* MLC_CMD = Read OOB
                         * we can use the READOOB command on both small and large page devices,
                         * as the controller translates the 0x50 command to a 0x0 with appropriate
                         * positioning of the serial buffer read pointer
@@ -704,7 +704,7 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u
                        /* MLC_CMD = Read0 */
                        target_write_u32(target, 0x200b8000, NAND_CMD_READ0);
                }
-               
+
                if (device->page_size == 512)
                {
                        /* small page device */
@@ -714,7 +714,7 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u
                        /* MLC_ADDR = row */
                        target_write_u32(target, 0x200b8004, page & 0xff);
                        target_write_u32(target, 0x200b8004, (page >> 8) & 0xff);
-                       
+
                        if (device->address_cycles == 4)
                                target_write_u32(target, 0x200b8004, (page >> 16) & 0xff);
                }
@@ -728,55 +728,55 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u
                        /* MLC_ADDR = row */
                        target_write_u32(target, 0x200b8004, page & 0xff);
                        target_write_u32(target, 0x200b8004, (page >> 8) & 0xff);
-                       
+
                        /* MLC_CMD = Read Start */
                        target_write_u32(target, 0x200b8000, NAND_CMD_READSTART);
                }
-               
-               while (page_bytes_done < (u32)device->page_size)
+
+               while (page_bytes_done < (uint32_t)device->page_size)
                {
                        /* MLC_ECC_AUTO_DEC_REG = dummy */
                        target_write_u32(target, 0x200b8014, 0xaa55aa55);
-                       
+
                        if (!lpc3180_controller_ready(device, 1000))
                        {
                                LOG_ERROR("timeout while waiting for completion of auto decode cycle");
                                return ERROR_NAND_OPERATION_FAILED;
                        }
-               
+
                        target_read_u32(target, 0x200b8048, &mlc_isr);
-                       
+
                        if (mlc_isr & 0x8)
                        {
                                if (mlc_isr & 0x40)
                                {
-                                       LOG_ERROR("uncorrectable error detected: 0x%2.2x", mlc_isr);
+                                       LOG_ERROR("uncorrectable error detected: 0x%2.2x", (unsigned)mlc_isr);
                                        return ERROR_NAND_OPERATION_FAILED;
                                }
-                               
-                               LOG_WARNING("%i symbol error detected and corrected", ((mlc_isr & 0x30) >> 4) + 1);
+
+                               LOG_WARNING("%i symbol error detected and corrected", ((int)(((mlc_isr & 0x30) >> 4) + 1)));
                        }
-                       
+
                        if (data)
                        {
-                               target->type->read_memory(target, 0x200a8000, 4, 128, page_buffer + page_bytes_done);
+                               target_read_memory(target, 0x200a8000, 4, 128, page_buffer + page_bytes_done);
                        }
-                       
+
                        if (oob)
                        {
-                               target->type->read_memory(target, 0x200a8000, 4, 4, oob_buffer + oob_bytes_done);
+                               target_read_memory(target, 0x200a8000, 4, 4, oob_buffer + oob_bytes_done);
                        }
 
                        page_bytes_done += 512;
                        oob_bytes_done += 16;
                }
-               
+
                if (data)
                        memcpy(data, page_buffer, data_size);
-               
+
                if (oob)
                        memcpy(oob, oob_buffer, oob_size);
-               
+
                free(page_buffer);
                free(oob_buffer);
        }
@@ -784,7 +784,7 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, u8 *data, u
        {
                return nand_read_page_raw(device, page, data, data_size, oob, oob_size);
        }
-       
+
        return ERROR_OK;
 }
 
@@ -792,21 +792,21 @@ static int lpc3180_controller_ready(struct nand_device_s *device, int timeout)
 {
        lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
        target_t *target = lpc3180_info->target;
-       u8 status = 0x0;
-       
+       uint8_t status = 0x0;
+
        if (target->state != TARGET_HALTED)
        {
                LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-                       
+
        do
        {
                if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER)
                {
                        /* Read MLC_ISR, wait for controller to become ready */
                        target_read_u8(target, 0x200b8048, &status);
-                       
+
                        if (status & 2)
                                return 1;
                }
@@ -818,7 +818,7 @@ static int lpc3180_controller_ready(struct nand_device_s *device, int timeout)
 
                alive_sleep(1);
        } while (timeout-- > 0);
-       
+
        return 0;
 }
 
@@ -826,65 +826,65 @@ static int lpc3180_nand_ready(struct nand_device_s *device, int timeout)
 {
        lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
        target_t *target = lpc3180_info->target;
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
                return ERROR_NAND_OPERATION_FAILED;
        }
-                       
+
        do
        {
                if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER)
-               {       
-                       u8 status = 0x0;
-                       
+               {
+                       uint8_t status = 0x0;
+
                        /* Read MLC_ISR, wait for NAND flash device to become ready */
                        target_read_u8(target, 0x200b8048, &status);
-                       
+
                        if (status & 1)
                                return 1;
                }
                else if (lpc3180_info->selected_controller == LPC3180_SLC_CONTROLLER)
                {
-                       u32 status = 0x0;
-                       
+                       uint32_t status = 0x0;
+
                        /* Read SLC_STAT and check READY bit */
                        target_read_u32(target, 0x20020018, &status);
-                       
+
                        if (status & 1)
                                return 1;
                }
-               
+
                alive_sleep(1);
        } while (timeout-- > 0);
-       
-       return 0;       
+
+       return 0;
 }
 
 static int handle_lpc3180_select_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        nand_device_t *device = NULL;
        lpc3180_nand_controller_t *lpc3180_info = NULL;
-       char *selected[] = 
+       char *selected[] =
        {
                "no", "mlc", "slc"
        };
-       
+
        if ((argc < 1) || (argc > 2))
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       
+
        device = get_nand_device_by_num(strtoul(args[0], NULL, 0));
        if (!device)
        {
                command_print(cmd_ctx, "nand device '#%s' is out of bounds", args[0]);
                return ERROR_OK;
        }
-       
+
        lpc3180_info = device->controller_priv;
-       
+
        if (argc == 2)
        {
                if (strcmp(args[1], "mlc") == 0)
@@ -900,8 +900,8 @@ static int handle_lpc3180_select_command(struct command_context_s *cmd_ctx, char
                        return ERROR_COMMAND_SYNTAX_ERROR;
                }
        }
-       
+
        command_print(cmd_ctx, "%s controller selected", selected[lpc3180_info->selected_controller]);
-       
+
        return ERROR_OK;
 }