Changeset 72d120e in mainline for uspace/drv/nic/rtl8139/driver.c

Timestamp:

2014-06-16T20:17:44Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

5a78e4e

Parents:

9d653e3 (diff), 334bf28 (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:

Integrate from mainline.

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (2 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -1141 +1141 @@
 
         ddf_msg(LVL_DEBUG, "Creating buffers");
-
+        
+        rtl8139->tx_buff_virt = AS_AREA_ANY;
         rc = dmamem_map_anonymous(TX_PAGES * PAGE_SIZE, DMAMEM_4GiB,
             AS_AREA_WRITE, 0, &rtl8139->tx_buff_phys, &rtl8139->tx_buff_virt);
@@ -1161 +1162 @@
         ddf_msg(LVL_DEBUG, "Allocating receiver buffer of the size %d bytes",
             RxBUF_TOT_LENGTH);
-
+        
+        rtl8139->rx_buff_virt = AS_AREA_ANY;
         rc = dmamem_map_anonymous(RxBUF_TOT_LENGTH, DMAMEM_4GiB,
             AS_AREA_READ, 0, &rtl8139->rx_buff_phys, &rtl8139->rx_buff_virt);