Changeset 3d5e190 in mainline for uspace/srv/hw/netif/dp8390/ne2000.c

Timestamp:

2011-01-06T23:50:48Z (14 years ago)

Author:

martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7c34b28f, 854151c, ae1f70e

Parents:

ba21938 (diff), 7922dea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

simplify the NE2000 driver code even futher to be really sure that it is working properly (still not 100 % sure about that)

File:

• uspace/srv/hw/netif/dp8390/ne2000.c (modified) (8 diffs)

uspace/srv/hw/netif/dp8390/ne2000.c

@@ -81 +81 @@
 static int test_16(dpeth_t *dep, int pos, uint8_t *pat);
 
-/** Stops the NE2000 network interface.
- *  @param[in,out] dep The network interface structure.
- */
-static void ne_stop(dpeth_t *dep);
-
-/** Initializes the NE2000 network interface.
- *  @param[in,out] dep The network interface structure.
- */
-void ne_init(struct dpeth *dep);
-
 int ne_probe(dpeth_t *dep)
 {
@@ -136 +126 @@
                 
                 if (dep->de_16bit) {
-                        loc1= NE2000_START;
-                        loc2= NE2000_START + NE2000_SIZE - 4;
-                        f= test_16;
+                        loc1 = NE2000_START;
+                        loc2 = NE2000_START + NE2000_SIZE - 4;
+                        f = test_16;
                 } else {
-                        loc1= NE1000_START;
-                        loc2= NE1000_START + NE1000_SIZE - 4;
-                        f= test_8;
+                        loc1 = NE1000_START;
+                        loc2 = NE1000_START + NE1000_SIZE - 4;
+                        f = test_8;
                 }
                 
@@ -149 +139 @@
                     f(dep, loc2, pat0) && f(dep, loc2, pat1) &&
                     f(dep, loc2, pat2) && f(dep, loc2, pat3)) {
-                        dep->de_initf = ne_init;
-                        dep->de_stopf = ne_stop;
                         return 1;
                 }
@@ -158 +146 @@
 }
 
+/** Initializes the NE2000 network interface.
+ *
+ *  @param[in,out] dep The network interface structure.
+ *
+ */
 void ne_init(dpeth_t *dep)
 {
@@ -206 +199 @@
         dep->de_stoppage = dep->de_offset_page + dep->de_ramsize / DP_PAGESIZE;
         
-        printf("%s: Novell NE%d000 ethernet card at I/O address "
+        printf("Novell NE%d000 ethernet card at I/O address "
             "%#lx, memory size %#lx, irq %d\n",
-            dep->de_name, dep->de_16bit ? 2 : 1,
-            dep->de_base_port, dep->de_ramsize, dep->de_irq);
+            dep->de_16bit ? 2 : 1, dep->de_base_port, dep->de_ramsize,
+            dep->de_irq);
 }
 
@@ -235 +228 @@
         
         if (i == N) {
-                printf("%s: NE1000 remote DMA test failed\n", dep->de_name);
+                printf("NE1000 remote DMA test failed\n");
                 return 0;
         }
@@ -274 +267 @@
         
         if (i == N) {
-                printf("%s: NE2000 remote DMA test failed\n", dep->de_name);
+                printf("NE2000 remote DMA test failed\n");
                 return 0;
         }
@@ -290 +283 @@
 }
 
-static void ne_stop(dpeth_t *dep)
+/** Stop the NE2000 network interface.
+ *
+ *  @param[in,out] dep The network interface structure.
+ *
+ */
+void ne_stop(dpeth_t *dep)
 {
         /* Reset the ethernet card */