LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MPC8xx: fix "Remove volatile from net API" aftermath 

Commit db288a9 "net: Remove volatile from net API" caused a number of
build warnings:
fec.c: In function 'fec_initialize':
fec.c:183:13: warning: assignment from incompatible pointer type [enabled by default]
fec.c: In function 'fec_recv':
fec.c:284:5: warning: passing argument 1 of 'NetReceive' discards 'volatile' qualifier from pointer target type [enabled by default]
/home/wd/git/u-boot/work/include/net.h:433:13: note: expected 'uchar *' but argument is of type 'volatile uchar *'
scc.c: In function 'scc_initialize':
scc.c:85:14: warning: assignment from incompatible pointer type [enabled by default]

Fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Wolfgang Denk 2012-05-20 21:14:54 +00:00 committed by Joe Hershberger
parent e14826bc8d
commit 1b10d0717a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/cpu/mpc8xx/fec.c
View File

@ -139,7 +139,7 @@ typedef volatile struct CommonBufferDescriptor {
static RTXBD *rtx = NULL; static RTXBD *rtx = NULL;
static int fec_send(struct eth_device* dev, volatile void *packet, int length); static int fec_send(struct eth_device *dev, void *packet, int length);
static int fec_recv(struct eth_device* dev); static int fec_recv(struct eth_device* dev);
static int fec_init(struct eth_device* dev, bd_t * bd); static int fec_init(struct eth_device* dev, bd_t * bd);
static void fec_halt(struct eth_device* dev); static void fec_halt(struct eth_device* dev);
@ -193,7 +193,7 @@ int fec_initialize(bd_t *bis)
return 1; return 1;
} }
static int fec_send(struct eth_device* dev, volatile void *packet, int length) static int fec_send(struct eth_device *dev, void *packet, int length)
{ {
int j, rc; int j, rc;
struct ether_fcc_info_s *efis = dev->priv; struct ether_fcc_info_s *efis = dev->priv;
@ -267,7 +267,7 @@ static int fec_recv (struct eth_device *dev)
rtx->rxbd[rxIdx].cbd_sc); rtx->rxbd[rxIdx].cbd_sc);
#endif #endif
} else { } else {
volatile uchar *rx = NetRxPackets[rxIdx]; uchar *rx = NetRxPackets[rxIdx];
length -= 4; length -= 4;

4
arch/powerpc/cpu/mpc8xx/scc.c
View File

@ -65,7 +65,7 @@ typedef volatile struct CommonBufferDescriptor {
static RTXBD *rtx; static RTXBD *rtx;
static int scc_send(struct eth_device* dev, volatile void *packet, int length); static int scc_send(struct eth_device *dev, void *packet, int length);
static int scc_recv(struct eth_device* dev); static int scc_recv(struct eth_device* dev);
static int scc_init (struct eth_device* dev, bd_t * bd); static int scc_init (struct eth_device* dev, bd_t * bd);
static void scc_halt(struct eth_device* dev); static void scc_halt(struct eth_device* dev);
@ -90,7 +90,7 @@ int scc_initialize(bd_t *bis)
return 1; return 1;
} }
static int scc_send(struct eth_device* dev, volatile void *packet, int length) static int scc_send(struct eth_device *dev, void *packet, int length)
{ {
int i, j=0; int i, j=0;
#if 0 #if 0