net: tsec: Move rx_idx and tx_idx to struct tsec_private

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

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 9aba0c5e3c025704afb71785be7f06180a0a60bc..350004757715011de9de0bb5b9176e36059dea1a 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,15 +113,15 @@ 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;
@@ -169,7 +170,11 @@ int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port,
 
 static void nc_send_packet(const char *buf, int len)
 {
+#ifdef CONFIG_DM_ETH
+       struct udevice *eth;
+#else
        struct eth_device *eth;
+#endif
        int inited = 0;
        uchar *pkt;
        uchar *ether;
@@ -182,24 +187,25 @@ static void nc_send_packet(const char *buf, int len)
                return;
 
        if (!memcmp(nc_ether, net_null_ethaddr, 6)) {
-               if (eth->state == ETH_STATE_ACTIVE)
+               if (eth_is_active(eth))
                        return; /* inside net loop */
                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;
        }
 
-       if (eth->state != ETH_STATE_ACTIVE) {
+       if (!eth_is_active(eth)) {
                if (eth_is_on_demand_init()) {
                        if (eth_init() < 0)
                                return;
                        eth_set_last_protocol(NETCONS);
-               } else
+               } else {
                        eth_init_state_only();
+               }
 
                inited = 1;
        }
@@ -217,7 +223,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;
 
@@ -230,14 +236,14 @@ static int nc_start(struct stdio_dev *dev)
 
        /*
         * Initialize the static IP settings and buffer pointers
-        * incase we call net_send_udp_packet 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;
@@ -248,7 +254,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;
 
@@ -267,7 +273,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;
 
@@ -275,7 +281,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;
 
@@ -288,9 +294,13 @@ 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)
 {
+#ifdef CONFIG_DM_ETH
+       struct udevice *eth;
+#else
        struct eth_device *eth;
+#endif
 
        if (input_recursion)
                return 0;
@@ -299,13 +309,13 @@ static int nc_tstc(struct stdio_dev *dev)
                return 1;
 
        eth = eth_get_dev();
-       if (eth && eth->state == ETH_STATE_ACTIVE)
+       if (eth_is_active(eth))
                return 0;       /* inside net loop */
 
        input_recursion = 1;
 
        net_timeout = 1;
-       NetLoop(NETCONS);       /* kind of poll */
+       net_loop(NETCONS);      /* kind of poll */
 
        input_recursion = 0;
 
@@ -320,12 +330,12 @@ int drv_nc_init(void)
        memset(&dev, 0, sizeof(dev));
 
        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.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
+       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);