- added svn props

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

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 3c00db1dd53460f973e8151d7eb495f72b76e908..8ce7cf0acec47ce186e11554b89d7a90515ae94c 100644 (file)
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -3,7 +3,7 @@
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
  *   partially based on                                                    *
- *      drivers/mtd/nand_ids.c                                                *
+ *      drivers/mtd/nand_ids.c                                            *
  *                                                                         *
  *   Copyright (C) 2002 Thomas Gleixner (tglx@linutronix.de)               *
  *                                                                         *
@@ -377,6 +377,7 @@ int nand_read_status(struct nand_device_s *device, u8 *status)
 int nand_probe(struct nand_device_s *device)
 {
        u8 manufacturer_id, device_id;
+       u8 id_buff[5];
        int retval;
        int i;
 
@@ -467,12 +468,36 @@ int nand_probe(struct nand_device_s *device)
                device->bus_width = 16;
        else
                device->bus_width = 8;
+
+       /* Do we need extended device probe information? */
+       if (device->device->page_size == 0 ||
+           device->device->erase_size == 0)
+       {
+               if (device->bus_width == 8)
+               {
+                       device->controller->read_data(device, id_buff+3);
+                       device->controller->read_data(device, id_buff+4);
+                       device->controller->read_data(device, id_buff+5);
+               }
+               else
+               {
+                       u16 data_buf;
+
+                       device->controller->read_data(device, &data_buf);
+                       id_buff[3] = data_buf;
+
+                       device->controller->read_data(device, &data_buf);
+                       id_buff[4] = data_buf;
+
+                       device->controller->read_data(device, &data_buf);
+                       id_buff[5] = data_buf >> 8;
+               }
+       }
                
        /* page size */
        if (device->device->page_size == 0)
        {
-               /* TODO: support reading extended chip id to determine page size */
-               return ERROR_NAND_OPERATION_FAILED;
+               device->page_size = 1 << (10 + (id_buff[4] & 3));
        }
        else if (device->device->page_size == 256)
        {
@@ -515,7 +540,20 @@ int nand_probe(struct nand_device_s *device)
        /* erase size */
        if (device->device->erase_size == 0)
        {
-               /* TODO: support reading extended chip id to determine erase size */
+               switch ((id_buff[4] >> 4) & 3) {
+               case 0:
+                       device->erase_size = 64 << 10;
+                       break;
+               case 1:
+                       device->erase_size = 128 << 10;
+                       break;
+               case 2:
+                       device->erase_size = 256 << 10;
+                       break;
+               case 3:
+                       device->erase_size =512 << 10;
+                       break;
+               }
        }
        else
        {
@@ -986,8 +1024,8 @@ int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd, char
                
        if ((argc < 1) || (argc > 3))
        {
-               command_print(cmd_ctx, "usage: nand info <num> [<first> <last>]");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
        }
        
        if (argc == 2)
@@ -1053,8 +1091,7 @@ int handle_nand_probe_command(struct command_context_s *cmd_ctx, char *cmd, char
                
        if (argc != 1)
        {
-               command_print(cmd_ctx, "usage: nand probe <num>");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
        
        p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1088,8 +1125,8 @@ int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cmd, char
                
        if (argc != 3)
        {
-               command_print(cmd_ctx, "usage: nand erase <num> <first> <last>");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
        }
        
        p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1128,8 +1165,8 @@ int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char
                
        if ((argc < 1) || (argc > 3) || (argc == 2))
        {
-               command_print(cmd_ctx, "usage: nand check_bad_blocks <num> [<first> <last>]");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
        }
        
        if (argc == 3)
@@ -1168,8 +1205,8 @@ int handle_nand_copy_command(struct command_context_s *cmd_ctx, char *cmd, char
                
        if (argc != 4)
        {
-               command_print(cmd_ctx, "usage: nand copy <num> <offset> <length> <ram-address>");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
        }
        
        p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1201,8 +1238,8 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
                
        if (argc < 3)
        {
-               command_print(cmd_ctx, "usage: nand write <num> <file> <offset> [options]");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
        }
        
        p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1315,8 +1352,7 @@ int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char
                        
        if (argc < 4)
        {
-               command_print(cmd_ctx, "usage: nand dump <num> <filename> <address> <size> [options]");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
        
        p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1437,8 +1473,7 @@ int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, char *cmd,
                
        if ((argc < 1) || (argc > 2))
        {
-               command_print(cmd_ctx, "usage: nand raw_access <num> ['enable'|'disable']");
-               return ERROR_OK;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
        
        p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1458,7 +1493,7 @@ int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, char *cmd,
                                }
                                else
                                {
-                                       command_print(cmd_ctx, "usage: nand raw_access ['enable'|disable']");
+                                       return ERROR_COMMAND_SYNTAX_ERROR;
                                }
                        }