IDE: fix compiler warnings

The changes introduced by commit 0abddf8 ``cmd_ide: enhance new
feature "CONFIG_IDE_AHB"'' caused compiler warnings like

cmd_ide.c: In function 'ide_init':
cmd_ide.c:716: warning: assignment from incompatible pointer type

Constify the respective function arguments to fix this.

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index e7952ff8d615f9974a16d6373ca29b0845daccaf..21fe1eabadb5c4d2ba4fc3746e463388cd6efca6 100644 (file)
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -160,7 +160,7 @@ static uchar ide_wait  (int dev, ulong t);
 #define IDE_SPIN_UP_TIME_OUT 5000 /* 5 sec spin-up timeout */
 
 static void input_data(int dev, ulong *sect_buf, int words);
 #define IDE_SPIN_UP_TIME_OUT 5000 /* 5 sec spin-up timeout */
 
 static void input_data(int dev, ulong *sect_buf, int words);

-static void output_data(int dev, ulong *sect_buf, int words);
+static void output_data(int dev, const ulong *sect_buf, int words);

 static void ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len);
 
 #ifndef CONFIG_SYS_ATA_PORT_ADDR
 static void ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len);
 
 #ifndef CONFIG_SYS_ATA_PORT_ADDR


@@ -875,7 +875,7 @@ input_swap_data(int dev, ulong *sect_buf, int words)
 
 #if defined(CONFIG_IDE_SWAP_IO)
 static void
 
 #if defined(CONFIG_IDE_SWAP_IO)
 static void

-output_data(int dev, ulong *sect_buf, int words)
+output_data(int dev, const ulong *sect_buf, int words)

 {
 #if defined(CONFIG_CPC45)
        uchar   *dbuf;
 {
 #if defined(CONFIG_CPC45)
        uchar   *dbuf;


@@ -919,7 +919,7 @@ output_data(int dev, ulong *sect_buf, int words)
 }
 #else  /* ! CONFIG_IDE_SWAP_IO */
 static void
 }
 #else  /* ! CONFIG_IDE_SWAP_IO */
 static void

-output_data(int dev, ulong *sect_buf, int words)
+output_data(int dev, const ulong *sect_buf, int words)

 {
 #if defined(CONFIG_IDE_AHB)
        ide_write_data(dev, sect_buf, words);
 {
 #if defined(CONFIG_IDE_AHB)
        ide_write_data(dev, sect_buf, words);


@@ -1348,7 +1348,7 @@ IDE_READ_E:
 /* ------------------------------------------------------------------------- */
 
 
 /* ------------------------------------------------------------------------- */
 
 

-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)

 {
        ulong n = 0;
        unsigned char c;
 {
        ulong n = 0;
        unsigned char c;

diff --git a/include/ide.h b/include/ide.h
index 80a10f41023d8ad82ff046fe1352fc57fe298c10..8ecc9dd3a53d49a4c6f5227a120ea591e55f752e 100644 (file)
--- a/include/ide.h
+++ b/include/ide.h
@@ -52,7 +52,7 @@ typedef ulong lbaint_t;
 
 void ide_init(void);
 ulong ide_read(int device, lbaint_t blknr, ulong blkcnt, void *buffer);
 
 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);
 
 #if defined(CONFIG_OF_IDE_FIXUP)
 int ide_device_present(int dev);