Remove CONFIG_SYS_BOOTCOUNT_SINGLEWORD

[people/ms/u-boot.git] / disk / part_mac.c

diff --git a/disk/part_mac.c b/disk/part_mac.c
index 099e0a0035be07303ac6b69a646ab59ba6260819..e65930d8e7500f5391d6bd3264563aea6df6d97d 100644 (file)
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -19,7 +19,7 @@
 #include <ide.h>
 #include "part_mac.h"
 
-#ifdef HAVE_BLOCK_DEVICE
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
 
 /* stdlib.h causes some compatibility problems; should fixe these! -- wd */
 #ifndef __ldiv_t_defined
@@ -32,26 +32,31 @@ extern ldiv_t ldiv (long int __numer, long int __denom);
 #endif
 
 
-static int part_mac_read_ddb (block_dev_desc_t *dev_desc, mac_driver_desc_t *ddb_p);
-static int part_mac_read_pdb (block_dev_desc_t *dev_desc, int part, mac_partition_t *pdb_p);
+static int part_mac_read_ddb(struct blk_desc *dev_desc,
+                            mac_driver_desc_t *ddb_p);
+static int part_mac_read_pdb(struct blk_desc *dev_desc, int part,
+                            mac_partition_t *pdb_p);
 
 /*
  * Test for a valid MAC partition
  */
