eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup for GCC-4.x

Browse Source
This commit is contained in:
Wolfgang Denk
2005-10-13 16:45:02 +02:00
parent 17a8b276ba
commit 77ddac9480
201 changed files with 606 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/mpc5xxx/fec.c
View File

@@ -320,7 +320,7 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis)
* Set individual address filter for unicast address
* and set physical address registers.
*/
mpc5xxx_fec_set_hwaddr(fec, dev->enetaddr);
mpc5xxx_fec_set_hwaddr(fec, (char *)dev->enetaddr);
/*
* Set multicast address filter
@@ -785,7 +785,7 @@ static int mpc5xxx_fec_recv(struct eth_device *dev)
unsigned long ievent;
int frame_length, len = 0;
NBUF *frame;
char buff[FEC_MAX_PKT_SIZE];
uchar buff[FEC_MAX_PKT_SIZE];
#if (DEBUG & 0x1)
printf ("mpc5xxx_fec_recv %d Start...\n", fec->rbdIndex);

13
cpu/mpc5xxx/i2c.c
View File

@@ -55,8 +55,9 @@ static int mpc_get_fdr (int);
static int mpc_reg_in(volatile u32 *reg)
{
return *reg >> 24;
int ret = *reg >> 24;
__asm__ __volatile__ ("eieio");
return ret;
}
static void mpc_reg_out(volatile u32 *reg, int val, int mask)
@@ -298,7 +299,7 @@ int i2c_probe(uchar chip)
int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
{
uchar xaddr[4];
char xaddr[4];
struct mpc5xxx_i2c * regs = (struct mpc5xxx_i2c *)I2C_BASE;
int ret = -1;
@@ -329,7 +330,7 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
goto Done;
}
if (receive_bytes(chip, buf, len)) {
if (receive_bytes(chip, (char *)buf, len)) {
printf("i2c_read: receive_bytes failed\n");
goto Done;
}
@@ -342,7 +343,7 @@ Done:
int i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
{
uchar xaddr[4];
char xaddr[4];
struct mpc5xxx_i2c *regs = (struct mpc5xxx_i2c *)I2C_BASE;
int ret = -1;
@@ -367,7 +368,7 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
goto Done;
}
if (send_bytes(chip, buf, len)) {
if (send_bytes(chip, (char *)buf, len)) {
printf("i2c_write: send_bytes failed\n");
goto Done;
}
@@ -380,7 +381,7 @@ Done:
uchar i2c_reg_read(uchar chip, uchar reg)
{
char buf;
uchar buf;
i2c_read(chip, reg, 1, &buf, 1);

2
cpu/mpc8220/fec.c
View File

@@ -330,7 +330,7 @@ static int mpc8220_fec_init (struct eth_device *dev, bd_t * bis)
* Set individual address filter for unicast address
* and set physical address registers.
*/
mpc8220_fec_set_hwaddr (fec, dev->enetaddr);
mpc8220_fec_set_hwaddr (fec, (char *)(dev->enetaddr));
/*
* Set multicast address filter

14
cpu/mpc8220/i2c.c
View File

@@ -73,8 +73,10 @@ static int mpc_get_fdr (int);
static int mpc_reg_in (volatile u32 * reg)
{
return *reg >> 24;
int ret;
ret = *reg >> 24;
__asm__ __volatile__ ("eieio");
return ret;
}
static void mpc_reg_out (volatile u32 * reg, int val, int mask)
@@ -324,7 +326,7 @@ int i2c_read (uchar chip, uint addr, int alen, uchar * buf, int len)
goto Done;
}
if (send_bytes (chip, &xaddr[4 - alen], alen)) {
if (send_bytes (chip, (char *)&xaddr[4 - alen], alen)) {
printf ("i2c_read: send_bytes failed\n");
goto Done;
}
@@ -335,7 +337,7 @@ int i2c_read (uchar chip, uint addr, int alen, uchar * buf, int len)
goto Done;
}
if (receive_bytes (chip, buf, len)) {
if (receive_bytes (chip, (char *)buf, len)) {
printf ("i2c_read: receive_bytes failed\n");
goto Done;
}
@@ -368,12 +370,12 @@ int i2c_write (uchar chip, uint addr, int alen, uchar * buf, int len)
goto Done;
}
if (send_bytes (chip, &xaddr[4 - alen], alen)) {
if (send_bytes (chip, (char *)&xaddr[4 - alen], alen)) {
printf ("i2c_write: send_bytes failed\n");
goto Done;
}
if (send_bytes (chip, buf, len)) {
if (send_bytes (chip, (char *)buf, len)) {
printf ("i2c_write: send_bytes failed\n");
goto Done;
}
@@ -386,7 +388,7 @@ int i2c_write (uchar chip, uint addr, int alen, uchar * buf, int len)
uchar i2c_reg_read (uchar chip, uchar reg)
{
char buf;
uchar buf;
i2c_read (chip, reg, 1, &buf, 1);

4
cpu/mpc824x/drivers/i2c/i2c.c
View File

@@ -264,12 +264,12 @@ int i2c_probe (uchar chip)
* and looking for an <ACK> back.
*/
udelay (10000);
return i2c_read (chip, 0, 1, (char *) &tmp, 1);
return i2c_read (chip, 0, 1, (uchar *) &tmp, 1);
}
uchar i2c_reg_read (uchar i2c_addr, uchar reg)
{
char buf[1];
uchar buf[1];
i2c_read (i2c_addr, reg, 1, buf, 1);

2
cpu/mpc8260/i2c.c
View File

@@ -752,7 +752,7 @@ i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
uchar
i2c_reg_read(uchar chip, uchar reg)
{
char buf;
uchar buf;
i2c_read(chip, reg, 1, &buf, 1);

5
cpu/mpc83xx/i2c.c
View File

@@ -110,6 +110,7 @@ i2c_wait (int write)
return 0;
} while (get_timer (timeval) < I2C_TIMEOUT);
debug("i2c_wait: timed out\n");
return -1;
}
static __inline__ int
@@ -231,12 +232,12 @@ int i2c_probe (uchar chip)
* and looking for an <ACK> back.
*/
udelay(10000);
return i2c_read (chip, 0, 1, (char *)&tmp, 1);
return i2c_read (chip, 0, 1, (uchar *)&tmp, 1);
}
uchar i2c_reg_read (uchar i2c_addr, uchar reg)
{
char buf[1];
uchar buf[1];
i2c_read (i2c_addr, reg, 1, buf, 1);

4
cpu/mpc85xx/i2c.c
View File

@@ -245,12 +245,12 @@ int i2c_probe (uchar chip)
* and looking for an <ACK> back.
*/
udelay(10000);
return i2c_read (chip, 0, 1, (char *)&tmp, 1);
return i2c_read (chip, 0, 1, (uchar *)&tmp, 1);
}
uchar i2c_reg_read (uchar i2c_addr, uchar reg)
{
char buf[1];
uchar buf[1];
i2c_read (i2c_addr, reg, 1, buf, 1);

2
cpu/mpc8xx/config.mk
View File

@@ -21,6 +21,6 @@
# MA 02111-1307 USA
#
PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing
PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing
PLATFORM_CPPFLAGS += -DCONFIG_8xx -ffixed-r2 -ffixed-r29 -mstring -mcpu=860 -msoft-float

2
cpu/mpc8xx/i2c.c
View File

@@ -724,7 +724,7 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
uchar
i2c_reg_read(uchar i2c_addr, uchar reg)
{
char buf;
uchar buf;
i2c_init(CFG_I2C_SPEED, CFG_I2C_SLAVE);

4
cpu/mpc8xx/spi.c
View File

@@ -525,11 +525,11 @@ int spi_post_test (int flags)
for (i = 0; i < TEST_NUM; i++) {
for (l = TEST_MIN_LENGTH; l <= TEST_MAX_LENGTH; l += 8) {
packet_fill (txbuf, l);
packet_fill ((char *)txbuf, l);
spi_xfer (l);
if (packet_check (rxbuf, l) < 0) {
if (packet_check ((char *)rxbuf, l) < 0) {
goto Done;
}
}

6
cpu/mpc8xx/video.c
View File

@@ -447,9 +447,9 @@ static void video_drawchars (int xx, int yy, unsigned char *s, int count)
}
}
static inline void video_drawstring (int xx, int yy, unsigned char *s)
static inline void video_drawstring (int xx, int yy, char *s)
{
video_drawchars (xx, yy, s, strlen (s));
video_drawchars (xx, yy, (unsigned char *)s, strlen (s));
}
/* Relative to console plotting functions */
@@ -474,7 +474,7 @@ static void video_putchar (int xx, int yy, unsigned char c)
static inline void video_putstring (int xx, int yy, unsigned char *s)
{
video_putchars (xx, yy, s, strlen (s));
video_putchars (xx, yy, (unsigned char *)s, strlen ((char *)s));
}
/************************************************************************/

2
cpu/ppc4xx/i2c.c
View File

@@ -428,7 +428,7 @@ int i2c_write (uchar chip, uint addr, int alen, uchar * buffer, int len)
*/
uchar i2c_reg_read(uchar i2c_addr, uchar reg)
{
char buf;
uchar buf;
i2c_read(i2c_addr, reg, 1, &buf, 1);

2
cpu/ppc4xx/spd_sdram.c
View File

@@ -456,7 +456,7 @@ long int spd_sdram(int(read_spd)(uint addr))
int spd_read(uint addr)
{
char data[2];
uchar data[2];
if (i2c_read(SPD_EEPROM_ADDRESS, addr, 1, data, 1) == 0)
return (int)data[0];