Changeset c01bb5f9 in mainline for uspace/drv/nic

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

39aa8ce, 856a36bb, 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.

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (3 diffs)
• ne2k/ne2k.c (modified) (3 diffs)
• rtl8139/driver.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),

uspace/drv/nic/ne2k/ne2k.c

@@ -64 +64 @@
 #define NE2K(device) ((ne2k_t *) nic_get_specific(DRIVER_DATA(device)))
 
+static irq_pio_range_t ne2k_ranges_prototype[] = {
+        {
+                .base = 0,
+                .size = NE2K_IO_SIZE, 
+        }
+};
+
 /** NE2000 kernel interrupt command sequence.
  *
@@ -122 +129 @@
 
         if (ne2k->code.cmdcount == 0) {
-                irq_cmd_t *ne2k_cmds = malloc(sizeof(ne2k_cmds_prototype));
-                if (ne2k_cmds == NULL) {
+                irq_pio_range_t *ne2k_ranges;
+                irq_cmd_t *ne2k_cmds;
+
+                ne2k_ranges = malloc(sizeof(ne2k_ranges_prototype));
+                if (!ne2k_ranges)
+                        return ENOMEM;
+                memcpy(ne2k_ranges, ne2k_ranges_prototype,
+                    sizeof(ne2k_ranges_prototype));
+                ne2k_ranges[0].base = (uintptr_t) ne2k->base_port;
+
+                ne2k_cmds = malloc(sizeof(ne2k_cmds_prototype));
+                if (!ne2k_cmds) {
+                        free(ne2k_ranges);
                         return ENOMEM;
                 }
-                memcpy(ne2k_cmds, ne2k_cmds_prototype, sizeof (ne2k_cmds_prototype));
-                ne2k_cmds[0].addr = ne2k->port + DP_ISR;
-                ne2k_cmds[3].addr = ne2k->port + DP_IMR;
+                memcpy(ne2k_cmds, ne2k_cmds_prototype,
+                    sizeof(ne2k_cmds_prototype));
+                ne2k_cmds[0].addr = ne2k->base_port + DP_ISR;
+                ne2k_cmds[3].addr = ne2k->base_port + DP_IMR;
                 ne2k_cmds[4].addr = ne2k_cmds[0].addr;
-                ne2k_cmds[5].addr = ne2k->port + DP_TSR;
-
-                ne2k->code.cmdcount = sizeof(ne2k_cmds_prototype) / sizeof(irq_cmd_t);
+                ne2k_cmds[5].addr = ne2k->base_port + DP_TSR;
+
+                ne2k->code.rangecount = sizeof(ne2k_ranges_prototype) /
+                    sizeof(irq_pio_range_t);
+                ne2k->code.ranges = ne2k_ranges;
+
+                ne2k->code.cmdcount = sizeof(ne2k_cmds_prototype) /
+                    sizeof(irq_cmd_t);
                 ne2k->code.cmds = ne2k_cmds;
         }
@@ -148 +172 @@
                 ne2k_t *ne2k = NE2K(dev);
                 if (ne2k) {
+                        free(ne2k->code.ranges);
                         free(ne2k->code.cmds);
                 }

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();