board/sbc405/strataflash.c: Fix GCC 4.6 build warning

[karo-tx-uboot.git] / disk / part_dos.c

diff --git a/disk/part_dos.c b/disk/part_dos.c
index 4707f803dc182897a76289897894b30346f2f338..b5bcb3735c0fb6148e3c09736694b0fbb833d653 100644 (file)
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -35,11 +35,13 @@
 #include <ide.h>
 #include "part_dos.h"
 
-#if (defined(CONFIG_CMD_IDE) || \
-     defined(CONFIG_CMD_SCSI) || \
-     defined(CONFIG_CMD_USB) || \
-     defined(CONFIG_MMC) || \
-     defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_DOS_PARTITION)
+#if defined(CONFIG_CMD_IDE) || \
+    defined(CONFIG_CMD_MG_DISK) || \
+    defined(CONFIG_CMD_SATA) || \
+    defined(CONFIG_CMD_SCSI) || \
+    defined(CONFIG_CMD_USB) || \
+    defined(CONFIG_MMC) || \
+    defined(CONFIG_SYSTEMACE)
 
 /* Convert char[4] in little endian format to the host format integer
  */
@@ -75,15 +77,17 @@ static int test_block_type(unsigned char *buffer)
            (buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) ) {
                return (-1);
        } /* no DOS Signature at all */
-       if(strncmp((char *)&buffer[DOS_PBR_FSTYPE_OFFSET],"FAT",3)==0)
+       if (strncmp((char *)&buffer[DOS_PBR_FSTYPE_OFFSET],"FAT",3)==0 ||
+           strncmp((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET],"FAT32",5)==0) {
                return DOS_PBR; /* is PBR */
+       }
        return DOS_MBR;     /* Is MBR */
 }
 
 
 int test_part_dos (block_dev_desc_t *dev_desc)
 {
-       unsigned char buffer[DEFAULT_SECTOR_SIZE];
+       unsigned char buffer[dev_desc->blksz];
 
        if ((dev_desc->block_read(dev_desc->dev, 0, 1, (ulong *) buffer) != 1) ||
            (buffer[DOS_PART_MAGIC_OFFSET + 0] != 0x55) ||
@@ -98,7 +102,7 @@ int test_part_dos (block_dev_desc_t *dev_desc)
 static void print_partition_extended (block_dev_desc_t *dev_desc, int ext_part_sector, int relative,
                                                           int part_num)
 {
-       unsigned char buffer[DEFAULT_SECTOR_SIZE];
+       unsigned char buffer[dev_desc->blksz];
        dos_partition_t *pt;
        int i;
 
@@ -162,7 +166,7 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part
                                 int relative, int part_num,
                                 int which_part, disk_partition_t *info)
 {
-       unsigned char buffer[DEFAULT_SECTOR_SIZE];
+       unsigned char buffer[dev_desc->blksz];
        dos_partition_t *pt;
        int i;
 
@@ -186,7 +190,8 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part
                 * fdisk does not show the extended partitions that
                 * are not in the MBR
                 */
-               if ((pt->sys_ind != 0) &&
+               if (((pt->boot_ind & ~0x80) == 0) &&
+                   (pt->sys_ind != 0) &&
                    (part_num == which_part) &&
                    (is_extended(pt->sys_ind) == 0)) {
                        info->blksz = 512;
@@ -194,20 +199,26 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part
                        info->size  = le32_to_int (pt->size4);
                        switch(dev_desc->if_type) {
                                case IF_TYPE_IDE:
+                               case IF_TYPE_SATA:
                                case IF_TYPE_ATAPI:
-                                       sprintf ((char *)info->name, "hd%c%d\n", 'a' + dev_desc->dev, part_num);
+                                       sprintf ((char *)info->name, "hd%c%d",
+                                               'a' + dev_desc->dev, part_num);
                                        break;
                                case IF_TYPE_SCSI:
-                                       sprintf ((char *)info->name, "sd%c%d\n", 'a' + dev_desc->dev, part_num);
+                                       sprintf ((char *)info->name, "sd%c%d",
+                                               'a' + dev_desc->dev, part_num);
                                        break;
                                case IF_TYPE_USB:
-                                       sprintf ((char *)info->name, "usbd%c%d\n", 'a' + dev_desc->dev, part_num);
+                                       sprintf ((char *)info->name, "usbd%c%d",
+                                               'a' + dev_desc->dev, part_num);
                                        break;
                                case IF_TYPE_DOC:
-                                       sprintf ((char *)info->name, "docd%c%d\n", 'a' + dev_desc->dev, part_num);
+                                       sprintf ((char *)info->name, "docd%c%d",
+                                               'a' + dev_desc->dev, part_num);
                                        break;
                                default:
-                                       sprintf ((char *)info->name, "xx%c%d\n", 'a' + dev_desc->dev, part_num);
+                                       sprintf ((char *)info->name, "xx%c%d",
+                                               'a' + dev_desc->dev, part_num);
                                        break;
                        }
                        /* sprintf(info->type, "%d, pt->sys_ind); */