Fix warnings while compiling net/net.c for MPC8610HPCD board

[u-boot] / include / net.h

diff --git a/include/net.h b/include/net.h
index 603452ab3281ec9adb54652c11c3755a69ed2faf..9a2f03fe983547f121b0cb76750bb1cb13962ea7 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -122,6 +122,9 @@ extern void eth_set_enetaddr(int num, char* a);     /* Set new MAC address          */
 
 extern int eth_init(bd_t *bis);                        /* Initialize the device        */
 extern int eth_send(volatile void *packet, int length);           /* Send a packet     */
+#ifdef CONFIG_API
+extern int eth_receive(volatile void *packet, int length); /* Receive a packet */
+#endif
 extern int eth_rx(void);                       /* Check for received packets   */
 extern void eth_halt(void);                    /* stop SCC                     */
 extern char *eth_get_name(void);               /* get name of current device   */
@@ -409,10 +412,10 @@ extern void       print_IPaddr (IPaddr_t);
  * footprint in our tests.
  */
 /* return IP *in network byteorder* */
-static inline IPaddr_t NetReadIP(void *from)
+static inline IPaddr_t NetReadIP(volatile void *from)
 {
        IPaddr_t ip;
-       memcpy((void*)&ip, from, sizeof(ip));
+       memcpy((void*)&ip, (void*)from, sizeof(ip));
        return ip;
 }
 
@@ -431,9 +434,9 @@ static inline void NetWriteIP(void *to, IPaddr_t ip)
 }
 
 /* copy IP */
-static inline void NetCopyIP(void *to, void *from)
+static inline void NetCopyIP(volatile void *to, void *from)
 {
-       memcpy(to, from, sizeof(IPaddr_t));
+       memcpy((void*)to, from, sizeof(IPaddr_t));
 }
 
 /* copy ulong */