[U-Boot-Users] [PATCH] Fix disk type output in disk/part.c. The recent commit c7057b52 (ata:
Signed-off-by: Detlev Zundel dzu@denx.de --- disk/part.c | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/disk/part.c b/disk/part.c index 3c71208..1f8538a 100644 --- a/disk/part.c +++ b/disk/part.c @@ -109,29 +109,25 @@ void dev_print (block_dev_desc_t *dev_desc) lbaint_t lba512; #endif
- if (dev_desc->type==DEV_TYPE_UNKNOWN) { - puts ("not available\n"); - return; - } - if (dev_desc->if_type==IF_TYPE_SCSI) { - printf ("(%d:%d) ", dev_desc->target,dev_desc->lun); - } - if (dev_desc->if_type==IF_TYPE_IDE) { - printf ("Model: %s Firm: %s Ser#: %s\n", + switch (dev_desc->type) { + case IF_TYPE_SCSI: + printf ("(%d:%d) Vendor: %s Prod.: %s Rev: %s\n", + dev_desc->target,dev_desc->lun, dev_desc->vendor, - dev_desc->revision, - dev_desc->product); - } - if (dev_desc->if_type==IF_TYPE_SATA) { + dev_desc->product, + dev_desc->revision); + break; + case IF_TYPE_IDE: + case IF_TYPE_SATA: printf ("Model: %s Firm: %s Ser#: %s\n", dev_desc->vendor, dev_desc->revision, dev_desc->product); - } else { - printf ("Vendor: %s Prod.: %s Rev: %s\n", - dev_desc->vendor, - dev_desc->product, - dev_desc->revision); + break; + case DEV_TYPE_UNKNOWN: + default: + puts ("not available\n"); + return; } puts (" Type: "); if (dev_desc->removable)
Signed-off-by: Detlev Zundel dzu@denx.de --- disk/part.c | 60 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/disk/part.c b/disk/part.c index 1f8538a..316e254 100644 --- a/disk/part.c +++ b/disk/part.c @@ -133,16 +133,21 @@ void dev_print (block_dev_desc_t *dev_desc) if (dev_desc->removable) puts ("Removable "); switch (dev_desc->type & 0x1F) { - case DEV_TYPE_HARDDISK: puts ("Hard Disk"); - break; - case DEV_TYPE_CDROM: puts ("CD ROM"); - break; - case DEV_TYPE_OPDISK: puts ("Optical Device"); - break; - case DEV_TYPE_TAPE: puts ("Tape"); - break; - default: printf ("# %02X #", dev_desc->type & 0x1F); - break; + case DEV_TYPE_HARDDISK: + puts ("Hard Disk"); + break; + case DEV_TYPE_CDROM: + puts ("CD ROM"); + break; + case DEV_TYPE_OPDISK: + puts ("Optical Device"); + break; + case DEV_TYPE_TAPE: + puts ("Tape"); + break; + default: + printf ("# %02X #", dev_desc->type & 0x1F); + break; } puts ("\n"); if ((dev_desc->lba * dev_desc->blksz)>0L) { @@ -277,20 +282,27 @@ static void print_part_header (const char *type, block_dev_desc_t * dev_desc) { puts ("\nPartition Map for "); switch (dev_desc->if_type) { - case IF_TYPE_IDE: puts ("IDE"); - break; - case IF_TYPE_SATA: puts ("SATA"); - break; - case IF_TYPE_SCSI: puts ("SCSI"); - break; - case IF_TYPE_ATAPI: puts ("ATAPI"); - break; - case IF_TYPE_USB: puts ("USB"); - break; - case IF_TYPE_DOC: puts ("DOC"); - break; - default: puts ("UNKNOWN"); - break; + case IF_TYPE_IDE: + puts ("IDE"); + break; + case IF_TYPE_SATA: + puts ("SATA"); + break; + case IF_TYPE_SCSI: + puts ("SCSI"); + break; + case IF_TYPE_ATAPI: + puts ("ATAPI"); + break; + case IF_TYPE_USB: + puts ("USB"); + break; + case IF_TYPE_DOC: + puts ("DOC"); + break; + default: + puts ("UNKNOWN"); + break; } printf (" device %d -- Partition Type: %s\n\n", dev_desc->dev, type);
In message 1209996682-1709-2-git-send-email-dzu@denx.de you wrote:
Signed-off-by: Detlev Zundel dzu@denx.de
disk/part.c | 60 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 24 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
In message 1209996682-1709-1-git-send-email-dzu@denx.de you wrote:
Signed-off-by: Detlev Zundel dzu@denx.de
disk/part.c | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/disk/part.c b/disk/part.c index 3c71208..1f8538a 100644
Applied, thanks.
[Dropped truncated part of commit message, though.]
Best regards,
Wolfgang Denk
participants (2)
-
Detlev Zundel -
Wolfgang Denk