Changeset 0a208110 in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2012-02-24T18:04:56Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2578199

Parents:

b9bbaad (diff), 087768f (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.

Registering OHCI irq handler panics on ppc32.

File:

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

uspace/drv/nic/e1k/e1k.c

@@ -228 +228 @@
 static void e1000_send_frame(nic_t *, void *, size_t);
 
+/** PIO ranges used in the IRQ code. */
+irq_pio_range_t e1000_irq_pio_ranges[] = {
+        {
+                .base = 0,
+                .size = PAGE_SIZE,      /* XXX */
+        }
+};
+
 /** Commands to deal with interrupt
  *
@@ -256 +264 @@
 /** Interrupt code definition */
 irq_code_t e1000_irq_code = {
+        .rangecount = sizeof(e1000_irq_pio_ranges) /
+            sizeof(irq_pio_range_t),
+        .ranges = e1000_irq_pio_ranges,
         .cmdcount = sizeof(e1000_irq_commands) / sizeof(irq_cmd_t),
         .cmds = e1000_irq_commands
@@ -1252 +1263 @@
         fibril_mutex_lock(&irq_reg_mutex);
         
-        e1000_irq_code.cmds[0].addr = e1000->reg_base_virt + E1000_ICR;
-        e1000_irq_code.cmds[2].addr = e1000->reg_base_virt + E1000_IMC;
+        e1000_irq_code.ranges[0].base = (uintptr_t) e1000->reg_base_phys;
+        e1000_irq_code.cmds[0].addr = e1000->reg_base_phys + E1000_ICR;
+        e1000_irq_code.cmds[2].addr = e1000->reg_base_phys + E1000_IMC;
         
         int rc = register_interrupt_handler(nic_get_ddf_dev(nic),