Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
command_handler: change 'cmd_ctx' to CMD_CTX
[openocd.git] / src / flash / lpc3180_nand_controller.c
diff --git a/src/flash/lpc3180_nand_controller.c b/src/flash/lpc3180_nand_controller.c
index 6e9b1d1bc858decbc55a6dd9f20063722ef39efc..61bef90c862a31d21589b1ae9d1f3d732d581d6f 100644 (file)
--- a/src/flash/lpc3180_nand_controller.c
+++ b/src/flash/lpc3180_nand_controller.c
@@ -24,61 +24,36 @@
 #include "lpc3180_nand_controller.h"
 #include "nand.h"
 
-static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
-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, 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, u16 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, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size);
-static int lpc3180_read_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 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);
-
-static int handle_lpc3180_select_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
-nand_flash_controller_t lpc3180_nand_controller =
-{
-       .name = "lpc3180",
-       .nand_device_command = lpc3180_nand_device_command,
-       .register_commands = lpc3180_register_commands,
-       .init = lpc3180_init,
-       .reset = lpc3180_reset,
-       .command = lpc3180_command,
-       .address = lpc3180_address,
-       .write_data = lpc3180_write_data,
-       .read_data = lpc3180_read_data,
-       .write_page = lpc3180_write_page,
-       .read_page = lpc3180_read_page,
-       .controller_ready = lpc3180_controller_ready,
-       .nand_ready = lpc3180_nand_ready,
-};
+static int lpc3180_reset(struct nand_device *nand);
+static int lpc3180_controller_ready(struct nand_device *nand, int timeout);
 
 /* nand device lpc3180 <target#> <oscillator_frequency>
  */
-static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device)
+NAND_DEVICE_COMMAND_HANDLER(lpc3180_nand_device_command)
 {
-       lpc3180_nand_controller_t *lpc3180_info;
-
-       if (argc < 3)
+       if (CMD_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(args[1]);
-       if (!lpc3180_info->target)
+       struct target *target = get_target(CMD_ARGV[1]);
+       if (NULL == target)
        {
-               LOG_ERROR("target '%s' not defined", args[1]);
+               LOG_ERROR("target '%s' not defined", CMD_ARGV[1]);
                return ERROR_NAND_DEVICE_INVALID;
        }
 
-       lpc3180_info->osc_freq = strtoul(args[2], NULL, 0);
+       uint32_t osc_freq;
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], osc_freq);
+
+       struct lpc3180_nand_controller *lpc3180_info;
+       lpc3180_info = malloc(sizeof(struct lpc3180_nand_controller));
+       nand->controller_priv = lpc3180_info;
+
+       lpc3180_info->target = target;
+       lpc3180_info->osc_freq = osc_freq;
+
        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);
@@ -91,16 +66,7 @@ static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char *
        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;
@@ -128,10 +94,10 @@ static int lpc3180_pll(int fclkin, u32 pll_ctrl)
                return (m / (2 * p)) * (fclkin / n);
 }
 
-static float lpc3180_cycle_time(lpc3180_nand_controller_t *lpc3180_info)
+static float lpc3180_cycle_time(struct lpc3180_nand_controller *lpc3180_info)
 {
-       target_t *target = lpc3180_info->target;
-       u32 sysclk_ctrl, pwr_ctrl, hclkdiv_ctrl, hclkpll_ctrl;
+       struct target *target = lpc3180_info->target;
+       uint32_t sysclk_ctrl, pwr_ctrl, hclkdiv_ctrl, hclkpll_ctrl;
        int sysclk;
        int hclk;
        int hclk_pll;
@@ -178,13 +144,13 @@ static float lpc3180_cycle_time(lpc3180_nand_controller_t *lpc3180_info)
        return cycle;
 }
 
