Changeset 7943c43 in mainline for uspace/drv/nic/rtl8139/driver.h

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/rtl8139/driver.h (modified) (3 diffs)

uspace/drv/nic/rtl8139/driver.h

@@ -30 +30 @@
 #define RTL8139_DRIVER_H_
 
-#include "rtl8139_defs.h"
-#include "rtl8139_general.h"
+#include "defs.h"
+#include "general.h"
 #include <sys/types.h>
 #include <stdint.h>
-#include <dma.h>
 
 /** The driver name */
@@ -97 +96 @@
          *  Each buffer takes 2kB
          */
-        dma_mem_t tx_buff_mem;
+        void *tx_buff_phys;
+        void *tx_buff_virt;
+
         /** Virtual adresses of the Tx buffers */
         void *tx_buff[TX_BUFF_COUNT];
@@ -112 +113 @@
 
         /** Buffer for receiving packets */
-        dma_mem_t rx_buff;
+        void *rx_buff_phys;
+        void *rx_buff_virt;
 
         /** Receiver control register data */