In your mail you had written:
The patch was checked in, so now you are supposed to test the resulting code and provide feedback
Best regards, Wolfgang Denk
Hi Wolfgang,
You have not applied the sata patch to your u-boot-testing repository. I downloaded u-boot-testing code from your testing repository git://www.denx.de/git/u-boot-testing And i couldn't find my changes, Please apply the sata patch to your testing repository. For your convenience iam attaching the sata patch with the mail. This sata patch is with respect to u-boot-testing repository, which resolves the prototype mismatch between sata_read and block_read.
Thanks, -Mushtaq
diff -purN u-boot-testing/common/cmd_sata.c u-boot-testing_chg/common/cmd_sata.c --- u-boot-testing/common/cmd_sata.c 2007-06-05 12:05:10.000000000 +0530 +++ u-boot-testing_chg/common/cmd_sata.c 2007-06-07 13:46:55.000000000 +0530 @@ -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, u }
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 -purN u-boot-testing/include/sata.h u-boot-testing_chg/include/sata.h --- u-boot-testing/include/sata.h 2007-06-05 12:05:11.000000000 +0530 +++ u-boot-testing_chg/include/sata.h 2007-06-07 13:43:08.000000000 +0530 @@ -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 *io 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