Changeset 7de1988c in mainline for uspace/drv/nic

Timestamp:

2013-09-12T20:53:09Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddd0499d

Parents:

8049b79

Message:

Adapt drivers using parsed HW resources to use the new interface.

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (1 diff)
• ne2k/ne2k.c (modified) (1 diff)
• rtl8139/driver.c (modified) (1 diff)

uspace/drv/nic/e1k/e1k.c

@@ -1941 +1941 @@
         e1000->irq = hw_resources->irqs.irqs[0];
         e1000->reg_base_phys =
-            MEMADDR_TO_PTR(hw_resources->mem_ranges.ranges[0].address);
+            MEMADDR_TO_PTR(RNGABS(hw_resources->mem_ranges.ranges[0]));
         
         return EOK;

uspace/drv/nic/ne2k/ne2k.c

@@ -211 +211 @@
         ne2k->irq = hw_res_parsed.irqs.irqs[0];
         
-        ne2k->base_port = (void *) (uintptr_t)
-            hw_res_parsed.io_ranges.ranges[0].address;
+        addr_range_t regs = hw_res_parsed.io_ranges.ranges[0];
+        ne2k->base_port = RNGABSPTR(regs);
         
         hw_res_list_parsed_clean(&hw_res_parsed);
         
-        /* Enable port I/O */
-        if (pio_enable(ne2k->base_port, NE2K_IO_SIZE, &ne2k->port) != EOK)
+        /* Enable programmed I/O */
+        if (pio_enable_range(&regs, &ne2k->port) != EOK)
                 return EADDRNOTAVAIL;
-        
         
         ne2k->data_port = ne2k->port + NE2K_DATA;

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 "