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

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (16 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -36 +36 @@
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
+#include <device/hw_res.h>
 #include <io/log.h>
 #include <nic.h>
 #include <pci_dev_iface.h>
-#include <irc.h>
 #include <stdio.h>
 #include <str.h>
@@ -125 +125 @@
 
 
-/** Disable interrupts on controller
+/** Set interrupts on controller
  *
  *  @param rtl8139  The card private structure
  */
-inline static void rtl8139_hw_int_disable(rtl8139_t *rtl8139)
-{
-        pio_write_16(rtl8139->io_port + IMR, 0x0);
-}
-/** Enable interrupts on controller
- *
- *  @param rtl8139  The card private structure
- */
-inline static void rtl8139_hw_int_enable(rtl8139_t *rtl8139)
+inline static void rtl8139_hw_int_set(rtl8139_t *rtl8139)
 {
         pio_write_16(rtl8139->io_port + IMR, rtl8139->int_mask);
@@ -274 +266 @@
 }
 
-/**  Provide OR in the 32bit register (set selected bits to 1)
- *
- *   @param rtl8139     The rtl8139 structure
- *   @param reg_offset  Register offset in the device IO space
- *   @param bits_add    The value to or
- */
-inline static void rtl8139_hw_reg_add_32(rtl8139_t * rtl8139, size_t reg_offset,
-    uint32_t bits_add)
-{
-        uint32_t value = pio_read_32(rtl8139->io_port + reg_offset);
-        value |= bits_add;
-        pio_write_32(rtl8139->io_port + reg_offset, value);
-}
-
 /**  Unset selected bits in 8bit register
  *
@@ -301 +279 @@
         pio_write_8(rtl8139->io_port + reg_offset, value);
 }
-
-/**  Unset selected bits in 32bit register
- *
- *   @param rtl8139     The rtl8139 structure
- *   @param reg_offset  Register offset in the device IO space
- *   @param bits_add    The mask of bits to remove
- */
-inline static void rtl8139_hw_reg_rem_32(rtl8139_t * rtl8139, size_t reg_offset,
-    uint32_t bits_add)
-{
-        uint32_t value = pio_read_32(rtl8139->io_port + reg_offset);
-        value &= ~bits_add;
-        pio_write_32(rtl8139->io_port + reg_offset, value);
-}
-
 
 static int rtl8139_set_addr(ddf_fun_t *fun, const nic_address_t *);
@@ -871 +834 @@
 
         /* Turn the interrupts on again */
-        rtl8139_hw_int_enable(rtl8139);
+        rtl8139_hw_int_set(rtl8139);
 };
 
@@ -881 +844 @@
  *  @param nic_data  The driver data
  *
- *  @return EOK if the handler was registered, negative error code otherwise
+ *  @return IRQ capability handle if the handler was registered.
+ *  @return Negative error code otherwise.
  */
 inline static int rtl8139_register_int_handler(nic_t *nic_data)
@@ -894 +858 @@
         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),
+        int cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
             rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code);
 
         RTL8139_IRQ_STRUCT_UNLOCK();
 
-        return rc;
+        return cap;
 }
 
@@ -954 +918 @@
 
         rtl8139->int_mask = RTL_DEFAULT_INTERRUPTS;
-        rtl8139_hw_int_enable(rtl8139);
-
-        int rc = irc_enable_interrupt(rtl8139->irq);
+        rtl8139_hw_int_set(rtl8139);
+
+        int rc = hw_res_enable_interrupt(rtl8139->parent_sess, rtl8139->irq);
         if (rc != EOK) {
                 rtl8139_on_stopped(nic_data);
@@ -1012 +976 @@
                 return NULL;
 
-        rtl8139_t *rtl8139 = malloc(sizeof(rtl8139_t));
+        rtl8139_t *rtl8139 = calloc(1, sizeof(rtl8139_t));
         if (!rtl8139) {
                 nic_unbind_and_destroy(dev);
@@ -1018 +982 @@
         }
 
-        memset(rtl8139, 0, sizeof(rtl8139_t));
+        rtl8139->dev = dev;
 
         rtl8139->nic_data = nic_data;
@@ -1202 +1166 @@
 
         ddf_msg(LVL_DEBUG, "rtl8139: dev_data created");
+        rtl8139->parent_sess = ddf_dev_parent_sess_get(dev);
+        if (rtl8139->parent_sess == NULL) {
+                ddf_msg(LVL_ERROR, "Error connecting parent device.");
+                return EIO;
+        }
 
         /* Obtain and fill hardware resources info and connect to parent */
@@ -1294 +1263 @@
         ddf_fun_t *fun;
 
-        assert(dev);
         ddf_msg(LVL_NOTE, "RTL8139_dev_add %s (handle = %zu)",
             ddf_dev_get_name(dev), ddf_dev_get_handle(dev));
@@ -1321 +1289 @@
 
         /* Register interrupt handler */
-        rc = rtl8139_register_int_handler(nic_data);
-        if (rc != EOK)
+        int irq_cap = rtl8139_register_int_handler(nic_data);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 goto err_pio;
+        }
 
         fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
@@ -1355 +1325 @@
         ddf_fun_destroy(fun);
 err_srv:
-        unregister_interrupt_handler(dev, rtl8139->irq);
+        unregister_interrupt_handler(dev, irq_cap);
 err_pio:
         // rtl8139_pio_disable(dev);
@@ -2117 +2087 @@
                 /* Disable timer interrupts while working with timer-related data */
                 rtl8139->int_mask = 0;
-                rtl8139_hw_int_enable(rtl8139);
+                rtl8139_hw_int_set(rtl8139);
 
                 rtl8139->poll_timer = new_timer;
@@ -2140 +2110 @@
         }
 
-        rtl8139_hw_int_enable(rtl8139);
+        rtl8139_hw_int_set(rtl8139);
 
         fibril_mutex_unlock(&rtl8139->rx_lock);