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 07bbc1988ae6973cdcb682975a8d0c5ed8ae30c2..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
@@ -40,21 +40,23 @@ static int part_mac_read_pdb(struct blk_desc *dev_desc, int part,
 /*
  * Test for a valid MAC partition
  */
-static int test_part_mac(struct blk_desc *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, i, 1,
-                                         (ulong *)mpart) != 1) ||
+               if ((blk_dread(dev_desc, i, 1, (ulong *)mpart) != 1) ||
                    (mpart->signature != MAC_PARTITION_MAGIC) ) {
                        return (-1);
                }
@@ -64,7 +66,7 @@ static int test_part_mac(struct blk_desc *dev_desc)
        return (0);
 }
 
-static void print_part_mac(struct blk_desc *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);
@@ -72,7 +74,10 @@ static void print_part_mac(struct blk_desc *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;
        }
 
@@ -106,7 +111,7 @@ static void print_part_mac(struct blk_desc *dev_desc)
                char c;
 
                printf ("%4ld: ", i);
-               if (dev_desc->block_read(dev_desc, 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->devnum, i);
                        return;
@@ -153,16 +158,12 @@ static void print_part_mac(struct blk_desc *dev_desc)
 static int part_mac_read_ddb(struct blk_desc *dev_desc,
                             mac_driver_desc_t *ddb_p)
 {
-       if (dev_desc->block_read(dev_desc, 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);
@@ -182,7 +183,7 @@ static int part_mac_read_pdb(struct blk_desc *dev_desc, int part,
                 * partition 1 first since this is the only way to
                 * know how many partitions we have.
                 */
-               if (dev_desc->block_read(dev_desc, 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->devnum, n);
                        return (-1);
@@ -240,8 +241,9 @@ static int part_get_info_mac(struct blk_desc *dev_desc, int part,
 U_BOOT_PART_TYPE(mac) = {
        .name           = "MAC",
        .part_type      = PART_TYPE_MAC,
+       .max_entries    = MAC_ENTRY_NUMBERS,
        .get_info       = part_get_info_mac,
-       .print          = print_part_mac,
-       .test           = test_part_mac,
+       .print          = part_print_mac,
+       .test           = part_test_mac,
 };
 #endif