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

Timestamp:

2012-02-16T21:21:39Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

39aa8ce, 856a36b, f943dd3

Parents:

edd7c63c (diff), 21063c2 (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 from lp:~jakub/helenos/mm.

File:

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

uspace/drv/nic/rtl8139/driver.c

@@ -661 +661 @@
 
 
+irq_pio_range_t rtl8139_irq_pio_ranges[] = {
+        {
+                .base = 0,
+                .size = RTL8139_IO_SIZE
+        }
+};
 
 /** Commands to deal with interrupt
@@ -670 +676 @@
  */
 irq_cmd_t rtl8139_irq_commands[] = {
-                {
-                                /* Get the interrupt status */
-                                .cmd = CMD_PIO_READ_16,
-                                .addr = NULL,
-                                .dstarg = 2
-                },
-                {
-                                .cmd = CMD_PREDICATE,
-                                .value = 3,
-                                .srcarg = 2
-                },
-                {
-                                /* Mark interrupts as solved */
-                                .cmd = CMD_PIO_WRITE_16,
-                                .addr = NULL,
-                                .value = 0xFFFF
-                },
-                {
-                                /* Disable interrupts until interrupt routine is finished */
-                                .cmd = CMD_PIO_WRITE_16,
-                                .addr = NULL,
-                                .value = 0x0000
-                },
-                {
-                                .cmd = CMD_ACCEPT
-                }
+        {
+                /* Get the interrupt status */
+                .cmd = CMD_PIO_READ_16,
+                .addr = NULL,
+                .dstarg = 2
+        },
+        {
+                .cmd = CMD_PREDICATE,
+                .value = 3,
+                .srcarg = 2
+        },
+        {
+                /* Mark interrupts as solved */
+                .cmd = CMD_PIO_WRITE_16,
+                .addr = NULL,
+                .value = 0xFFFF
+        },
+        {
+                /* Disable interrupts until interrupt routine is finished */
+                .cmd = CMD_PIO_WRITE_16,
+                .addr = NULL,
+                .value = 0x0000
+        },
+        {
+                .cmd = CMD_ACCEPT
+        }
 };
 
 /** Interrupt code definition */
 irq_code_t rtl8139_irq_code = {
-        .cmdcount = sizeof(rtl8139_irq_commands)/sizeof(irq_cmd_t),
+        .rangecount = sizeof(rtl8139_irq_pio_ranges) / sizeof(irq_pio_range_t),
+        .ranges = rtl8139_irq_pio_ranges,
+        .cmdcount = sizeof(rtl8139_irq_commands) / sizeof(irq_cmd_t),
         .cmds = rtl8139_irq_commands
 };
@@ -890 +898 @@
         RTL8139_IRQ_STRUCT_LOCK();
 
-        rtl8139_irq_code.cmds[0].addr = rtl8139->io_port + ISR;
-        rtl8139_irq_code.cmds[2].addr = rtl8139->io_port + ISR;
-        rtl8139_irq_code.cmds[3].addr = rtl8139->io_port + IMR;
+        rtl8139_irq_code.ranges[0].base = (uintptr_t) rtl8139->io_addr;
+        rtl8139_irq_code.cmds[0].addr = rtl8139->io_addr + ISR;
+        rtl8139_irq_code.cmds[2].addr = rtl8139->io_addr + ISR;
+        rtl8139_irq_code.cmds[3].addr = rtl8139->io_addr + IMR;
         int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
-                rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code);
+            rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code);
 
         RTL8139_IRQ_STRUCT_UNLOCK();