diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-19 10:04:41 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-19 10:04:41 +0000 |
| commit | 1464742d745d211f454185957d2dcbceb2740141 (patch) | |
| tree | b737b23749a9effa24680f73031d7c49109a718e /src | |
| parent | 4147156707363d26277631c77cff288ae41e3ead (diff) | |
| download | openocd_libswd-1464742d745d211f454185957d2dcbceb2740141.tar.gz openocd_libswd-1464742d745d211f454185957d2dcbceb2740141.tar.bz2 openocd_libswd-1464742d745d211f454185957d2dcbceb2740141.tar.xz openocd_libswd-1464742d745d211f454185957d2dcbceb2740141.zip | |
David Brownell <david-b@pacbell.net> NAND: update ids, "nand list" bugfix
git-svn-id: svn://svn.berlios.de/openocd/trunk@1835 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
| -rw-r--r-- | src/flash/nand.c | 11 | ||||
| -rw-r--r-- | src/flash/nand.h | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/flash/nand.c b/src/flash/nand.c index 87eb976a..85ca0fed 100644 --- a/src/flash/nand.c +++ b/src/flash/nand.c @@ -86,6 +86,7 @@ static command_t *nand_cmd; */ static nand_info_t nand_flash_ids[] = { + /* start "museum" IDs */ {"NAND 1MiB 5V 8-bit", 0x6e, 256, 1, 0x1000, 0}, {"NAND 2MiB 5V 8-bit", 0x64, 256, 2, 0x1000, 0}, {"NAND 4MiB 5V 8-bit", 0x6b, 512, 4, 0x2000, 0}, @@ -101,6 +102,7 @@ static nand_info_t nand_flash_ids[] = {"NAND 8MiB 3,3V 8-bit", 0xe6, 512, 8, 0x2000, 0}, {"NAND 8MiB 1,8V 16-bit", 0x49, 512, 8, 0x2000, NAND_BUSWIDTH_16}, {"NAND 8MiB 3,3V 16-bit", 0x59, 512, 8, 0x2000, NAND_BUSWIDTH_16}, + /* end "museum" IDs */ {"NAND 16MiB 1,8V 8-bit", 0x33, 512, 16, 0x4000, 0}, {"NAND 16MiB 3,3V 8-bit", 0x73, 512, 16, 0x4000, 0}, @@ -172,6 +174,7 @@ static nand_manufacturer_t nand_manuf_ids[] = {NAND_MFR_RENESAS, "Renesas"}, {NAND_MFR_STMICRO, "ST Micro"}, {NAND_MFR_HYNIX, "Hynix"}, + {NAND_MFR_MICRON, "Micron"}, {0x0, NULL}, }; @@ -1062,7 +1065,7 @@ int nand_write_page_raw(struct nand_device_s *device, u32 page, u8 *data, u32 da int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { nand_device_t *p; - int i = 0; + int i; if (!nand_devices) { @@ -1070,13 +1073,13 @@ int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char return ERROR_OK; } - for (p = nand_devices; p; p = p->next) + for (p = nand_devices, i = 0; p; p = p->next, i++) { if (p->device) command_print(cmd_ctx, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i", - i++, p->device->name, p->manufacturer->name, p->page_size, p->bus_width, p->erase_size); + i, p->device->name, p->manufacturer->name, p->page_size, p->bus_width, p->erase_size); else - command_print(cmd_ctx, "#%i: not probed"); + command_print(cmd_ctx, "#%i: not probed", i); } return ERROR_OK; diff --git a/src/flash/nand.h b/src/flash/nand.h index 6f3ea272..0ee1ffe8 100644 --- a/src/flash/nand.h +++ b/src/flash/nand.h @@ -95,6 +95,7 @@ enum NAND_MFR_RENESAS = 0x07, NAND_MFR_STMICRO = 0x20, NAND_MFR_HYNIX = 0xad, + NAND_MFR_MICRON = 0x2c, }; typedef struct nand_manufacturer_s |