diff options
| author | Petr Kulhavy <[email protected]> | 2016-09-09 10:27:17 +0200 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2016-10-01 20:04:56 -0400 |
| commit | da2ee24d9150448e1816db790b4e11e2cf53df20 (patch) | |
| tree | b097bf835f6f8ab1def6efd9db1e96acd2a84653 /disk/part_iso.c | |
| parent | b6dd69a4d6b20862a2075f402f9edfb0de6d14ed (diff) | |
disk: part: refactor generic name creation for DOS and ISO
In both DOS and ISO partition tables the same code to create partition name
like "hda1" was repeated.
Code moved to into a new function part_set_generic_name() in part.c and optimized.
Added recognition of MMC and SD types, name is like "mmcsda1".
Signed-off-by: Petr Kulhavy <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Acked-by: Steve Rae <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Diffstat (limited to 'disk/part_iso.c')
| -rw-r--r-- | disk/part_iso.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/disk/part_iso.c b/disk/part_iso.c index 78fc97e4f13..bb8ed658f22 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) { |