Coding Style cleanyp; update CHANGELOG

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

diff --git a/drivers/net/ne2000.c b/drivers/net/ne2000.c
index 49280148d2c6668b6e775a5ed4cb38712da7dc6b..99baeea3e82c02509bee054aa08fa1e70eef38f3 100644 (file)
--- a/drivers/net/ne2000.c
+++ b/drivers/net/ne2000.c
@@ -5,7 +5,6 @@ Based on sources from the Linux kernel (pcnet_cs.c, 8390.h) and
 eCOS(if_dp83902a.c, if_dp83902a.h). Both of these 2 wonderful world
 are GPL, so this is, of course, GPL.
 
-
 ==========================================================================
 
 dev/if_dp83902a.c
@@ -70,9 +69,7 @@ Add SNMP
 
 ####DESCRIPTIONEND####
 
-
 ==========================================================================
-
 */
 
 #include <common.h>
@@ -80,8 +77,6 @@ Add SNMP
 #include <net.h>
 #include <malloc.h>
 
-#ifdef CONFIG_DRIVER_NE2000
-
 #define mdelay(n)       udelay((n)*1000)
 /* forward definition of function used for the uboot interface */
 void uboot_push_packet_len(int len);
@@ -114,8 +109,13 @@ void uboot_push_tx_done(int key, int val);
 /* NE2000 base header file */
 #include "ne2000_base.h"
 
+#if defined(CONFIG_DRIVER_AX88796L)
+/* AX88796L support */
+#include "ax88796.h"
+#else
 /* Basic NE2000 chip support */
 #include "ne2000.h"
+#endif
 
 static dp83902a_priv_data_t nic; /* just one instance of the card supported */
 
@@ -133,6 +133,7 @@ dp83902a_init(void)
        DEBUG_LINE();
 
 #if defined(NE2000_BASIC_INIT)
+       /* AX88796L doesn't need */
        /* Prepare ESA */
        DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE1);  /* Select page 1 */
        /* Use the address from the serial EEPROM */
@@ -206,7 +207,8 @@ dp83902a_start(u8 * enaddr)
        dp->running = true;
        for (i = 0;  i < ETHER_ADDR_LEN;  i++) {
                /* FIXME */
-               //*((vu_short*)( base + ((DP_P1_PAR0 + i) * 2) +  0x1400)) = enaddr[i];
+               /*((vu_short*)( base + ((DP_P1_PAR0 + i) * 2) +
+                * 0x1400)) = enaddr[i];*/
                DP_OUT(base, DP_P1_PAR0+i, enaddr[i]);
        }
        /* Enable and start device */
@@ -214,7 +216,6 @@ dp83902a_start(u8 * enaddr)
        DP_OUT(base, DP_TCR, DP_TCR_NORMAL); /* Normal transmit operations */
        DP_OUT(base, DP_RCR, DP_RCR_AB);  /* Accept broadcast, no errors, no multicast */
        dp->running = true;
-
 }
 
 /*
@@ -851,4 +852,3 @@ int eth_send(volatile void *packet, int length) {
        }
        return 0;
 }
-#endif