integrator: do not test first part of the memory

[oweals/u-boot.git] / drivers / block / ata_piix.c

diff --git a/drivers/block/ata_piix.c b/drivers/block/ata_piix.c
index 441a4dcd8d652f1aface989268f72bacaf39360c..c81d11a6ce35e1800ef652e75392a7dbc3f38430 100644 (file)
--- a/drivers/block/ata_piix.c
+++ b/drivers/block/ata_piix.c
@@ -35,10 +35,8 @@
 #include <ide.h>
 #include <ata.h>
 
-#ifdef CFG_ATA_PIIX            /*ata_piix driver */
-
-extern block_dev_desc_t sata_dev_desc[CFG_SATA_MAX_DEVICE];
-extern int curr_device;
+extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
+extern int sata_curr_device;
 
 #define DEBUG_SATA 0           /*For debug prints set DEBUG_SATA to 1 */
 
@@ -175,10 +173,10 @@ init_sata (int dev)
            iobase4 | ATA_PCI_CTL_OFS;
        port[1].ioaddr.bmdma_addr = iobase5 + 0x8;
 
-       for (i = 0; i < CFG_SATA_MAXBUS; i++)
+       for (i = 0; i < CONFIG_SYS_SATA_MAXBUS; i++)
                sata_port (&port[i].ioaddr);
 
-       for (i = 0; i < CFG_SATA_MAXBUS; i++) {
+       for (i = 0; i < CONFIG_SYS_SATA_MAXBUS; i++) {
                if (!(sata_bus_probe (i))) {
                        port[i].port_state = 0;
                        printf ("SATA#%d port is not present \n", i);
@@ -192,23 +190,23 @@ init_sata (int dev)
                }
        }
 
-       for (i = 0; i < CFG_SATA_MAXBUS; i++) {
+       for (i = 0; i < CONFIG_SYS_SATA_MAXBUS; i++) {
                u8 j, devno;
 
                if (port[i].port_state == 0)
                        continue;
-               for (j = 0; j < CFG_SATA_DEVS_PER_BUS; j++) {
+               for (j = 0; j < CONFIG_SYS_SATA_DEVS_PER_BUS; j++) {
                        sata_identify (i, j);
                        set_Feature_cmd (i, j);
-                       devno = i * CFG_SATA_DEVS_PER_BUS + j;
+                       devno = i * CONFIG_SYS_SATA_DEVS_PER_BUS + j;
                        if ((sata_dev_desc[devno].lba > 0) &&
                            (sata_dev_desc[devno].blksz > 0)) {
                                dev_print (&sata_dev_desc[devno]);
                                /* initialize partition type */
                                init_part (&sata_dev_desc[devno]);
-                               if (curr_device < 0)
-                                       curr_device =
-                                           i * CFG_SATA_DEVS_PER_BUS + j;
+                               if (sata_curr_device < 0)
+                                       sata_curr_device =
+                                           i * CONFIG_SYS_SATA_DEVS_PER_BUS + j;
                        }
                }
        }
@@ -273,7 +271,7 @@ sata_bus_softreset (int num)
 
        port[num].dev_mask = 0;
 
-       for (i = 0; i < CFG_SATA_DEVS_PER_BUS; i++) {
+       for (i = 0; i < CONFIG_SYS_SATA_DEVS_PER_BUS; i++) {
                if (!(sata_devchk (&port[num].ioaddr, i))) {
                        PRINTF ("dev_chk failed for dev#%d\n", i);
                } else {
@@ -312,7 +310,7 @@ sata_bus_softreset (int num)
        }
 
        if (status & ATA_BUSY)
-               printf ("ata%u is slow to respond,plz be patient\n", port);
+               printf ("ata%u is slow to respond,plz be patient\n", num);
 
        while ((status & ATA_BUSY)) {
                msleep (100);
@@ -320,7 +318,7 @@ sata_bus_softreset (int num)
        }
 
        if (status & ATA_BUSY) {
-               printf ("ata%u failed to respond : ", port);
+               printf ("ata%u failed to respond : ", num);
                printf ("bus reset failed\n");
                return 1;
        }
@@ -330,7 +328,7 @@ sata_bus_softreset (int num)
 void
 sata_identify (int num, int dev)
 {
-       u8 cmd = 0, status = 0, devno = num * CFG_SATA_DEVS_PER_BUS + dev;
+       u8 cmd = 0, status = 0, devno = num * CONFIG_SYS_SATA_DEVS_PER_BUS + dev;
        u16 iobuf[ATA_SECT_SIZE];
        u64 n_sectors = 0;
        u8 mask = 0;
@@ -391,11 +389,11 @@ sata_identify (int num, int dev)
                return;
        }
 
-       sata_cpy (sata_dev_desc[devno].revision, iop->fw_rev,
+       sata_cpy ((unsigned char *)sata_dev_desc[devno].revision, iop->fw_rev,
                  sizeof (sata_dev_desc[devno].revision));
-       sata_cpy (sata_dev_desc[devno].vendor, iop->model,
+       sata_cpy ((unsigned char *)sata_dev_desc[devno].vendor, iop->model,
                  sizeof (sata_dev_desc[devno].vendor));
-       sata_cpy (sata_dev_desc[devno].product, iop->serial_no,
+       sata_cpy ((unsigned char *)sata_dev_desc[devno].product, iop->serial_no,
                  sizeof (sata_dev_desc[devno].product));
        strswab (sata_dev_desc[devno].revision);
        strswab (sata_dev_desc[devno].vendor);
@@ -566,10 +564,10 @@ sata_read (int device, ulong blknr,lbaint_t blkcnt, void * buff)
        }
 #endif
        /*Port Number */
-       num = device / CFG_SATA_DEVS_PER_BUS;
+       num = device / CONFIG_SYS_SATA_DEVS_PER_BUS;
        /*dev on the port */
-       if (device >= CFG_SATA_DEVS_PER_BUS)
-               dev = device - CFG_SATA_DEVS_PER_BUS;
+       if (device >= CONFIG_SYS_SATA_DEVS_PER_BUS)
+               dev = device - CONFIG_SYS_SATA_DEVS_PER_BUS;
        else
                dev = device;
 
@@ -673,10 +671,10 @@ sata_write (int device, ulong blknr,lbaint_t blkcnt, void * buff)
        }
 #endif
        /*Port Number */
-       num = device / CFG_SATA_DEVS_PER_BUS;
+       num = device / CONFIG_SYS_SATA_DEVS_PER_BUS;
        /*dev on the Port */
-       if (device >= CFG_SATA_DEVS_PER_BUS)
-               dev = device - CFG_SATA_DEVS_PER_BUS;
+       if (device >= CONFIG_SYS_SATA_DEVS_PER_BUS)
+               dev = device - CONFIG_SYS_SATA_DEVS_PER_BUS;
        else
                dev = device;
 
@@ -756,5 +754,3 @@ int scan_sata(int dev)
 {
        return 0;
 }
-
-#endif