Changeset 99c2c69e in mainline for uspace/drv/nic/rtl8139/driver.c

Timestamp:

2013-09-13T00:36:30Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (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:

mainline changes

File:

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

uspace/drv/nic/rtl8139/driver.c

@@ -1087 +1087 @@
         ddf_msg(LVL_DEBUG, "%s device: irq 0x%x assigned", ddf_dev_get_name(dev), rtl8139->irq);
 
-        rtl8139->io_addr = IOADDR_TO_PTR(hw_resources->io_ranges.ranges[0].address);
+        rtl8139->io_addr = IOADDR_TO_PTR(RNGABS(hw_resources->io_ranges.ranges[0]));
         if (hw_resources->io_ranges.ranges[0].size < RTL8139_IO_SIZE) {
                 ddf_msg(LVL_ERROR, "i/o range assigned to the device "
@@ -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.");