Changeset 2a6e4ac2 in mainline

Timestamp:

2011-01-06T15:03:23Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

fc23ef6

Parents:

506a805

Message:

cstyle & clutter removal

Location:

uspace/srv/hw/netif/dp8390

Files:

• dp8390.c (modified) (1 diff)
• dp8390.h (modified) (1 diff)
• dp8390_module.c (modified) (2 diffs)
• local.h (deleted)
• ne2000.c (modified) (2 diffs)
• ne2000.h (modified) (3 diffs)

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

@@ -10 +10 @@
 #include <byteorder.h>
 #include <errno.h>
-
 #include <netif_local.h>
 #include <net/packet.h>
 #include <packet_client.h>
-
 #include "dp8390_drv.h"
 #include "dp8390_port.h"
-
-#include "local.h"
 #include "dp8390.h"
+#include "ne2000.h"
 
 /** Queues the outgoing packet.

uspace/srv/hw/netif/dp8390/dp8390.h

@@ -13 +13 @@
 
 #include "dp8390_port.h"
-#include "local.h"
 
 /** Input/output size.

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

@@ -43 +43 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
-
 #include <net/modules.h>
 #include <packet_client.h>
@@ -51 +50 @@
 #include <netif_interface.h>
 #include <netif_local.h>
-
 #include "dp8390.h"
 #include "dp8390_drv.h"

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

@@ -9 +9 @@
 #include <stdio.h>
 #include <unistd.h>
-
 #include "dp8390_port.h"
-
-#include "local.h"
 #include "dp8390.h"
 #include "ne2000.h"
@@ -21 +18 @@
 /** Type definition of the testing function.
  */
-_PROTOTYPE(typedef int (*testf_t), (dpeth_t *dep, int pos, u8_t *pat)   );
+_PROTOTYPE(typedef int (*testf_t), (dpeth_t *dep, int pos, u8_t *pat));
 
 /** Data patterns */
-u8_t pat0[]= {0x00, 0x00, 0x00, 0x00};
-u8_t pat1[]= {0xFF, 0xFF, 0xFF, 0xFF};
-u8_t pat2[]= {0xA5, 0x5A, 0x69, 0x96};
-u8_t pat3[]= {0x96, 0x69, 0x5A, 0xA5};
+u8_t pat0[] = {0x00, 0x00, 0x00, 0x00};
+u8_t pat1[] = {0xFF, 0xFF, 0xFF, 0xFF};
+u8_t pat2[] = {0xA5, 0x5A, 0x69, 0x96};
+u8_t pat3[] = {0x96, 0x69, 0x5A, 0xA5};
 
 /** Tests 8 bit NE2000 network interface.

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

@@ -11 +11 @@
 
 #include <libarch/ddi.h>
-
 #include "dp8390_port.h"
 
@@ -61 +60 @@
  *  @returns The read value.
  */
-#define inw_ne(dep, reg)  (inw(dep->de_base_port+reg))
+#define inw_ne(dep, reg)  (inw(dep->de_base_port + reg))
 
 /** Writes 1 word (2 bytes) register.
@@ -68 +67 @@
  *  @param[in] data The value to be written.
  */
-#define outw_ne(dep, reg, data)  (outw(dep->de_base_port+reg, data))
+#define outw_ne(dep, reg, data)  (outw(dep->de_base_port + reg, data))
+
+struct dpeth;
+
+int ne_probe(struct dpeth *dep);
 
 #endif