-static int lpc3180_init(struct nand_device_s *device)
+static int lpc3180_init(struct nand_device *nand)
 {
-       lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
-       target_t *target = lpc3180_info->target;
-       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;
+       struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
+       struct target *target = lpc3180_info->target;
+       int bus_width = nand->bus_width ? : 8;
+       int address_cycles = nand->address_cycles ? : 3;
+       int page_size = nand->page_size ? : 512;
 
        if (target->state != TARGET_HALTED)
        {
@@ -208,7 +174,7 @@ static int lpc3180_init(struct nand_device_s *device)
        }
 
        /* inform calling code about selected bus width */
-       device->bus_width = bus_width;
+       nand->bus_width = bus_width;
 
        if ((address_cycles != 3) && (address_cycles != 4))
        {
@@ -231,7 +197,7 @@ static int lpc3180_init(struct nand_device_s *device)
 
        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;
 
@@ -274,7 +240,7 @@ static int lpc3180_init(struct nand_device_s *device)
                        ((trp & 0xf) << 8) | ((treh & 0xf) << 12) | ((trhz & 0x7) << 16) |
                        ((trbwb & 0x1f) << 19) | ((tcea & 0x3) << 24));
 
-               lpc3180_reset(device);
+               lpc3180_reset(nand);
        }
        else if (lpc3180_info->selected_controller == LPC3180_SLC_CONTROLLER)
        {
@@ -302,16 +268,16 @@ static int lpc3180_init(struct nand_device_s *device)
                        ((r_width & 0xf) << 8) | ((r_rdy & 0xf) << 12) |  ((w_setup & 0xf) << 16) |
                        ((w_hold & 0xf) << 20) | ((w_width & 0xf) << 24) | ((w_rdy & 0xf) << 28));
 
-               lpc3180_reset(device);
+               lpc3180_reset(nand);
        }
 
        return ERROR_OK;
 }
 
