Merge branch 'master' of git://git.denx.de/u-boot-microblaze

[karo-tx-uboot.git] / drivers / block / ata_piix.h

diff --git a/drivers/block/ata_piix.h b/drivers/block/ata_piix.h
index f9f0194706b3769684e605fa8308664bb55fb921..9157cf82c0b827e01045a14a7a1ef1f90c3df6b2 100644 (file)
--- a/drivers/block/ata_piix.h
+++ b/drivers/block/ata_piix.h
@@ -37,20 +37,7 @@ struct sata_port {
 
 /***********SATA LIBRARY SPECIFIC DEFINITIONS AND DECLARATIONS**************/
 #ifdef SATA_DECL               /*SATA library specific declarations */
-#define ata_id_has_lba48(id)    ((id)[83] & (1 << 10))
-#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
+inline void
 ata_dump_id (u16 * id)
 {
        PRINTF ("49 = 0x%04x  "
@@ -88,7 +75,7 @@ int init_sata (int dev);
 #endif
 
 #ifdef DRV_DECL                        /*Defines Driver Specific variables */
-struct sata_port port[CFG_SATA_MAXBUS];
+struct sata_port port[CONFIG_SYS_SATA_MAXBUS];
 #endif
 
 #endif /* __ATA_PIIX_H__ */