Changeset 3f03199 in mainline for uspace/drv/nic/ne2k/ne2k.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/drv/nic/ne2k/ne2k.c (modified) (1 diff)

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;