phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Misc SATA fixups 

Cast first parameter to sata_cpy()

In /drivers/block/ata_piix.h, ata_id_has_lba48(), ata_id_has_lba(),
ata_id_has_dma(), ata_id_u32(), ata_id_u64() are all defined in
include/libata.h which is included in ata.h which is included by all files
which include ata_piix.h (only ata_piix.c) so these definitions are
supurflous to (and conlict with) this in libata.h. Interestingly, my
compiler complains about ata_id_u64 already being defined, but not
ata_id_u32

ata_dump_id() is defined in include/libata.h and should not be static
(maybe should even use ata_dump_id() in libata.c

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
This commit is contained in:
Graeme Russ 2009-08-23 12:59:51 +10:00 committed by Wolfgang Denk
parent d754902409
commit 31b9ab33d9
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/block/ata_piix.c
View File

@ -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)) { while ((status & ATA_BUSY)) {
msleep (100); 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"); printf ("bus reset failed\n");
return 1; 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)); sizeof (sata_dev_desc[devno].product));
strswab (sata_dev_desc[devno].revision); strswab (sata_dev_desc[devno].revision);
strswab (sata_dev_desc[devno].vendor); strswab (sata_dev_desc[devno].vendor);

15
drivers/block/ata_piix.h
View File

@ -37,20 +37,7 @@ struct sata_port {
/***********SATA LIBRARY SPECIFIC DEFINITIONS AND DECLARATIONS**************/ /***********SATA LIBRARY SPECIFIC DEFINITIONS AND DECLARATIONS**************/
#ifdef SATA_DECL /*SATA library specific declarations */ #ifdef SATA_DECL /*SATA library specific declarations */
#define ata_id_has_lba48(id) ((id)[83] & (1 << 10)) inline void
#define ata_id_has_lba(id) ((id)[49] & (1 << 9))
#define ata_id_has_dma(id) ((id)[49] & (1 << 8))
#define ata_id_u32(id,n) \
(((u32) (id)[(n) + 1] << 16) | ((u32) (id)[(n)]))
#define ata_id_u64(id,n) \
(((u64) (id)[(n) + 3] << 48) | \
((u64) (id)[(n) + 2] << 32) | \
((u64) (id)[(n) + 1] << 16) | \
((u64) (id)[(n) + 0]) )
#endif
#ifdef SATA_DECL /*SATA library specific declarations */
static inline void
ata_dump_id (u16 * id) ata_dump_id (u16 * id)
{ {
PRINTF ("49 = 0x%04x " PRINTF ("49 = 0x%04x "