]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
fs: fat: fix file_fat_detectfs()
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Mon, 25 Jan 2021 11:53:14 +0000 (12:53 +0100)
committerHeinrich Schuchardt <xypron.glpk@gmx.de>
Sat, 10 Apr 2021 10:00:24 +0000 (12:00 +0200)
Up to now file_fat_detectfs() did not detect some interface types like
EFI, HOST, VIRTIO.

Avoid duplicate code by calling blk_get_if_type_name().

The interface type now will be shown in lower case to match all other use
cases.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
fs/fat/fat.c

index ccba268f610c347f966daa0d268fba75fdc98260..c561d82b3514070621f535ee5d9607d4425cd78a 100644 (file)
@@ -1147,42 +1147,12 @@ int file_fat_detectfs(void)
                return 1;
        }
 
-#if defined(CONFIG_IDE) || \
-    defined(CONFIG_SATA) || \
-    defined(CONFIG_SCSI) || \
-    defined(CONFIG_CMD_USB) || \
-    defined(CONFIG_MMC)
-       printf("Interface:  ");
-       switch (cur_dev->if_type) {
-       case IF_TYPE_IDE:
-               printf("IDE");
-               break;
-       case IF_TYPE_SATA:
-               printf("SATA");
-               break;
-       case IF_TYPE_SCSI:
-               printf("SCSI");
-               break;
-       case IF_TYPE_ATAPI:
-               printf("ATAPI");
-               break;
-       case IF_TYPE_USB:
-               printf("USB");
-               break;
-       case IF_TYPE_DOC:
-               printf("DOC");
-               break;
-       case IF_TYPE_MMC:
-               printf("MMC");
-               break;
-       default:
-               printf("Unknown");
+       if (IS_ENABLED(CONFIG_HAVE_BLOCK_DEVICE)) {
+               printf("Interface:  %s\n", blk_get_if_type_name(cur_dev->if_type));
+               printf("  Device %d: ", cur_dev->devnum);
+               dev_print(cur_dev);
        }
 
-       printf("\n  Device %d: ", cur_dev->devnum);
-       dev_print(cur_dev);
-#endif
-
        if (read_bootsectandvi(&bs, &volinfo, &fatsize)) {
                printf("\nNo valid FAT fs found\n");
                return 1;