Changeset d7ff048 in mainline for uspace/drv/nic/ne2k/dp8390.h

Timestamp:

2011-10-08T13:08:53Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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:

Merge mainline changes

File:

• uspace/drv/nic/ne2k/dp8390.h (moved) (moved from uspace/srv/hw/netif/ne2000/dp8390.h ) (6 diffs)

uspace/drv/nic/ne2k/dp8390.h

@@ -2 +2 @@
  * Copyright (c) 2009 Lukas Mejdrech
  * Copyright (c) 2011 Martin Decky
+ * Copyright (c) 2011 Radim Vansa
  * All rights reserved.
  *
@@ -38 +39 @@
  */
 
-/** @addtogroup ne2000
+/** @addtogroup drv_ne2k
  *  @{
  */
@@ -50 +51 @@
 
 #include <fibril_synch.h>
-#include <adt/list.h>
-#include <net/packet.h>
-#include <netif_skel.h>
-
-/** Module name */
-#define NAME  "ne2000"
+#include <nic.h>
+#include <ddf/interrupt.h>
 
 /** Input/output size */
 #define NE2K_IO_SIZE  0x0020
 
-/** Ethernet address length */
-#define ETH_ADDR  6
+/* NE2000 implementation. */
+
+/** NE2000 Data Register */
+#define NE2K_DATA  0x0010
+
+/** NE2000 Reset register */
+#define NE2K_RESET  0x001f
+
+/** NE2000 data start */
+#define NE2K_START  0x4000
+
+/** NE2000 data size */
+#define NE2K_SIZE  0x4000
+
+/** NE2000 retry count */
+#define NE2K_RETRY  0x1000
+
+/** NE2000 error messages rate limiting */
+#define NE2K_ERL  10
+
+/** Minimum Ethernet packet size in bytes */
+#define ETH_MIN_PACK_SIZE  60
+
+/** Maximum Ethernet packet size in bytes */
+#define ETH_MAX_PACK_SIZE_TAGGED  1518
 
 /* National Semiconductor DP8390 Network Interface Controller. */
@@ -204 +224 @@
 typedef struct {
         /* Device configuration */
+        void *base_port; /**< Port assigned from ISA configuration **/
         void *port;
         void *data_port;
         int irq;
-        uint8_t mac[ETH_ADDR];
+        nic_address_t mac;
         
         uint8_t start_page;  /**< Ring buffer start page */
@@ -224 +245 @@
         bool probed;
         bool up;
-        
+
+        /* Irq code with assigned addresses for this device */
+        irq_code_t code;
+
+        /* Copy of the receive configuration register */
+        uint8_t receive_configuration;
+
         /* Device statistics */
-        device_stats_t stats;
+        // TODO: shouldn't be these directly in device.h - nic_device_stats?
         uint64_t misses;     /**< Receive frame misses */
         uint64_t underruns;  /**< FIFO underruns */
@@ -232 +259 @@
 } ne2k_t;
 
-typedef struct {
-        link_t link;
-        packet_t *packet;
-} frame_t;
-
-extern int ne2k_probe(ne2k_t *, void *, int);
+extern int ne2k_probe(ne2k_t *);
 extern int ne2k_up(ne2k_t *);
 extern void ne2k_down(ne2k_t *);
-extern void ne2k_send(ne2k_t *, packet_t *);
-extern list_t *ne2k_interrupt(ne2k_t *, uint8_t, uint8_t);
+extern void ne2k_send(nic_t *, packet_t *);
+extern void ne2k_interrupt(nic_t *, uint8_t, uint8_t);
+extern packet_t *ne2k_alloc_packet(nic_t *, size_t);
+
+extern void ne2k_set_accept_mcast(ne2k_t *, int);
+extern void ne2k_set_accept_bcast(ne2k_t *, int);
+extern void ne2k_set_promisc_phys(ne2k_t *, int);
+extern void ne2k_set_mcast_hash(ne2k_t *, uint64_t);
+extern void ne2k_set_physical_address(ne2k_t *, const nic_address_t *address);
 
 #endif