projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ec3768711a423048a356c31dfa8deabc757655ce..c81d11a6ce35e1800ef652e75392a7dbc3f38430 100644
(file)
--- a/
drivers/block/ata_piix.c
+++ b/
drivers/block/ata_piix.c
@@
-36,7
+36,7
@@
#include <ata.h>
extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
#include <ata.h>
extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
-extern int curr_device;
+extern int
sata_
curr_device;
#define DEBUG_SATA 0 /*For debug prints set DEBUG_SATA to 1 */
#define DEBUG_SATA 0 /*For debug prints set DEBUG_SATA to 1 */
@@
-204,8
+204,8
@@
init_sata (int dev)
dev_print (&sata_dev_desc[devno]);
/* initialize partition type */
init_part (&sata_dev_desc[devno]);
dev_print (&sata_dev_desc[devno]);
/* initialize partition type */
init_part (&sata_dev_desc[devno]);
- if (curr_device < 0)
- curr_device =
+ if (
sata_
curr_device < 0)
+
sata_
curr_device =
i * CONFIG_SYS_SATA_DEVS_PER_BUS + j;
}
}
i * CONFIG_SYS_SATA_DEVS_PER_BUS + j;
}
}
@@
-310,7
+310,7
@@
sata_bus_softreset (int num)
}
if (status & ATA_BUSY)
}
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);
while ((status & ATA_BUSY)) {
msleep (100);
@@
-318,7
+318,7
@@
sata_bus_softreset (int num)
}
if (status & ATA_BUSY) {
}
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;
}
printf ("bus reset failed\n");
return 1;
}
@@
-389,11
+389,11
@@
sata_identify (int num, int dev)
return;
}
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));
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));
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);
sizeof (sata_dev_desc[devno].product));
strswab (sata_dev_desc[devno].revision);
strswab (sata_dev_desc[devno].vendor);