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

[karo-tx-uboot.git] / disk / part.c

diff --git a/disk/part.c b/disk/part.c
index 47dc39bae66c025fbbf7cd103844e20c22ce269f..56b9427c260b5cd61c097b6128492056626ee76f 100644 (file)
--- a/disk/part.c
+++ b/disk/part.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <command.h>
 #include <ide.h>
-#include <cmd_disk.h>
+#include <part.h>
 
 #undef PART_DEBUG
 
@@ -34,7 +34,63 @@
 #define PRINTF(fmt,args...)
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)
+#if (defined(CONFIG_CMD_IDE) || \
+     defined(CONFIG_CMD_SCSI) || \
+     defined(CONFIG_CMD_USB) || \
+     defined(CONFIG_MMC) || \
+     defined(CONFIG_SYSTEMACE) )
+
+struct block_drvr {
+       char *name;
+       block_dev_desc_t* (*get_dev)(int dev);
+};
+
+static const struct block_drvr block_drvr[] = {
+#if defined(CONFIG_CMD_IDE)
+       { .name = "ide", .get_dev = ide_get_dev, },
+#endif
+#if defined(CONFIG_CMD_SCSI)
+       { .name = "scsi", .get_dev = scsi_get_dev, },
+#endif
+#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
+       { .name = "usb", .get_dev = usb_stor_get_dev, },
+#endif
+#if defined(CONFIG_MMC)
+       { .name = "mmc", .get_dev = mmc_get_dev, },
+#endif
+#if defined(CONFIG_SYSTEMACE)
+       { .name = "ace", .get_dev = systemace_get_dev, },
+#endif
+       { },
+};
+
+DECLARE_GLOBAL_DATA_PTR;
+
+block_dev_desc_t *get_dev(char* ifname, int dev)
+{
+       const struct block_drvr *drvr = block_drvr;
+       block_dev_desc_t* (*reloc_get_dev)(int dev);
+
+       while (drvr->name) {
+               reloc_get_dev = drvr->get_dev + gd->reloc_off;
+               if (strncmp(ifname, drvr->name, strlen(drvr->name)) == 0)
+                       return reloc_get_dev(dev);
+               drvr++;
+       }
+       return NULL;
+}
+#else
+block_dev_desc_t *get_dev(char* ifname, int dev)
+{
+       return NULL;
+}
+#endif
+
+#if (defined(CONFIG_CMD_IDE) || \
+     defined(CONFIG_CMD_SCSI) || \
+     defined(CONFIG_CMD_USB) || \
+     defined(CONFIG_MMC) || \
+     defined(CONFIG_SYSTEMACE) )
 
 /* ------------------------------------------------------------------------- */
 /*
@@ -42,7 +98,11 @@
  */
 void dev_print (block_dev_desc_t *dev_desc)
 {
-       ulong lba512; /* number of blocks if 512bytes block size */
+#ifdef CONFIG_LBA48
+       uint64_t lba512; /* number of blocks if 512bytes block size */
+#else
+       lbaint_t lba512;
+#endif
 
        if (dev_desc->type==DEV_TYPE_UNKNOWN) {
                puts ("not available\n");
@@ -80,9 +140,11 @@ void dev_print (block_dev_desc_t *dev_desc)
        puts ("\n");
        if ((dev_desc->lba * dev_desc->blksz)>0L) {
                ulong mb, mb_quot, mb_rem, gb, gb_quot, gb_rem;
+               lbaint_t lba;
 
-               lba512 = (dev_desc->lba * (dev_desc->blksz/512));
+               lba = dev_desc->lba;
 
+               lba512 = (lba * (dev_desc->blksz/512));
                mb = (10 * lba512) / 2048;      /* 2048 = (1024 * 1024) / 512 MB */
                /* round to 1 digit */
                mb_quot = mb / 10;
@@ -91,17 +153,34 @@ void dev_print (block_dev_desc_t *dev_desc)
                gb = mb / 1024;
                gb_quot = gb / 10;
                gb_rem  = gb - (10 * gb_quot);
-
+#ifdef CONFIG_LBA48
+               if (dev_desc->lba48)
+                       printf ("            Supports 48-bit addressing\n");
+#endif
+#if defined(CFG_64BIT_LBA) && defined(CFG_64BIT_VSPRINTF)
+               printf ("            Capacity: %ld.%ld MB = %ld.%ld GB (%qd x %ld)\n",
+                       mb_quot, mb_rem,
+                       gb_quot, gb_rem,
+                       lba,
+                       dev_desc->blksz);
+#else
                printf ("            Capacity: %ld.%ld MB = %ld.%ld GB (%ld x %ld)\n",
                        mb_quot, mb_rem,
                        gb_quot, gb_rem,
-                       dev_desc->lba,
+                       (ulong)lba,
                        dev_desc->blksz);
+#endif
        } else {
                puts ("            Capacity: not available\n");
        }
 }
+#endif
 
+#if (defined(CONFIG_CMD_IDE) || \
+     defined(CONFIG_CMD_SCSI) || \
+     defined(CONFIG_CMD_USB) || \
+     defined(CONFIG_MMC)               || \
+     defined(CONFIG_SYSTEMACE)          )
 
 #if defined(CONFIG_MAC_PARTITION) || \
     defined(CONFIG_DOS_PARTITION) || \
@@ -140,9 +219,10 @@ void init_part (block_dev_desc_t * dev_desc)
 }
 
 
-int get_partition_info (block_dev_desc_t *dev_desc, int part, disk_partition_t *info)
+int get_partition_info (block_dev_desc_t *dev_desc, int part
+                                       , disk_partition_t *info)
 {
-               switch (dev_desc->part_type) {
+       switch (dev_desc->part_type) {
 #ifdef CONFIG_MAC_PARTITION
        case PART_TYPE_MAC:
                if (get_partition_info_mac(dev_desc,part,info) == 0) {
@@ -246,7 +326,8 @@ void print_part (block_dev_desc_t * dev_desc)
 
 
 #else  /* neither MAC nor DOS nor ISO partition configured */
-# error neither CONFIG_MAC_PARTITION nor CONFIG_DOS_PARTITION nor CONFIG_ISO_PARTITION configured!
+# error neither CONFIG_MAC_PARTITION nor CONFIG_DOS_PARTITION
+# error nor CONFIG_ISO_PARTITION configured!
 #endif
 
-#endif /* (CONFIG_COMMANDS & CFG_CMD_IDE) || CONFIG_COMMANDS & CFG_CMD_SCSI) */
+#endif