X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=disk%2Fpart_iso.c;h=bb8ed658f22538a64dfd1643cd37ed821313dc99;hb=daa0f0500f2bf6fdda7c359c24d4fc6ca46f6159;hp=9f5c50c73faba4cf2c51bd030f70401914a78092;hpb=ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be;p=oweals%2Fu-boot.git

diff --git a/disk/part_iso.c b/disk/part_iso.c
index 9f5c50c73f..bb8ed658f2 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -137,30 +137,7 @@ int part_get_info_iso_verb(struct blk_desc *dev_desc, int part_num,
 	entry_num=1;
 	offset=0x20;
 	strcpy((char *)info->type, "U-Boot");
-	switch(dev_desc->if_type) {
-		case IF_TYPE_IDE:
-		case IF_TYPE_SATA:
-		case IF_TYPE_ATAPI:
-			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->devnum, part_num);
-			break;
-		case IF_TYPE_USB:
-			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->devnum, part_num);
-			break;
-		default:
-			sprintf ((char *)info->name, "xx%c%d",
-				'a' + dev_desc->devnum, part_num);
-			break;
-	}
+	part_set_generic_name(dev_desc, part_num, (char *)info->name);
 	/* the bootcatalog (including validation Entry) is limited to 2048Bytes
 	 * (63 boot entries + validation entry) */
 	 while(offset<2048) {
@@ -233,13 +210,13 @@ static void part_print_iso(struct blk_desc *dev_desc)
 	disk_partition_t info;
 	int i;
 
-	if (part_get_info_iso_verb(dev_desc, 0, &info, 0) == -1) {
+	if (part_get_info_iso_verb(dev_desc, 1, &info, 0) == -1) {
 		printf("** No boot partition found on device %d **\n",
 		       dev_desc->devnum);
 		return;
 	}
 	printf("Part   Start     Sect x Size Type\n");
-	i=0;
+	i=1;
 	do {
 		printf(" %2d " LBAFU " " LBAFU " %6ld %.32s\n",
 		       i, info.start, info.size, info.blksz, info.type);
@@ -257,6 +234,7 @@ static int part_test_iso(struct blk_desc *dev_desc)
 U_BOOT_PART_TYPE(iso) = {
 	.name		= "ISO",
 	.part_type	= PART_TYPE_ISO,
+	.max_entries	= ISO_ENTRY_NUMBERS,
 	.get_info	= part_get_info_iso,
 	.print		= part_print_iso,
 	.test		= part_test_iso,