Fix S-ATA support.

Signed-off-by: mushtaq khan <mushtaqk_921@yahoo.co.in>
This commit is contained in:
Mushtaq Khan 2007-06-30 18:50:48 +02:00 committed by Wolfgang Denk
parent 822d55365b
commit 1f2a058986
2 changed files with 12 additions and 12 deletions

View file

@ -375,9 +375,9 @@ msleep (int count)
} }
ulong ulong
sata_read (int device, lbaint_t blknr, ulong blkcnt, ulong * buffer) sata_read (int device, ulong blknr,lbaint_t blkcnt, void * buff)
{ {
ulong n = 0; ulong n = 0, *buffer = (ulong *)buff;
u8 dev = 0, num = 0, mask = 0, status = 0; u8 dev = 0, num = 0, mask = 0, status = 0;
#ifdef CONFIG_LBA48 #ifdef CONFIG_LBA48
@ -482,9 +482,9 @@ sata_read (int device, lbaint_t blknr, ulong blkcnt, ulong * buffer)
} }
ulong ulong
sata_write (int device, lbaint_t blknr, ulong blkcnt, ulong * buffer) sata_write (int device, ulong blknr,lbaint_t blkcnt, void * buff)
{ {
ulong n = 0; ulong n = 0, *buffer = (ulong *)buff;
unsigned char status = 0, num = 0, dev = 0, mask = 0; unsigned char status = 0, num = 0, dev = 0, mask = 0;
#ifdef CONFIG_LBA48 #ifdef CONFIG_LBA48

View file

@ -28,8 +28,8 @@ struct sata_port {
struct sata_ioports ioaddr; /* ATA cmd/ctl/dma reg blks */ struct sata_ioports ioaddr; /* ATA cmd/ctl/dma reg blks */
unsigned char ctl_reg; unsigned char ctl_reg;
unsigned char last_ctl; unsigned char last_ctl;
unsigned char port_state; /* 1-port is present and */ unsigned char port_state; /* 1-port is available and */
0-port is not available */ /* 0-port is not available */
unsigned char dev_mask; unsigned char dev_mask;
}; };
@ -74,18 +74,18 @@ int sata_devchk (struct sata_ioports *ioaddr, int dev);
void dev_select (struct sata_ioports *ioaddr, int dev); void dev_select (struct sata_ioports *ioaddr, int dev);
u8 sata_busy_wait (struct sata_ioports *ioaddr, int bits, unsigned int max); u8 sata_busy_wait (struct sata_ioports *ioaddr, int bits, unsigned int max);
u8 sata_chk_status (struct sata_ioports *ioaddr); u8 sata_chk_status (struct sata_ioports *ioaddr);
ulong sata_read (int device, lbaint_t blknr, ulong blkcnt, ulong * buffer); ulong sata_read (int device, ulong blknr,lbaint_t blkcnt, void * buffer);
ulong sata_write (int device, lbaint_t blknr, ulong blkcnt, ulong * buffer); ulong sata_write (int device,ulong blknr, lbaint_t blkcnt, void * buffer);
void msleep (int count); void msleep (int count);
#else #else
extern int sata_bus_softreset (int num); extern int sata_bus_softreset (int num);
extern void sata_identify (int num, int dev); extern void sata_identify (int num, int dev);
extern void sata_port (struct sata_ioports *ioport); extern void sata_port (struct sata_ioports *ioport);
extern void set_Feature_cmd (int num, int dev); extern void set_Feature_cmd (int num, int dev);
extern ulong sata_read (int device, lbaint_t blknr, extern ulong sata_read (int device, ulong blknr,
ulong blkcnt, ulong * buffer); lbaint_t blkcnt, void * buffer);
extern ulong sata_write (int device, lbaint_t blknr, extern ulong sata_write (int device, ulong blknr,
ulong blkcnt, ulong * buffer); lbaint_t blkcnt, void * buffer);
extern void msleep (int count); extern void msleep (int count);
#endif #endif