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

[platform/kernel/u-boot.git] / disk / part_dos.c

diff --git a/disk/part_dos.c b/disk/part_dos.c
index 4a56391..511917a 100644 (file)
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -87,11 +87,11 @@ static int test_block_type(unsigned char *buffer)
 }
 
 
-static int test_part_dos(struct blk_desc *dev_desc)
+static int part_test_dos(struct blk_desc *dev_desc)
 {
        ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
 
-       if (dev_desc->block_read(dev_desc, 0, 1, (ulong *)buffer) != 1)
+       if (blk_dread(dev_desc, 0, 1, (ulong *)buffer) != 1)
                return -1;
 
        if (test_block_type(buffer) != DOS_MBR)
@@ -111,10 +111,9 @@ static void print_partition_extended(struct blk_desc *dev_desc,
        dos_partition_t *pt;
        int i;
 
-       if (dev_desc->block_read(dev_desc, ext_part_sector, 1,
-                                (ulong *)buffer) != 1) {
+       if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {
                printf ("** Can't read partition table on %d:" LBAFU " **\n",
-                       dev_desc->dev, ext_part_sector);
+                       dev_desc->devnum, ext_part_sector);
                return;
        }
        i=test_block_type(buffer);
@@ -177,10 +176,9 @@ static int part_get_info_extended(struct blk_desc *dev_desc,
        int i;
        int dos_type;
 
-       if (dev_desc->block_read(dev_desc, ext_part_sector, 1,
-                                (ulong *)buffer) != 1) {
+       if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {
                printf ("** Can't read partition table on %d:" LBAFU " **\n",
-                       dev_desc->dev, ext_part_sector);
+                       dev_desc->devnum, ext_part_sector);
                return -1;
        }
        if (buffer[DOS_PART_MAGIC_OFFSET] != 0x55 ||
@@ -215,24 +213,29 @@ static int part_get_info_extended(struct blk_desc *dev_desc,
                                case IF_TYPE_IDE:
                                case IF_TYPE_SATA:
                                case IF_TYPE_ATAPI:
-                                       sprintf ((char *)info->name, "hd%c%d",
-                                               'a' + dev_desc->dev, part_num);
+                                       sprintf((char *)info->name, "hd%c%d",
+                                               'a' + dev_desc->devnum,
+                                               part_num);
                                        break;
                                case IF_TYPE_SCSI:
-                                       sprintf ((char *)info->name, "sd%c%d",
-                                               'a' + dev_desc->dev, part_num);
+                                       sprintf((char *)info->name, "sd%c%d",
+                                               'a' + dev_desc->devnum,
+                                               part_num);
                                        break;
                                case IF_TYPE_USB:
-                                       sprintf ((char *)info->name, "usbd%c%d",
-                                               'a' + dev_desc->dev, part_num);
+                                       sprintf((char *)info->name, "usbd%c%d",
+                                               'a' + dev_desc->devnum,
+                                               part_num);
                                        break;
                                case IF_TYPE_DOC:
-                                       sprintf ((char *)info->name, "docd%c%d",
-                                               'a' + dev_desc->dev, part_num);
+                                       sprintf((char *)info->name, "docd%c%d",
+                                               'a' + dev_desc->devnum,
+                                               part_num);
                                        break;
                                default:
-                                       sprintf ((char *)info->name, "xx%c%d",
-                                               'a' + dev_desc->dev, part_num);
+                                       sprintf((char *)info->name, "xx%c%d",
+                                               'a' + dev_desc->devnum,
+                                               part_num);
                                        break;
                        }
                        /* sprintf(info->type, "%d, pt->sys_ind); */
@@ -282,7 +285,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc,
        return -1;
 }
 
-void print_part_dos(struct blk_desc *dev_desc)
+void part_print_dos(struct blk_desc *dev_desc)
 {
        printf("Part\tStart Sector\tNum Sectors\tUUID\t\tType\n");
        print_partition_extended(dev_desc, 0, 0, 1, 0);
@@ -298,8 +301,8 @@ U_BOOT_PART_TYPE(dos) = {
        .name           = "DOS",
        .part_type      = PART_TYPE_DOS,
        .get_info       = part_get_info_ptr(part_get_info_dos),
-       .print          = part_print_ptr(print_part_dos),
-       .test           = test_part_dos,
+       .print          = part_print_ptr(part_print_dos),
+       .test           = part_test_dos,
 };
 
 #endif