libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>

[oweals/u-boot.git] / drivers / net / sandbox-raw.c

diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 91da5f55ca8013adde211fc930cbdf33eec3fb1c..590ae0c0fcdec98e6e245c16bd1e31011b26b929 100644 (file)
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -16,7 +16,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 static int reply_arp;
-static IPaddr_t arp_ip;
+static struct in_addr arp_ip;
 
 static int sb_eth_raw_start(struct udevice *dev)
 {
@@ -26,15 +26,15 @@ static int sb_eth_raw_start(struct udevice *dev)
 
        debug("eth_sandbox_raw: Start\n");
 
-       interface = fdt_getprop(gd->fdt_blob, dev->of_offset,
+       interface = fdt_getprop(gd->fdt_blob, dev_of_offset(dev),
                                            "host-raw-interface", NULL);
        if (interface == NULL)
                return -EINVAL;
 
        if (strcmp(interface, "lo") == 0) {
                priv->local = 1;
-               setenv("ipaddr", "127.0.0.1");
-               setenv("serverip", "127.0.0.1");
+               env_set("ipaddr", "127.0.0.1");
+               env_set("serverip", "127.0.0.1");
        }
        return sandbox_eth_raw_os_start(interface, pdata->enetaddr, priv);
 }
@@ -55,7 +55,7 @@ static int sb_eth_raw_send(struct udevice *dev, void *packet, int length)
                         * localhost works on a higher-level API in Linux than
                         * ARP packets, so fake it
                         */
-                       arp_ip = NetReadIP(&arp->ar_tpa);
+                       arp_ip = net_read_ip(&arp->ar_tpa);
                        reply_arp = 1;
                        return 0;
                }
@@ -65,7 +65,7 @@ static int sb_eth_raw_send(struct udevice *dev, void *packet, int length)
        return sandbox_eth_raw_os_send(packet, length, priv);
 }
 
-static int sb_eth_raw_recv(struct udevice *dev, uchar **packetp)
+static int sb_eth_raw_recv(struct udevice *dev, int flags, uchar **packetp)
 {
        struct eth_pdata *pdata = dev_get_platdata(dev);
        struct eth_sandbox_raw_priv *priv = dev_get_priv(dev);
@@ -93,9 +93,9 @@ static int sb_eth_raw_recv(struct udevice *dev, uchar **packetp)
                /* Any non-zero MAC address will work */
                memset(&arp->ar_sha, 0x01, ARP_HLEN);
                /* Use whatever IP we were looking for (always 127.0.0.1?) */
-               NetWriteIP(&arp->ar_spa, arp_ip);
+               net_write_ip(&arp->ar_spa, arp_ip);
                memcpy(&arp->ar_tha, pdata->enetaddr, ARP_HLEN);
-               NetWriteIP(&arp->ar_tpa, NetOurIP);
+               net_write_ip(&arp->ar_tpa, net_ip);
                length = ARP_HDR_SIZE;
        } else {
                /* If local, the Ethernet header won't be included; skip it */
@@ -145,7 +145,7 @@ static int sb_eth_raw_ofdata_to_platdata(struct udevice *dev)
 {
        struct eth_pdata *pdata = dev_get_platdata(dev);
 
-       pdata->iobase = dev_get_addr(dev);
+       pdata->iobase = devfdt_get_addr(dev);
        return 0;
 }