-int test_part_mac (block_dev_desc_t *dev_desc)
+static int part_test_mac(struct blk_desc *dev_desc)
 {
        ALLOC_CACHE_ALIGN_BUFFER(mac_driver_desc_t, ddesc, 1);
        ALLOC_CACHE_ALIGN_BUFFER(mac_partition_t, mpart, 1);
        ulong i, n;
 
        if (part_mac_read_ddb (dev_desc, ddesc)) {
-               /* error reading Driver Desriptor Block, or no valid Signature */
+               /*
+                * error reading Driver Descriptor Block,
+                * or no valid Signature
+                */
                return (-1);
        }
 
        n = 1;  /* assuming at least one partition */
        for (i=1; i<=n; ++i) {
-               if ((dev_desc->block_read(dev_desc->dev, i, 1, (ulong *)mpart) != 1) ||
+               if ((blk_dread(dev_desc, i, 1, (ulong *)mpart) != 1) ||
                    (mpart->signature != MAC_PARTITION_MAGIC) ) {
                        return (-1);
                }
@@ -61,8 +66,7 @@ int test_part_mac (block_dev_desc_t *dev_desc)
        return (0);
 }
 
-
-void print_part_mac (block_dev_desc_t *dev_desc)
+static void part_print_mac(struct blk_desc *dev_desc)
 {
        ulong i, n;
        ALLOC_CACHE_ALIGN_BUFFER(mac_driver_desc_t, ddesc, 1);
@@ -70,7 +74,10 @@ void print_part_mac (block_dev_desc_t *dev_desc)
        ldiv_t mb, gb;
 
        if (part_mac_read_ddb (dev_desc, ddesc)) {
-               /* error reading Driver Desriptor Block, or no valid Signature */
+               /*
+                * error reading Driver Descriptor Block,
+                * or no valid Signature
+                */
                return;
        }
 
@@ -104,16 +111,16 @@ void print_part_mac (block_dev_desc_t *dev_desc)
                char c;
 
                printf ("%4ld: ", i);
-               if (dev_desc->block_read (dev_desc->dev, i, 1, (ulong *)mpart) != 1) {
+               if (blk_dread(dev_desc, i, 1, (ulong *)mpart) != 1) {
                        printf ("** Can't read Partition Map on %d:%ld **\n",
-                               dev_desc->dev, i);
+                               dev_desc->devnum, i);
                        return;
                }
 
                if (mpart->signature != MAC_PARTITION_MAGIC) {
-                       printf ("** Bad Signature on %d:%ld - "
-                               "expected 0x%04x, got 0x%04x\n",
-                               dev_desc->dev, i, MAC_PARTITION_MAGIC, mpart->signature);
+                       printf("** Bad Signature on %d:%ld - expected 0x%04x, got 0x%04x\n",
+                              dev_desc->devnum, i, MAC_PARTITION_MAGIC,
+                              mpart->signature);
                        return;
                }
 
@@ -148,18 +155,15 @@ void print_part_mac (block_dev_desc_t *dev_desc)
 /*
  * Read Device Descriptor Block
  */
-static int part_mac_read_ddb (block_dev_desc_t *dev_desc, mac_driver_desc_t *ddb_p)
+static int part_mac_read_ddb(struct blk_desc *dev_desc,
+                            mac_driver_desc_t *ddb_p)
 {
-       if (dev_desc->block_read(dev_desc->dev, 0, 1, (ulong *)ddb_p) != 1) {
-               printf ("** Can't read Driver Desriptor Block **\n");
+       if (blk_dread(dev_desc, 0, 1, (ulong *)ddb_p) != 1) {
+               debug("** Can't read Driver Descriptor Block **\n");
                return (-1);
        }
 
        if (ddb_p->signature != MAC_DRIVER_MAGIC) {
-#if 0
-               printf ("** Bad Signature: expected 0x%04x, got 0x%04x\n",
-                       MAC_DRIVER_MAGIC, ddb_p->signature);
-#endif
                return (-1);
        }
        return (0);
@@ -168,7 +172,8 @@ static int part_mac_read_ddb (block_dev_desc_t *dev_desc, mac_driver_desc_t *ddb
 /*
  * Read Partition Descriptor Block
  */
-static int part_mac_read_pdb (block_dev_desc_t *dev_desc, int part, mac_partition_t *pdb_p)
+static int part_mac_read_pdb(struct blk_desc *dev_desc, int part,
+                            mac_partition_t *pdb_p)
 {
        int n = 1;
 
@@ -178,16 +183,16 @@ static int part_mac_read_pdb (block_dev_desc_t *dev_desc, int part, mac_partitio
                 * partition 1 first since this is the only way to
                 * know how many partitions we have.
                 */
-               if (dev_desc->block_read (dev_desc->dev, n, 1, (ulong *)pdb_p) != 1) {
+               if (blk_dread(dev_desc, n, 1, (ulong *)pdb_p) != 1) {
                        printf ("** Can't read Partition Map on %d:%d **\n",
-                               dev_desc->dev, n);
+                               dev_desc->devnum, n);
                        return (-1);
                }
 
                if (pdb_p->signature != MAC_PARTITION_MAGIC) {
-                       printf ("** Bad Signature on %d:%d: "
-                               "expected 0x%04x, got 0x%04x\n",
-                               dev_desc->dev, n, MAC_PARTITION_MAGIC, pdb_p->signature);
+                       printf("** Bad Signature on %d:%d: expected 0x%04x, got 0x%04x\n",
+                              dev_desc->devnum, n, MAC_PARTITION_MAGIC,
+                              pdb_p->signature);
                        return (-1);
                }
 
@@ -196,9 +201,9 @@ static int part_mac_read_pdb (block_dev_desc_t *dev_desc, int part, mac_partitio
 
                if ((part < 1) || (part > pdb_p->map_count)) {
                        printf ("** Invalid partition %d:%d [%d:1...%d:%d only]\n",
-                               dev_desc->dev, part,
-                               dev_desc->dev,
-                               dev_desc->dev, pdb_p->map_count);
+                               dev_desc->devnum, part,
+                               dev_desc->devnum,
+                               dev_desc->devnum, pdb_p->map_count);
                        return (-1);
                }
 
@@ -209,7 +214,8 @@ static int part_mac_read_pdb (block_dev_desc_t *dev_desc, int part, mac_partitio
        /* NOTREACHED */
 }
 
-int get_partition_info_mac (block_dev_desc_t *dev_desc, int part, disk_partition_t *info)
+static int part_get_info_mac(struct blk_desc *dev_desc, int part,
+                                 disk_partition_t *info)
 {
        ALLOC_CACHE_ALIGN_BUFFER(mac_driver_desc_t, ddesc, 1);
        ALLOC_CACHE_ALIGN_BUFFER(mac_partition_t, mpart, 1);
@@ -232,4 +238,12 @@ int get_partition_info_mac (block_dev_desc_t *dev_desc, int part, disk_partition
        return (0);
 }
 
+U_BOOT_PART_TYPE(mac) = {
+       .name           = "MAC",
+       .part_type      = PART_TYPE_MAC,
+       .max_entries    = MAC_ENTRY_NUMBERS,
+       .get_info       = part_get_info_mac,
+       .print          = part_print_mac,
+       .test           = part_test_mac,
+};
 #endif