Changes in uspace/drv/nic/ne2k/ne2k.c [80099c19:9571230] in mainline

File:

• uspace/drv/nic/ne2k/ne2k.c (modified) (6 diffs)

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);
                 }
@@ -336 +361 @@
 }
 
-static int ne2k_add_device(ddf_dev_t *dev)
+static int ne2k_dev_add(ddf_dev_t *dev)
 {
         /* Allocate driver data for the device. */
@@ -343 +368 @@
                 return ENOMEM;
         
-        nic_set_write_packet_handler(nic_data, ne2k_send);
+        nic_set_send_frame_handler(nic_data, ne2k_send);
         nic_set_state_change_handlers(nic_data,
                 ne2k_on_activating, NULL, ne2k_on_stopping);
@@ -391 +416 @@
 
 static driver_ops_t ne2k_driver_ops = {
-        .add_device = ne2k_add_device
+        .dev_add = ne2k_dev_add
 };