-static int lpc3180_reset(struct nand_device_s *device)
+static int lpc3180_reset(struct nand_device *nand)
 {
-       lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
-       target_t *target = lpc3180_info->target;
+       struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
+       struct target *target = lpc3180_info->target;
 
        if (target->state != TARGET_HALTED)
        {
@@ -329,7 +295,7 @@ static int lpc3180_reset(struct nand_device_s *device)
                /* MLC_CMD = 0xff (reset controller and NAND device) */
                target_write_u32(target, 0x200b8000, 0xff);
 
-               if (!lpc3180_controller_ready(device, 100))
+               if (!lpc3180_controller_ready(nand, 100))
                {
                        LOG_ERROR("LPC3180 NAND controller timed out after reset");
                        return ERROR_NAND_OPERATION_TIMEOUT;
@@ -340,7 +306,7 @@ 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))
+               if (!lpc3180_controller_ready(nand, 100))
                {
                        LOG_ERROR("LPC3180 NAND controller timed out after reset");
                        return ERROR_NAND_OPERATION_TIMEOUT;
@@ -350,10 +316,10 @@ static int lpc3180_reset(struct nand_device_s *device)
        return ERROR_OK;
 }
 
-static int lpc3180_command(struct nand_device_s *device, uint8_t command)
+static int lpc3180_command(struct nand_device *nand, uint8_t command)
 {
-       lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
-       target_t *target = lpc3180_info->target;
+       struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
+       struct target *target = lpc3180_info->target;
 
        if (target->state != TARGET_HALTED)
        {
@@ -380,10 +346,10 @@ static int lpc3180_command(struct nand_device_s *device, uint8_t command)
        return ERROR_OK;
 }
 
-static int lpc3180_address(struct nand_device_s *device, uint8_t address)
+static int lpc3180_address(struct nand_device *nand, uint8_t address)
 {
-       lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
-       target_t *target = lpc3180_info->target;
+       struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
+       struct target *target = lpc3180_info->target;
 
        if (target->state != TARGET_HALTED)
        {
@@ -410,10 +376,10 @@ static int lpc3180_address(struct nand_device_s *device, uint8_t address)
        return ERROR_OK;
 }
 
-static int lpc3180_write_data(struct nand_device_s *device, u16 data)
+static int lpc3180_write_data(struct nand_device *nand, uint16_t data)
 {
-       lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
-       target_t *target = lpc3180_info->target;
+       struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
+       struct target *target = lpc3180_info->target;
 
        if (target->state != TARGET_HALTED)
        {
@@ -440,10 +406,10 @@ static int lpc3180_write_data(struct nand_device_s *device, u16 data)
        return ERROR_OK;
 }
 
-static int lpc3180_read_data(struct nand_device_s *device, void *data)
+static int lpc3180_read_data(struct nand_device *nand, void *data)
 {
-       lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
-       target_t *target = lpc3180_info->target;
+       struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
+       struct target *target = lpc3180_info->target;
 
        if (target->state != TARGET_HALTED)
        {
@@ -459,14 +425,14 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data)
        else if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER)
        {
                /* data = MLC_DATA, use sized access */
-               if (device->bus_width == 8)
+               if (nand->bus_width == 8)
                {
                        uint8_t *data8 = data;
                        target_read_u8(target, 0x200b0000, data8);
                }
-               else if (device->bus_width == 16)
+               else if (nand->bus_width == 16)
                {
-                       u16 *data16 = data;
+                       uint16_t *data16 = data;
                        target_read_u16(target, 0x200b0000, data16);
                }
                else
@@ -477,19 +443,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)
+               if (nand->bus_width == 8)
                {
                        uint8_t *data8 = data;
                        *data8 = data32 & 0xff;
                }
-               else if (device->bus_width == 16)
+               else if (nand->bus_width == 16)
                {
-                       u16 *data16 = data;
+                       uint16_t *data16 = data;
                        *data16 = data32 & 0xffff;
                }
                else
@@ -502,10 +468,10 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data)
        return ERROR_OK;
 }
 
-static int lpc3180_write_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size)
+static int lpc3180_write_page(struct nand_device *nand, 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;
+       struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
+       struct target *target = lpc3180_info->target;
        int retval;
        uint8_t status;
 
@@ -538,7 +504,7 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, uint8_t *d
                        return ERROR_NAND_OPERATION_NOT_SUPPORTED;
                }
 
-               if (data_size > (u32)device->page_size)
+               if (data_size > (uint32_t)nand->page_size)
                {
                        LOG_ERROR("data size exceeds page size");
                        return ERROR_NAND_OPERATION_NOT_SUPPORTED;
@@ -550,7 +516,7 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, uint8_t *d
                page_buffer = malloc(512);
                oob_buffer = malloc(6);
 
-               if (device->page_size == 512)
+               if (nand->page_size == 512)
                {
                        /* MLC_ADDR = 0x0 (one column cycle) */
                        target_write_u32(target, 0x200b8004, 0x0);
@@ -559,7 +525,7 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, uint8_t *d
                        target_write_u32(target, 0x200b8004, page & 0xff);
                        target_write_u32(target, 0x200b8004, (page >> 8) & 0xff);
 
-                       if (device->address_cycles == 4)
+                       if (nand->address_cycles == 4)
                                target_write_u32(target, 0x200b8004, (page >> 16) & 0xff);
                }
                else
@@ -576,7 +542,7 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, uint8_t *d
                /* 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;
+               num_quarters = (nand->page_size == 2048) ? 4 : 1;
 
                for (quarter = 0; quarter < num_quarters; quarter++)
                {
@@ -591,7 +557,7 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, uint8_t *d
                                data += thisrun_data_size;
                        }
 
-                       memset(oob_buffer, 0xff, (device->page_size == 512) ? 6 : 24);
+                       memset(oob_buffer, 0xff, (nand->page_size == 512) ? 6 : 24);
                        if (oob)
                        {
                                memcpy(page_buffer, oob, thisrun_oob_size);
@@ -608,7 +574,7 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, uint8_t *d
                        /* write MLC_ECC_AUTO_ENC_REG to start auto encode */
                        target_write_u32(target, 0x200b8010, 0x0);
 
-                       if (!lpc3180_controller_ready(device, 1000))
+                       if (!lpc3180_controller_ready(nand, 1000))
                        {
                                LOG_ERROR("timeout while waiting for completion of auto encode cycle");
                                return ERROR_NAND_OPERATION_FAILED;
@@ -618,7 +584,7 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, uint8_t *d
                /* MLC_CMD = auto program command */
                target_write_u32(target, 0x200b8000, NAND_CMD_PAGEPROG);
 
-               if ((retval = nand_read_status(device, &status)) != ERROR_OK)
+               if ((retval = nand_read_status(nand, &status)) != ERROR_OK)
                {
                        LOG_ERROR("couldn't read status");
                        return ERROR_NAND_OPERATION_FAILED;
@@ -635,16 +601,16 @@ static int lpc3180_write_page(struct nand_device_s *device, u32 page, uint8_t *d
        }
        else if (lpc3180_info->selected_controller == LPC3180_SLC_CONTROLLER)
        {
-               return nand_write_page_raw(device, page, data, data_size, oob, oob_size);
+               return nand_write_page_raw(nand, page, data, data_size, oob, oob_size);
        }
 
        return ERROR_OK;
 }
 
-static int lpc3180_read_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size)
+static int lpc3180_read_page(struct nand_device *nand, 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;
+       struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
+       struct target *target = lpc3180_info->target;
 
        if (target->state != TARGET_HALTED)
        {
@@ -661,9 +627,9 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, uint8_t *da
        {
                uint8_t *page_buffer;
                uint8_t *oob_buffer;
-               u32 page_bytes_done = 0;
-               u32 oob_bytes_done = 0;
-               u32 mlc_isr;
+               uint32_t page_bytes_done = 0;
+               uint32_t oob_bytes_done = 0;
+               uint32_t mlc_isr;
 
 #if 0
                if (oob && (oob_size > 6))
@@ -673,13 +639,13 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, uint8_t *da
                }
 #endif
 
-               if (data_size > (u32)device->page_size)
+               if (data_size > (uint32_t)nand->page_size)
                {
                        LOG_ERROR("data size exceeds page size");
                        return ERROR_NAND_OPERATION_NOT_SUPPORTED;
                }
 
-               if (device->page_size == 2048)
+               if (nand->page_size == 2048)
                {
                        page_buffer = malloc(2048);
                        oob_buffer = malloc(64);
@@ -705,7 +671,7 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, uint8_t *da
                        target_write_u32(target, 0x200b8000, NAND_CMD_READ0);
                }
 
-               if (device->page_size == 512)
+               if (nand->page_size == 512)
                {
                        /* small page device */
                        /* MLC_ADDR = 0x0 (one column cycle) */
@@ -715,7 +681,7 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, uint8_t *da
                        target_write_u32(target, 0x200b8004, page & 0xff);
                        target_write_u32(target, 0x200b8004, (page >> 8) & 0xff);
 
-                       if (device->address_cycles == 4)
+                       if (nand->address_cycles == 4)
                                target_write_u32(target, 0x200b8004, (page >> 16) & 0xff);
                }
                else
@@ -733,12 +699,12 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, uint8_t *da
                        target_write_u32(target, 0x200b8000, NAND_CMD_READSTART);
                }
 
-               while (page_bytes_done < (u32)device->page_size)
+               while (page_bytes_done < (uint32_t)nand->page_size)
                {
                        /* MLC_ECC_AUTO_DEC_REG = dummy */
                        target_write_u32(target, 0x200b8014, 0xaa55aa55);
 
-                       if (!lpc3180_controller_ready(device, 1000))
+                       if (!lpc3180_controller_ready(nand, 1000))
                        {
                                LOG_ERROR("timeout while waiting for completion of auto decode cycle");
                                return ERROR_NAND_OPERATION_FAILED;
@@ -750,11 +716,11 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, uint8_t *da
                        {
                                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)
@@ -782,16 +748,16 @@ static int lpc3180_read_page(struct nand_device_s *device, u32 page, uint8_t *da
        }
        else if (lpc3180_info->selected_controller == LPC3180_SLC_CONTROLLER)
        {
-               return nand_read_page_raw(device, page, data, data_size, oob, oob_size);
+               return nand_read_page_raw(nand, page, data, data_size, oob, oob_size);
        }
 
        return ERROR_OK;
 }
 
-static int lpc3180_controller_ready(struct nand_device_s *device, int timeout)
+static int lpc3180_controller_ready(struct nand_device *nand, int timeout)
 {
-       lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
-       target_t *target = lpc3180_info->target;
+       struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
+       struct target *target = lpc3180_info->target;
        uint8_t status = 0x0;
 
        if (target->state != TARGET_HALTED)
@@ -822,10 +788,10 @@ static int lpc3180_controller_ready(struct nand_device_s *device, int timeout)
        return 0;
 }
 
-static int lpc3180_nand_ready(struct nand_device_s *device, int timeout)
+static int lpc3180_nand_ready(struct nand_device *nand, int timeout)
 {
-       lpc3180_nand_controller_t *lpc3180_info = device->controller_priv;
-       target_t *target = lpc3180_info->target;
+       struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
+       struct target *target = lpc3180_info->target;
 
        if (target->state != TARGET_HALTED)
        {
@@ -847,7 +813,7 @@ static int lpc3180_nand_ready(struct nand_device_s *device, int timeout)
                }
                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);
@@ -862,36 +828,37 @@ static int lpc3180_nand_ready(struct nand_device_s *device, int timeout)
        return 0;
 }
 
-static int handle_lpc3180_select_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_lpc3180_select_command)
 {
-       nand_device_t *device = NULL;
-       lpc3180_nand_controller_t *lpc3180_info = NULL;
+       struct lpc3180_nand_controller *lpc3180_info = NULL;
        char *selected[] =
        {
                "no", "mlc", "slc"
        };
 
-       if ((argc < 1) || (argc > 2))
+       if ((CMD_ARGC < 1) || (CMD_ARGC > 2))
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       device = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-       if (!device)
+       unsigned num;
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[1], num);
+       struct nand_device *nand = get_nand_device_by_num(num);
+       if (!nand)
        {
-               command_print(cmd_ctx, "nand device '#%s' is out of bounds", args[0]);
+               command_print(CMD_CTX, "nand device '#%s' is out of bounds", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
-       lpc3180_info = device->controller_priv;
+       lpc3180_info = nand->controller_priv;
 
-       if (argc == 2)
+       if (CMD_ARGC == 2)
        {
-               if (strcmp(args[1], "mlc") == 0)
+               if (strcmp(CMD_ARGV[1], "mlc") == 0)
                {
                        lpc3180_info->selected_controller = LPC3180_MLC_CONTROLLER;
                }
-               else if (strcmp(args[1], "slc") == 0)
+               else if (strcmp(CMD_ARGV[1], "slc") == 0)
                {
                        lpc3180_info->selected_controller = LPC3180_SLC_CONTROLLER;
                }
@@ -901,7 +868,32 @@ static int handle_lpc3180_select_command(struct command_context_s *cmd_ctx, char
                }
        }
 
-       command_print(cmd_ctx, "%s controller selected", selected[lpc3180_info->selected_controller]);
+       command_print(CMD_CTX, "%s controller selected", selected[lpc3180_info->selected_controller]);
 
        return ERROR_OK;
 }
+
+static int lpc3180_register_commands(struct command_context *cmd_ctx)
+{
+       struct command *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;
+}
+
+struct nand_flash_controller lpc3180_nand_controller = {
+               .name = "lpc3180",
+               .nand_device_command = lpc3180_nand_device_command,
+               .register_commands = lpc3180_register_commands,
+               .init = lpc3180_init,
+               .reset = lpc3180_reset,
+               .command = lpc3180_command,
+               .address = lpc3180_address,
+               .write_data = lpc3180_write_data,
+               .read_data = lpc3180_read_data,
+               .write_page = lpc3180_write_page,
+               .read_page = lpc3180_read_page,
+               .controller_ready = lpc3180_controller_ready,
+               .nand_ready = lpc3180_nand_ready,
+       };
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)