Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / cmd / scsi.c

diff --git a/cmd/scsi.c b/cmd/scsi.c
index 387ca1a262ab505c9e680c8874111a91bcf4bc5d..b9d086fb6b1943130193d02b20aef5d4905286f5 100644 (file)
--- a/cmd/scsi.c
+++ b/cmd/scsi.c
@@ -17,7 +17,7 @@ static int scsi_curr_dev; /* current device */
 /*
  * scsi boot command intepreter. Derived from diskboot
  */
-int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
        return common_diskboot(cmdtp, "scsi", argc, argv);
 }
@@ -25,95 +25,30 @@ int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 /*
  * scsi command intepreter
  */
-int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
-       switch (argc) {
-       case 0:
-       case 1:
-               return CMD_RET_USAGE;
-       case 2:
+       int ret;
+
+       if (argc == 2) {
                if (strncmp(argv[1], "res", 3) == 0) {
                        printf("\nReset SCSI\n");
-                       scsi_bus_reset();
-                       scsi_scan(1);
-                       return 0;
-               }
-               if (strncmp(argv[1], "inf", 3) == 0) {
-                       blk_list_devices(IF_TYPE_SCSI);
-                       return 0;
-               }
-               if (strncmp(argv[1], "dev", 3) == 0) {
-                       if (blk_print_device_num(IF_TYPE_SCSI, scsi_curr_dev)) {
-                               printf("\nno SCSI devices available\n");
+#ifndef CONFIG_DM_SCSI
+                       scsi_bus_reset(NULL);
+#endif
+                       ret = scsi_scan(true);
+                       if (ret)
                                return CMD_RET_FAILURE;
-                       }
-
-                       return 0;
+                       return ret;
                }
                if (strncmp(argv[1], "scan", 4) == 0) {
-                       scsi_scan(1);
-                       return 0;
-               }
-               if (strncmp(argv[1], "part", 4) == 0) {
-                       if (blk_list_part(IF_TYPE_SCSI))
-                               printf("\nno SCSI devices available\n");
-                       return 0;
-               }
-               return CMD_RET_USAGE;
-       case 3:
-               if (strncmp(argv[1], "dev", 3) == 0) {
-                       int dev = (int)simple_strtoul(argv[2], NULL, 10);
-
-                       if (!blk_show_device(IF_TYPE_SCSI, dev)) {
-                               scsi_curr_dev = dev;
-                               printf("... is now current device\n");
-                       } else {
-                               return CMD_RET_FAILURE;
-                       }
-                       return 0;
-               }
-               if (strncmp(argv[1], "part", 4) == 0) {
-                       int dev = (int)simple_strtoul(argv[2], NULL, 10);
-
-                       if (blk_print_part_devnum(IF_TYPE_SCSI, dev)) {
-                               printf("\nSCSI device %d not available\n",
-                                      dev);
+                       ret = scsi_scan(true);
+                       if (ret)
                                return CMD_RET_FAILURE;
-                       }
-                       return 0;
+                       return ret;
                }
-               return CMD_RET_USAGE;
-       default:
-               /* at least 4 args */
-               if (strcmp(argv[1], "read") == 0) {
-                       ulong addr = simple_strtoul(argv[2], NULL, 16);
-                       ulong blk  = simple_strtoul(argv[3], NULL, 16);
-                       ulong cnt  = simple_strtoul(argv[4], NULL, 16);
-                       ulong n;
-
-                       printf("\nSCSI read: device %d block # %ld, count %ld ... ",
-                              scsi_curr_dev, blk, cnt);
-                       n = blk_read_devnum(IF_TYPE_SCSI, scsi_curr_dev, blk,
-                                           cnt, (ulong *)addr);
-                       printf("%ld blocks read: %s\n", n,
-                              n == cnt ? "OK" : "ERROR");
-                       return 0;
-               } else if (strcmp(argv[1], "write") == 0) {
-                       ulong addr = simple_strtoul(argv[2], NULL, 16);
-                       ulong blk = simple_strtoul(argv[3], NULL, 16);
-                       ulong cnt = simple_strtoul(argv[4], NULL, 16);
-                       ulong n;
+       }
 
-                       printf("\nSCSI write: device %d block # %ld, count %ld ... ",
-                              scsi_curr_dev, blk, cnt);
-                       n = blk_write_devnum(IF_TYPE_SCSI, scsi_curr_dev, blk,
-                                            cnt, (ulong *)addr);
-                       printf("%ld blocks written: %s\n", n,
-                              n == cnt ? "OK" : "ERROR");
-                       return 0;
-               }
-       } /* switch */
-       return CMD_RET_USAGE;
+       return blk_common_cmd(argc, argv, IF_TYPE_SCSI, &scsi_curr_dev);
 }
 
 U_BOOT_CMD(