Changes in uspace/drv/nic/e1k/e1k.c [582a0b8:d51838f] in mainline

File:

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

uspace/drv/nic/e1k/e1k.c

@@ -40 +40 @@
 #include <thread.h>
 #include <byteorder.h>
-#include <irc.h>
 #include <as.h>
 #include <ddi.h>
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
+#include <device/hw_res.h>
 #include <device/hw_res_parsed.h>
 #include <pci_dev_iface.h>
@@ -116 +116 @@
 /** E1000 device data */
 typedef struct {
+        /** DDF device */
+        ddf_dev_t *dev;
+        /** Parent session */
+        async_sess_t *parent_sess;
         /** Device configuration */
         e1000_info_t info;
@@ -365 +369 @@
         if (ctrl & CTRL_SLU) {
                 ctrl &= ~(CTRL_SLU);
+                E1000_REG_WRITE(e1000, E1000_CTRL, ctrl);
                 fibril_mutex_unlock(&e1000->ctrl_lock);
+                
                 thread_usleep(10);
+                
                 fibril_mutex_lock(&e1000->ctrl_lock);
+                ctrl = E1000_REG_READ(e1000, E1000_CTRL);
                 ctrl |= CTRL_SLU;
+                E1000_REG_WRITE(e1000, E1000_CTRL, ctrl);
         }
         
         fibril_mutex_unlock(&e1000->ctrl_lock);
-        
-        e1000_link_restart(e1000);
 }
 
@@ -1253 +1260 @@
  * @param nic Driver data
  *
- * @return EOK if the handler was registered
+ * @return IRQ capability handle if the handler was registered
  * @return Negative error code otherwise
  *
@@ -1268 +1275 @@
         e1000_irq_code.cmds[2].addr = e1000->reg_base_phys + E1000_IMC;
         
-        int rc = register_interrupt_handler(nic_get_ddf_dev(nic),
-            e1000->irq, e1000_interrupt_handler, &e1000_irq_code);
+        int cap = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq,
+            e1000_interrupt_handler, &e1000_irq_code);
         
         fibril_mutex_unlock(&irq_reg_mutex);
-        return rc;
+        return cap;
 }
 
@@ -1754 +1761 @@
         e1000_enable_interrupts(e1000);
         
-        int rc = irc_enable_interrupt(e1000->irq);
+        int rc = hw_res_enable_interrupt(e1000->parent_sess, e1000->irq);
         if (rc != EOK) {
                 e1000_disable_interrupts(e1000);
@@ -1799 +1806 @@
         e1000_disable_rx(e1000);
         
-        irc_disable_interrupt(e1000->irq);
+        hw_res_disable_interrupt(e1000->parent_sess, e1000->irq);
         e1000_disable_interrupts(e1000);
         
@@ -1881 +1888 @@
         
         memset(e1000, 0, sizeof(e1000_t));
+        e1000->dev = dev;
         
         nic_set_specific(nic, e1000);
@@ -1995 +2003 @@
                 ddf_msg(LVL_ERROR, "Unable to allocate device softstate");
                 return ENOMEM;
+        }
+        
+        e1000->parent_sess = ddf_dev_parent_sess_get(dev);
+        if (e1000->parent_sess == NULL) {
+                ddf_msg(LVL_ERROR, "Failed connecting parent device.");
+                return EIO;
         }
         
@@ -2116 +2130 @@
 {
         ddf_fun_t *fun;
-        assert(dev);
         
         /* Initialize device structure for E1000 */
@@ -2152 +2165 @@
         ddf_fun_set_ops(fun, &e1000_dev_ops);
         
-        rc = e1000_register_int_handler(nic);
-        if (rc != EOK)
+        int irq_cap = e1000_register_int_handler(nic);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 goto err_fun_create;
+        }
         
         rc = e1000_initialize_rx_structure(nic);
@@ -2189 +2204 @@
         e1000_uninitialize_rx_structure(nic);
 err_irq:
-        unregister_interrupt_handler(dev, DRIVER_DATA_DEV(dev)->irq);
+        unregister_interrupt_handler(dev, irq_cap);
 err_fun_create:
         ddf_fun_destroy(fun);