Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

diff --git a/disk/part_iso.c b/disk/part_iso.c
index 72259274c173362e68341ca406023ef7acd5ba23..cc323b099cd50cf72154d2d3afabe6d000928a15 100644 (file)
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -23,12 +23,11 @@
 
 #include <common.h>
 #include <command.h>
-#include <cmd_disk.h>
 #include "part_iso.h"
 
-#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_ISO_PARTITION)
+#ifdef HAVE_BLOCK_DEVICE
 
-#undef ISO_PART_DEBUG
+/* #define     ISO_PART_DEBUG */
 
 #ifdef ISO_PART_DEBUG
 #define        PRINTF(fmt,args...)     printf (fmt ,##args)
@@ -74,17 +73,20 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_
        iso_val_entry_t *pve = (iso_val_entry_t *)tmpbuf;
        iso_init_def_entry_t *pide;
 
+       if (dev_desc->blksz != CD_SECTSIZE)
+               return -1;
+
        /* the first sector (sector 0x10) must be a primary volume desc */
        blkaddr=PVD_OFFSET;
        if (dev_desc->block_read (dev_desc->dev, PVD_OFFSET, 1, (ulong *) tmpbuf) != 1)
-       return (-1);
+       return (-1);
        if(ppr->desctype!=0x01) {
                if(verb)
                        printf ("** First descriptor is NOT a primary desc on %d:%d **\n",
                                dev_desc->dev, part_num);
                return (-1);
        }
-       if(strncmp(ppr->stand_ident,"CD001",5)!=0) {
+       if(strncmp((char *)ppr->stand_ident,"CD001",5)!=0) {
                if(verb)
                        printf ("** Wrong ISO Ident: %s on %d:%d **\n",
                                ppr->stand_ident,dev_desc->dev, part_num);
@@ -99,7 +101,7 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_
        for(i=blkaddr;i<lastsect;i++) {
                PRINTF("Reading block %d\n", i);
                if (dev_desc->block_read (dev_desc->dev, i, 1, (ulong *) tmpbuf) != 1)
-               return (-1);
+               return (-1);
                if(ppr->desctype==0x00)
                        break; /* boot entry found */
                if(ppr->desctype==0xff) {
@@ -109,7 +111,7 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_
                        return (-1);
                }
        }
-       /* boot entry found */
+       /* boot entry found */
        if(strncmp(pbr->ident_str,"EL TORITO SPECIFICATION",23)!=0) {
                if(verb)
                        printf ("** Wrong El Torito ident: %s on %d:%d **\n",
@@ -151,23 +153,29 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_
        /* the validation entry seems to be ok, now search the "partition" */
        entry_num=0;
        offset=0x20;
-       sprintf (info->type, "U-Boot");
+       sprintf ((char *)info->type, "U-Boot");
        switch(dev_desc->if_type) {
                case IF_TYPE_IDE:
+               case IF_TYPE_SATA:
                case IF_TYPE_ATAPI:
-                       sprintf (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 (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 (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 (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 (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;
        }
        /* the bootcatalog (including validation Entry) is limited to 2048Bytes
@@ -230,7 +238,6 @@ int get_partition_info_iso(block_dev_desc_t * dev_desc, int part_num, disk_parti
 }
 
 
-
 void print_part_iso(block_dev_desc_t * dev_desc)
 {
        disk_partition_t info;
@@ -255,4 +262,4 @@ int test_part_iso (block_dev_desc_t *dev_desc)
        return(get_partition_info_iso_verb(dev_desc,0,&info,0));
 }
 
-#endif /* ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_ISO_PARTITION) */
+#endif