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

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/dp8390.h (modified) (4 diffs)

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

@@ -89 +89 @@
 
 /** Page 1, read/write */
-#define DP_PAR0         0x1     /* Physical Address Register 0       */
-#define DP_PAR1         0x2     /* Physical Address Register 1       */
-#define DP_PAR2         0x3     /* Physical Address Register 2       */
-#define DP_PAR3         0x4     /* Physical Address Register 3       */
-#define DP_PAR4         0x5     /* Physical Address Register 4       */
-#define DP_PAR5         0x6     /* Physical Address Register 5       */
-#define DP_CURR         0x7     /* Current Page Register             */
-#define DP_MAR0         0x8     /* Multicast Address Register 0      */
-#define DP_MAR1         0x9     /* Multicast Address Register 1      */
-#define DP_MAR2         0xA     /* Multicast Address Register 2      */
-#define DP_MAR3         0xB     /* Multicast Address Register 3      */
-#define DP_MAR4         0xC     /* Multicast Address Register 4      */
-#define DP_MAR5         0xD     /* Multicast Address Register 5      */
-#define DP_MAR6         0xE     /* Multicast Address Register 6      */
-#define DP_MAR7         0xF     /* Multicast Address Register 7      */
+#define DP_PAR0  0x01  /**< Physical Address Register 0 */
+#define DP_PAR1  0x02  /**< Physical Address Register 1 */
+#define DP_PAR2  0x03  /**< Physical Address Register 2 */
+#define DP_PAR3  0x04  /**< Physical Address Register 3 */
+#define DP_PAR4  0x05  /**< Physical Address Register 4 */
+#define DP_PAR5  0x06  /**< Physical Address Register 5 */
+#define DP_CURR  0x07  /**< Current Page Register */
+#define DP_MAR0  0x08  /**< Multicast Address Register 0 */
+#define DP_MAR1  0x09  /**< Multicast Address Register 1 */
+#define DP_MAR2  0x0a  /**< Multicast Address Register 2 */
+#define DP_MAR3  0x0b  /**< Multicast Address Register 3 */
+#define DP_MAR4  0x0c  /**< Multicast Address Register 4 */
+#define DP_MAR5  0x0d  /**< Multicast Address Register 5 */
+#define DP_MAR6  0x0e  /**< Multicast Address Register 6 */
+#define DP_MAR7  0x0f  /**< Multicast Address Register 7 */
 
 /* Bits in dp_cr */
@@ -245 +245 @@
 #define outb_reg1(dep, reg, data)  (outb(dep->de_dp8390_port + reg, data))
 
-/* Software interface to the dp8390 driver */
-
-struct dpeth;
-
-typedef void (*dp_initf_t)(struct dpeth *dep);
-typedef void (*dp_stopf_t)(struct dpeth *dep);
-typedef void (*dp_user2nicf_t)(struct dpeth *dep, void *buf, size_t offset, int nic_addr, size_t size);
-typedef void (*dp_nic2userf_t)(struct dpeth *dep, int nic_addr, void *buf, size_t offset, size_t size);
-typedef void (*dp_getblock_t)(struct dpeth *dep, int page, size_t offset, size_t size, void *dst);
-
 #define SENDQ_NR     2  /* Maximum size of the send queue */
 #define SENDQ_PAGES  6  /* 6 * DP_PAGESIZE >= 1514 bytes */
@@ -264 +254 @@
          * routine knows the irq and/or memory address because they are
          * hardwired in the board, the probe should modify these fields.
-         * Futhermore, the probe routine should also fill in de_initf and
-         * de_stopf fields with the appropriate function pointers.
          */
         port_t de_base_port;
         int de_irq;
-        dp_initf_t de_initf;
-        dp_stopf_t de_stopf;
-        char de_name[sizeof("dp8390#n")];
-        
-        /*
-         * The initf function fills the following fields. Only cards that do
-         * programmed I/O fill in the de_pata_port field.
-         * In addition, the init routine has to fill in the sendq data
-         * structures.
-         */
+        
         ether_addr_t de_address;
         port_t de_dp8390_port;
@@ -300 +279 @@
         
         /* Fields for internal use by the dp8390 driver. */
-        int de_flags;
-        int de_mode;
         eth_stat_t de_stat;
-        dp_user2nicf_t de_user2nicf;
-        dp_nic2userf_t de_nic2userf;
-        dp_getblock_t de_getblockf;
+        
+        /* Driver flags */
+        bool up;
+        bool enabled;
+        bool stopped;
+        bool sending;
+        bool send_avail;
 } dpeth_t;
 
-#define DEF_EMPTY       0x000
-#define DEF_PACK_SEND   0x001
-#define DEF_SEND_AVAIL  0x004
-#define DEF_PROMISC     0x040
-#define DEF_MULTI       0x080
-#define DEF_BROAD       0x100
-#define DEF_ENABLED     0x200
-#define DEF_STOPPED     0x400
-
-#define DEM_DISABLED  0x0
-#define DEM_ENABLED   0x2
-
 #endif