Changeset 3a0a4d8 in mainline for uspace/drv/nic/rtl8139/driver.c

Timestamp:

2013-09-12T07:54:05Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

95027b5

Parents:

47f5a77 (diff), 64f3d3b (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.c (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.");