Changeset 8e7c9fe in mainline for uspace/drv/nic/ne2k/ne2k.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

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

uspace/drv/nic/ne2k/ne2k.c

@@ -38 +38 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <stdio.h>
 #include <errno.h>
+#include <irc.h>
 #include <stdlib.h>
 #include <str_error.h>
@@ -124 +122 @@
 };
 
-static void ne2k_interrupt_handler(ddf_dev_t *dev, ipc_callid_t iid,
-        ipc_call_t *call);
+static void ne2k_interrupt_handler(ipc_callid_t, ipc_call_t *, ddf_dev_t *);
 
 static int ne2k_register_interrupt(nic_t *nic_data)
@@ -242 +239 @@
 }
 
-void ne2k_interrupt_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call)
+void ne2k_interrupt_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev)
 {
         nic_t *nic_data = DRIVER_DATA(dev);
         ne2k_interrupt(nic_data, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call));
-
+        
         async_answer_0(iid, EOK);
 }
@@ -256 +253 @@
         if (!ne2k->up) {
                 int rc = ne2k_up(ne2k);
+                if (rc != EOK)
+                        return rc;
+
+                rc = irc_enable_interrupt(ne2k->irq);
                 if (rc != EOK) {
+                        ne2k_down(ne2k);
                         return rc;
                 }
-
-                nic_enable_interrupt(nic_data, ne2k->irq);
         }
         return EOK;
@@ -269 +269 @@
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
 
-        nic_disable_interrupt(nic_data, ne2k->irq);
+        (void) irc_disable_interrupt(ne2k->irq);
         ne2k->receive_configuration = RCR_AB | RCR_AM;
         ne2k_down(ne2k);
@@ -396 +396 @@
         }
         
-        rc = nic_connect_to_services(nic_data);
-        if (rc != EOK) {
-                ne2k_dev_cleanup(dev);
-                return rc;
-        }
-        
         fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
         if (fun == NULL) {
@@ -407 +401 @@
                 return ENOMEM;
         }
+        
         nic_set_ddf_fun(nic_data, fun);
         ddf_fun_set_ops(fun, &ne2k_dev_ops);
-        ddf_fun_data_implant(fun, nic_data);
         
         rc = ddf_fun_bind(fun);
@@ -443 +437 @@
 int main(int argc, char *argv[])
 {
+        printf("%s: HelenOS NE 2000 network adapter driver\n", NAME);
+        
         nic_driver_init(NAME);
         nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface);