X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fide.h;h=f9357bee76220d9066ace1f697040e43da810e51;hb=9e71bb9ca232038e8cdc1090cf218871afb6904a;hp=d5e05e97cb2fb12dc68794a2f1032eb366c79f18;hpb=674ca84d11391cd2e7faf8f638fc25ed4b782a91;p=u-boot

diff --git a/include/ide.h b/include/ide.h
index d5e05e97cb..f9357bee76 100644
--- a/include/ide.h
+++ b/include/ide.h
@@ -28,21 +28,23 @@ void ide_led(uchar led, uchar status);
 
 #ifdef CONFIG_SYS_64BIT_LBA
 typedef uint64_t lbaint_t;
-#define LBAF "%llx"
-#define LBAFU "%llu"
+#define LBAFlength "ll"
 #else
 typedef ulong lbaint_t;
-#define LBAF "%lx"
-#define LBAFU "%lu"
+#define LBAFlength "l"
 #endif
+#define LBAF "%" LBAFlength "x"
+#define LBAFU "%" LBAFlength "u"
 
 /*
  * Function Prototypes
  */
 
 void ide_init(void);
-ulong ide_read(int device, lbaint_t blknr, lbaint_t blkcnt, void *buffer);
-ulong ide_write(int device, lbaint_t blknr, lbaint_t blkcnt,
+typedef struct block_dev_desc block_dev_desc_t;
+ulong ide_read(block_dev_desc_t *block_dev, lbaint_t blknr, lbaint_t blkcnt,
+	       void *buffer);
+ulong ide_write(block_dev_desc_t *block_dev, lbaint_t blknr, lbaint_t blkcnt,
 		const void *buffer);
 
 #ifdef CONFIG_IDE_PREINIT