Changeset d51838f in mainline for uspace/drv/nic/ne2k

Timestamp:

2017-10-14T22:49:18Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

75911d24

Parents:

ce732e74

Message:

Let leaf drivers enable/disable/clear interrupts via hw_res instead of directly using irc.

Location:

uspace/drv/nic/ne2k

Files:

• dp8390.h (modified) (2 diffs)
• ne2k.c (modified) (4 diffs)

uspace/drv/nic/ne2k/dp8390.h

@@ -50 +50 @@
 #define __NET_NETIF_DP8390_H__
 
+#include <async.h>
+#include <ddf/driver.h>
 #include <fibril_synch.h>
 #include <nic.h>
@@ -223 +225 @@
 
 typedef struct {
+        /** DDF device */
+        ddf_dev_t *dev;
+        /** Parent session */
+        async_sess_t *parent_sess;
         /* Device configuration */
         void *base_port; /**< Port assigned from ISA configuration **/

uspace/drv/nic/ne2k/ne2k.c

@@ -40 +40 @@
 #include <stdio.h>
 #include <errno.h>
-#include <irc.h>
+#include <device/hw_res.h>
 #include <stdlib.h>
 #include <str_error.h>
@@ -256 +256 @@
                         return rc;
 
-                rc = irc_enable_interrupt(ne2k->irq);
+                rc = hw_res_enable_interrupt(ne2k->parent_sess, ne2k->irq);
                 if (rc != EOK) {
                         ne2k_down(ne2k);
@@ -269 +269 @@
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
 
-        (void) irc_disable_interrupt(ne2k->irq);
+        (void) hw_res_disable_interrupt(ne2k->parent_sess, ne2k->irq);
         ne2k->receive_configuration = RCR_AB | RCR_AM;
         ne2k_down(ne2k);
@@ -384 +384 @@
         }
         
+        ne2k->dev = dev;
+        ne2k->parent_sess = ddf_dev_parent_sess_get(dev);
+        if (ne2k->parent_sess == NULL) {
+                ne2k_dev_cleanup(dev);
+                return ENOMEM;
+        }
+        
         int rc = ne2k_dev_init(nic_data);
         if (rc != EOK) {