Changes in uspace/drv/nic/rtl8139/driver.c [d87561c:99e8fb7b] in mainline

File:

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

uspace/drv/nic/rtl8139/driver.c

@@ -41 +41 @@
 #include <io/log.h>
 #include <nic.h>
-#include <device/pci.h>
+#include <pci_dev_iface.h>
 
 #include <ipc/irc.h>
@@ -190 +190 @@
         return;
 }
-
-#include <device/pci.h>
 
 /** Set PmEn (Power management enable) bit value
@@ -1087 +1085 @@
         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 +1142 @@
         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 +1162 @@
             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.");