Changeset 40559a96 in mainline for uspace/srv/hw/netif/dp8390/dp8390.h

Timestamp:

2011-01-06T17:51:26Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

096234b

Parents:

122b753

Message:

get rid of I/O buffers

File:

• uspace/srv/hw/netif/dp8390/dp8390.h (modified) (5 diffs)

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

@@ -189 +189 @@
  *  @returns The read value.
  */
-#define inb_reg0(dep, reg)  (inb(dep->de_dp8390_port+reg))
+#define inb_reg0(dep, reg)  (inb(dep->de_dp8390_port + reg))
 
 /** Writes 1 byte zero page register.
@@ -196 +196 @@
  *  @param[in] data The value to be written.
  */
-#define outb_reg0(dep, reg, data)  (outb(dep->de_dp8390_port+reg, data))
+#define outb_reg0(dep, reg, data)  (outb(dep->de_dp8390_port + reg, data))
 
 /** Reads 1 byte from the first page register.
@@ -203 +203 @@
  *  @returns The read value.
  */
-#define inb_reg1(dep, reg)  (inb(dep->de_dp8390_port+reg))
+#define inb_reg1(dep, reg)  (inb(dep->de_dp8390_port + reg))
 
 /** Writes 1 byte first page register.
@@ -210 +210 @@
  *  @param[in] data The value to be written.
  */
-#define outb_reg1(dep, reg, data)  (outb(dep->de_dp8390_port+reg, data))
+#define outb_reg1(dep, reg, data)  (outb(dep->de_dp8390_port + reg, data))
 
 /* Software interface to the dp8390 driver */
 
 struct dpeth;
-struct iovec_dat;
 
 typedef void (*dp_initf_t)(struct dpeth *dep);
 typedef void (*dp_stopf_t)(struct dpeth *dep);
-typedef void (*dp_user2nicf_t)(struct dpeth *dep, struct iovec_dat *iovp, size_t offset, int nic_addr, size_t count);
-typedef void (*dp_nic2userf_t)(struct dpeth *dep, int nic_addr, struct iovec_dat *iovp, size_t offset, size_t count);
+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 IOVEC_NR  1
-
-typedef struct iovec_dat {
-  iovec_t iod_iovec[IOVEC_NR];
-  int iod_iovec_s;
-  void *iod_iovec_addr;
-} iovec_dat_t;
 
 #define SENDQ_NR     1  /* Maximum size of the send queue */
@@ -295 +286 @@
         int de_mode;
         eth_stat_t de_stat;
-        iovec_dat_t de_read_iovec;
-        iovec_dat_t de_write_iovec;
-        iovec_dat_t de_tmp_iovec;
         size_t de_read_s;
 //      int de_client;