X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fide.h;h=8ecc9dd3a53d49a4c6f5227a120ea591e55f752e;hb=2e5f44213fd55ca53c3751061e19b0c54857900b;hp=222f4f84e48664f25e983b48557cf695c2f883df;hpb=f930922f061ea7bf585296859d1c14194c24b840;p=u-boot

diff --git a/include/ide.h b/include/ide.h
index 222f4f84e4..8ecc9dd3a5 100644
--- a/include/ide.h
+++ b/include/ide.h
@@ -26,7 +26,7 @@
 
 #define	IDE_BUS(dev)	(dev >> 1)
 
-#define	ATA_CURR_BASE(dev)	(CFG_ATA_BASE_ADDR+ide_bus_offset[IDE_BUS(dev)])
+#define	ATA_CURR_BASE(dev)	(CONFIG_SYS_ATA_BASE_ADDR+ide_bus_offset[IDE_BUS(dev)])
 
 #ifdef CONFIG_IDE_LED
 
@@ -40,7 +40,7 @@
 
 #endif /* CONFIG_IDE_LED */
 
-#ifdef CFG_64BIT_LBA
+#ifdef CONFIG_SYS_64BIT_LBA
 typedef uint64_t lbaint_t;
 #else
 typedef ulong lbaint_t;
@@ -52,6 +52,16 @@ typedef ulong lbaint_t;
 
 void ide_init(void);
 ulong ide_read(int device, lbaint_t blknr, ulong blkcnt, void *buffer);
-ulong ide_write(int device, lbaint_t blknr, ulong blkcnt, void *buffer);
+ulong ide_write(int device, lbaint_t blknr, ulong blkcnt, const void *buffer);
 
+#if defined(CONFIG_OF_IDE_FIXUP)
+int ide_device_present(int dev);
+#endif
+
+#if defined(CONFIG_IDE_AHB)
+unsigned char ide_read_register(int dev, unsigned int port);
+void ide_write_register(int dev, unsigned int port, unsigned char val);
+void ide_read_data(int dev, ulong *sect_buf, int words);
+void ide_write_data(int dev, ulong *sect_buf, int words);
+#endif
 #endif /* _IDE_H */