* Code cleanup:

[people/ms/u-boot.git] / common / cmd_ide.c

diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index f1b24be684f5f58769dcfa5727b2ea1af4f3670f..c1e610ae60a51a96203b992d61cfc1a307136845 100644 (file)
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -39,7 +39,6 @@
 #endif
 #include <ide.h>
 #include <ata.h>
-#include <cmd_ide.h>
 #include <cmd_disk.h>
 #ifdef CONFIG_STATUS_LED
 # include <status_led.h>
@@ -798,7 +797,7 @@ output_data_short(int dev, ulong *sect_buf, int words)
 {
        ushort  *dbuf;
        volatile ushort *pbuf;
-       
+
        pbuf = (ushort *)(ATA_CURR_BASE(dev)+ATA_DATA_REG);
        dbuf = (ushort *)sect_buf;
        while (words--) {
@@ -828,8 +827,6 @@ input_swap_data(int dev, ulong *sect_buf, int words)
 #endif /* __PPC__ */
 
 
-
-
 #ifdef __PPC__
 static void
 output_data(int dev, ulong *sect_buf, int words)
@@ -1381,7 +1378,6 @@ static void ide_led (uchar led, uchar status)
  */
 
 
-
 #undef ATAPI_DEBUG
 
 #ifdef ATAPI_DEBUG
@@ -1681,7 +1677,6 @@ error:
 }
 
 
-
 static void    atapi_inquiry(block_dev_desc_t * dev_desc)
 {
        unsigned char ccb[12]; /* Command descriptor block */
@@ -1816,4 +1811,23 @@ ulong atapi_read (int device, ulong blknr, ulong blkcnt, ulong *buffer)
 
 #endif /* CONFIG_ATAPI */
 
+cmd_tbl_t U_BOOT_CMD(IDE) = MK_CMD_ENTRY(
+       "ide",  5,  1,  do_ide,
+       "ide     - IDE sub-system\n",
+       "reset - reset IDE controller\n"
+       "ide info  - show available IDE devices\n"
+       "ide device [dev] - show or set current device\n"
+       "ide part [dev] - print partition table of one or all IDE devices\n"
+       "ide read  addr blk# cnt\n"
+       "ide write addr blk# cnt - read/write `cnt'"
+       " blocks starting at block `blk#'\n"
+       "    to/from memory address `addr'\n"
+);
+
+cmd_tbl_t U_BOOT_CMD(DISK) = MK_CMD_ENTRY(
+       "diskboot",     3,      1,      do_diskboot,
+       "diskboot- boot from IDE device\n",
+       "loadAddr dev:part\n"
+);
+
 #endif /* CONFIG_COMMANDS & CFG_CMD_IDE */