usb: gadget: at91_udc: port linux driver at91_udc

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

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 0d81b441b70e2f88fc4c6e616dfb3ed7fbf66e08..31042a6b6ba76566a0c74bd99918b710e8f516af 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -48,7 +48,7 @@ static void nc_handler(uchar *pkt, unsigned dest, struct in_addr sip,
                net_set_state(NETLOOP_SUCCESS); /* got input - quit net loop */
 }
 
-static void nc_timeout(void)
+static void nc_timeout_handler(void)
 {
        net_set_state(NETLOOP_SUCCESS);
 }
@@ -91,8 +91,9 @@ static int refresh_settings_from_env(void)
                                nc_out_port = simple_strtoul(p + 1, NULL, 10);
                                nc_in_port = nc_out_port;
                        }
-               } else
+               } else {
                        nc_ip.s_addr = ~0; /* ncip is not set, so broadcast */
+               }
 
                p = getenv("ncoutport");
                if (p != NULL)
@@ -112,23 +113,24 @@ static int refresh_settings_from_env(void)
 }
 
 /**
- * Called from NetLoop in net/net.c before each packet
+ * Called from net_loop in net/net.c before each packet
  */
-void NcStart(void)
+void nc_start(void)
 {
        refresh_settings_from_env();
        if (!output_packet_len || memcmp(nc_ether, net_null_ethaddr, 6)) {
                /* going to check for input packet */
                net_set_udp_handler(nc_handler);
-               NetSetTimeout(net_timeout, nc_timeout);
+               net_set_timeout_handler(net_timeout, nc_timeout_handler);
        } else {
                /* send arp request */
                uchar *pkt;
                net_set_arp_handler(nc_wait_arp_handler);
-               pkt = (uchar *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE;
+               pkt = (uchar *)net_tx_packet + net_eth_hdr_size() +
+                       IP_UDP_HDR_SIZE;
                memcpy(pkt, output_packet, output_packet_len);
-               NetSendUDPPacket(nc_ether, nc_ip, nc_out_port, nc_in_port,
-                       output_packet_len);
+               net_send_udp_packet(nc_ether, nc_ip, nc_out_port, nc_in_port,
+                                   output_packet_len);
        }
 }
 
@@ -186,7 +188,7 @@ static void nc_send_packet(const char *buf, int len)
                output_packet = buf;
                output_packet_len = len;
                input_recursion = 1;
-               NetLoop(NETCONS); /* wait for arp reply and send packet */
+               net_loop(NETCONS); /* wait for arp reply and send packet */
                input_recursion = 0;
                output_packet_len = 0;
                return;
@@ -197,16 +199,17 @@ static void nc_send_packet(const char *buf, int len)
                        if (eth_init() < 0)
                                return;
                        eth_set_last_protocol(NETCONS);
-               } else
+               } else {
                        eth_init_state_only();
+               }
 
                inited = 1;
        }
-       pkt = (uchar *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE;
+       pkt = (uchar *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE;
        memcpy(pkt, buf, len);
        ether = nc_ether;
        ip = nc_ip;
-       NetSendUDPPacket(ether, ip, nc_out_port, nc_in_port, len);
+       net_send_udp_packet(ether, ip, nc_out_port, nc_in_port, len);
 
        if (inited) {
                if (eth_is_on_demand_init())
@@ -216,7 +219,7 @@ static void nc_send_packet(const char *buf, int len)
        }
 }
 
-static int nc_start(struct stdio_dev *dev)
+static int nc_stdio_start(struct stdio_dev *dev)
 {
        int retval;
 
@@ -229,14 +232,14 @@ static int nc_start(struct stdio_dev *dev)
 
        /*
         * Initialize the static IP settings and buffer pointers
-        * incase we call NetSendUDPPacket before NetLoop
+        * incase we call net_send_udp_packet before net_loop
         */
        net_init();
 
        return 0;
 }
 
-static void nc_putc(struct stdio_dev *dev, char c)
+static void nc_stdio_putc(struct stdio_dev *dev, char c)
 {
        if (output_recursion)
                return;
@@ -247,7 +250,7 @@ static void nc_putc(struct stdio_dev *dev, char c)
        output_recursion = 0;
 }
 
-static void nc_puts(struct stdio_dev *dev, const char *s)
+static void nc_stdio_puts(struct stdio_dev *dev, const char *s)
 {
        int len;
 
@@ -266,7 +269,7 @@ static void nc_puts(struct stdio_dev *dev, const char *s)
        output_recursion = 0;
 }
 
-static int nc_getc(struct stdio_dev *dev)
+static int nc_stdio_getc(struct stdio_dev *dev)
 {
        uchar c;
 
@@ -274,7 +277,7 @@ static int nc_getc(struct stdio_dev *dev)
 
        net_timeout = 0;        /* no timeout */
        while (!input_size)
-               NetLoop(NETCONS);
+               net_loop(NETCONS);
 
        input_recursion = 0;
 
@@ -287,7 +290,7 @@ static int nc_getc(struct stdio_dev *dev)
        return c;
 }
 
-static int nc_tstc(struct stdio_dev *dev)
+static int nc_stdio_tstc(struct stdio_dev *dev)
 {
        struct eth_device *eth;
 
@@ -304,7 +307,7 @@ static int nc_tstc(struct stdio_dev *dev)
        input_recursion = 1;
 
        net_timeout = 1;
-       NetLoop(NETCONS);       /* kind of poll */
+       net_loop(NETCONS);      /* kind of poll */
 
        input_recursion = 0;
 
@@ -320,11 +323,11 @@ int drv_nc_init(void)
 
        strcpy(dev.name, "nc");
        dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
-       dev.start = nc_start;
-       dev.putc = nc_putc;
-       dev.puts = nc_puts;
-       dev.getc = nc_getc;
-       dev.tstc = nc_tstc;
+       dev.start = nc_stdio_start;
+       dev.putc = nc_stdio_putc;
+       dev.puts = nc_stdio_puts;
+       dev.getc = nc_stdio_getc;
+       dev.tstc = nc_stdio_tstc;
 
        rc = stdio_register(&dev);