Changeset 8442d10 in mainline for uspace/drv/nic/rtl8139

Timestamp:

2013-09-09T21:48:12Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c67dbd6

Parents:

2e2c18a1

Message:

improve the API of physmem_map(), dmamem_map() and dmamem_map_anonymous()
the "constraint" argument of dmamem_map_anonymous() should be used to specify bits disallowed in the physical frame address

Location:

uspace/drv/nic/rtl8139

Files:

• driver.c (modified) (2 diffs)
• driver.h (modified) (2 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -1144 +1144 @@
         ddf_msg(LVL_DEBUG, "Creating buffers");
 
-        rc = dmamem_map_anonymous(TX_PAGES * PAGE_SIZE, AS_AREA_WRITE, 0,
-            &rtl8139->tx_buff_phys, &rtl8139->tx_buff_virt);
+        rc = dmamem_map_anonymous(TX_PAGES * PAGE_SIZE, DMAMEM_4GiB,
+            AS_AREA_WRITE, 0, &rtl8139->tx_buff_phys, &rtl8139->tx_buff_virt);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Can not allocate transmitter buffers.");
@@ -1164 +1164 @@
             RxBUF_TOT_LENGTH);
 
-        rc = dmamem_map_anonymous(RxBUF_TOT_LENGTH, AS_AREA_READ, 0,
-            &rtl8139->rx_buff_phys, &rtl8139->rx_buff_virt);
+        rc = dmamem_map_anonymous(RxBUF_TOT_LENGTH, DMAMEM_4GiB,
+            AS_AREA_READ, 0, &rtl8139->rx_buff_phys, &rtl8139->rx_buff_virt);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Can not allocate receive buffer.");

uspace/drv/nic/rtl8139/driver.h

@@ -100 +100 @@
          *  Each buffer takes 2kB
          */
-        void *tx_buff_phys;
+        uintptr_t tx_buff_phys;
         void *tx_buff_virt;
 
@@ -117 +117 @@
 
         /** Buffer for receiving frames */
-        void *rx_buff_phys;
+        uintptr_t rx_buff_phys;
         void *rx_buff_virt;