X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=common%2Fcmd_sata.c;h=7b1703fe4133df3866f023cdd45d7219026be791;hb=3f8550c5e93c65433d51c711e5d8d58fa5dfde7d;hp=e84977870ab7b96a17635b01b45f2c2bbbde3a48;hpb=156feb90d200f186cdfd856d7f6f1878bb1bec1e;p=u-boot

diff --git a/common/cmd_sata.c b/common/cmd_sata.c
index e84977870a..7b1703fe41 100644
--- a/common/cmd_sata.c
+++ b/common/cmd_sata.c
@@ -28,7 +28,7 @@
 #include <part.h>
 #include <sata.h>
 
-int curr_device = -1;
+int sata_curr_device = -1;
 block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
 
 int __sata_initialize(void)
@@ -52,17 +52,19 @@ int __sata_initialize(void)
 		if ((sata_dev_desc[i].lba > 0) && (sata_dev_desc[i].blksz > 0))
 			init_part(&sata_dev_desc[i]);
 	}
-	curr_device = 0;
+	sata_curr_device = 0;
 	return rc;
 }
 int sata_initialize(void) __attribute__((weak,alias("__sata_initialize")));
 
+#ifdef CONFIG_PARTITIONS
 block_dev_desc_t *sata_get_dev(int dev)
 {
 	return (dev < CONFIG_SYS_SATA_MAX_DEVICE) ? &sata_dev_desc[dev] : NULL;
 }
+#endif
 
-int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	int rc = 0;
 
@@ -70,15 +72,14 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 		return sata_initialize();
 
 	/* If the user has not yet run `sata init`, do it now */
-	if (curr_device == -1)
+	if (sata_curr_device == -1)
 		if (sata_initialize())
 			return 1;
 
 	switch (argc) {
 	case 0:
 	case 1:
-		cmd_usage(cmdtp);
-		return 1;
+		return CMD_RET_USAGE;
 	case 2:
 		if (strncmp(argv[1],"inf", 3) == 0) {
 			int i;
@@ -91,12 +92,12 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 			}
 			return 0;
 		} else if (strncmp(argv[1],"dev", 3) == 0) {
-			if ((curr_device < 0) || (curr_device >= CONFIG_SYS_SATA_MAX_DEVICE)) {
+			if ((sata_curr_device < 0) || (sata_curr_device >= CONFIG_SYS_SATA_MAX_DEVICE)) {
 				puts("\nno SATA devices available\n");
 				return 1;
 			}
-			printf("\nSATA device %d: ", curr_device);
-			dev_print(&sata_dev_desc[curr_device]);
+			printf("\nSATA device %d: ", sata_curr_device);
+			dev_print(&sata_dev_desc[sata_curr_device]);
 			return 0;
 		} else if (strncmp(argv[1],"part",4) == 0) {
 			int dev, ok;
@@ -115,8 +116,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 			}
 			return rc;
 		}
-		cmd_usage(cmdtp);
-		return 1;
+		return CMD_RET_USAGE;
 	case 3:
 		if (strncmp(argv[1], "dev", 3) == 0) {
 			int dev = (int)simple_strtoul(argv[2], NULL, 10);
@@ -131,7 +131,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 			if (sata_dev_desc[dev].type == DEV_TYPE_UNKNOWN)
 				return 1;
 
-			curr_device = dev;
+			sata_curr_device = dev;
 
 			puts("... is now current device\n");
 
@@ -147,8 +147,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 			}
 			return rc;
 		}
-		cmd_usage(cmdtp);
-		return 1;
+		return CMD_RET_USAGE;
 
 	default: /* at least 4 args */
 		if (strcmp(argv[1], "read") == 0) {
@@ -158,12 +157,12 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 			lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
 
 			printf("\nSATA read: device %d block # %ld, count %ld ... ",
-				curr_device, blk, cnt);
+				sata_curr_device, blk, cnt);
 
-			n = sata_read(curr_device, blk, cnt, (u32 *)addr);
+			n = sata_read(sata_curr_device, blk, cnt, (u32 *)addr);
 
 			/* flush cache after read */
-			flush_cache(addr, cnt * sata_dev_desc[curr_device].blksz);
+			flush_cache(addr, cnt * sata_dev_desc[sata_curr_device].blksz);
 
 			printf("%ld blocks read: %s\n",
 				n, (n==cnt) ? "OK" : "ERROR");
@@ -176,16 +175,15 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 			lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
 
 			printf("\nSATA write: device %d block # %ld, count %ld ... ",
-				curr_device, blk, cnt);
+				sata_curr_device, blk, cnt);
 
-			n = sata_write(curr_device, blk, cnt, (u32 *)addr);
+			n = sata_write(sata_curr_device, blk, cnt, (u32 *)addr);
 
 			printf("%ld blocks written: %s\n",
 				n, (n == cnt) ? "OK" : "ERROR");
 			return (n == cnt) ? 0 : 1;
 		} else {
-			cmd_usage(cmdtp);
-			rc = 1;
+			return CMD_RET_USAGE;
 		}
 
 		return rc;
@@ -200,4 +198,5 @@ U_BOOT_CMD(
 	"sata device [dev] - show or set current device\n"
 	"sata part [dev] - print partition table\n"
 	"sata read addr blk# cnt\n"
-	"sata write addr blk# cnt\n");
+	"sata write addr blk# cnt"
+);