From: Mushtaq Khan <mushtaqk_921@yahoo.co.in>
Date: Sat, 30 Jun 2007 16:50:48 +0000 (+0200)
Subject: Fix S-ATA support.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1f2a05898658900dc5717761e27abf2052e67e13;p=project%2Fbcm63xx%2Fu-boot.git

Fix S-ATA support.

Signed-off-by: mushtaq khan <mushtaqk_921@yahoo.co.in>
---

diff --git a/common/cmd_sata.c b/common/cmd_sata.c
index 2e601a7d80..bd4c11fd9b 100644
--- a/common/cmd_sata.c
+++ b/common/cmd_sata.c
@@ -375,9 +375,9 @@ msleep (int count)
 }
 
 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;
 
 #ifdef CONFIG_LBA48
@@ -482,9 +482,9 @@ sata_read (int device, lbaint_t blknr, ulong blkcnt, ulong * buffer)
 }
 
 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;
 
 #ifdef CONFIG_LBA48
diff --git a/include/sata.h b/include/sata.h
index a8713f817e..165b471b28 100644
--- a/include/sata.h
+++ b/include/sata.h
@@ -28,8 +28,8 @@ struct sata_port {
 	struct sata_ioports ioaddr;	/* ATA cmd/ctl/dma reg blks	*/
 	unsigned char ctl_reg;
 	unsigned char last_ctl;
-	unsigned char port_state;	/* 1-port is present and	*/
-					   0-port is not available	*/
+	unsigned char port_state;	/* 1-port is available and	*/
+					/* 0-port is not available	*/
 	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);
 u8 sata_busy_wait (struct sata_ioports *ioaddr, int bits, unsigned int max);
 u8 sata_chk_status (struct sata_ioports *ioaddr);
-ulong sata_read (int device, lbaint_t blknr, ulong blkcnt, ulong * buffer);
-ulong sata_write (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,ulong blknr, lbaint_t blkcnt, void * buffer);
 void msleep (int count);
 #else
 extern int sata_bus_softreset (int num);
 extern void sata_identify (int num, int dev);
 extern void sata_port (struct sata_ioports *ioport);
 extern void set_Feature_cmd (int num, int dev);
-extern ulong sata_read (int device, lbaint_t blknr,
-			ulong blkcnt, ulong * buffer);
-extern ulong sata_write (int device, lbaint_t blknr,
-			 ulong blkcnt, ulong * buffer);
+extern ulong sata_read (int device, ulong blknr,
+			lbaint_t blkcnt, void * buffer);
+extern ulong sata_write (int device, ulong blknr,
+			lbaint_t blkcnt, void * buffer);
 extern void msleep (int count);
 #endif