Changes in uspace/lib/nic/src/nic_driver.c [4c5deac:acdb5bac] in mainline

File:

• uspace/lib/nic/src/nic_driver.c (modified) (8 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <str_error.h>
+#include <ipc/services.h>
+#include <ipc/ns.h>
+#include <ipc/irc.h>
 #include <sysinfo.h>
 #include <as.h>
@@ -249 +252 @@
         
         /* Connect to the parent's driver. */
-        parent_sess = ddf_dev_parent_sess_create(dev);
+        parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
         if (parent_sess == NULL)
                 return EPARTY;
@@ -375 +378 @@
 }
 
+
+/**
+ * Enable interrupts for this driver.
+ *
+ * @param nic_data
+ * @param irq                   The IRQ number for this device
+ */
+void nic_enable_interrupt(nic_t *nic_data, int irq)
+{
+        async_exch_t *exch = async_exchange_begin(nic_data->irc_session);
+        async_msg_1(exch, IRC_ENABLE_INTERRUPT, irq);
+        async_exchange_end(exch);
+}
+
+/**
+ * Disable interrupts for this driver.
+ *
+ * @param nic_data
+ * @param irq                   The IRQ number for this device
+ */
+void nic_disable_interrupt(nic_t *nic_data, int irq)
+{
+        async_exch_t *exch = async_exchange_begin(nic_data->irc_session);
+        async_msg_1(exch, IRC_CLEAR_INTERRUPT, irq);
+        async_exchange_end(exch);
+}
+
 /** Get the polling mode information from the device 
  *
@@ -390 +420 @@
         return nic_data->poll_mode;
 };
+
+/**
+ * Connect to IRC service. This function should be called only from
+ * the add_device handler, thus no locking is required.
+ *
+ * @param nic_data
+ *
+ * @return EOK          If connection was successful.
+ * @return EINVAL       If the IRC service cannot be determined.
+ * @return EREFUSED     If IRC service cannot be connected.
+ */
+int nic_connect_to_services(nic_t *nic_data)
+{
+        /* IRC service */
+        sysarg_t apic;
+        sysarg_t i8259;
+        services_t irc_service = -1;
+        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic)) ||
+            ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)))
+                irc_service = SERVICE_IRC;
+        else
+                return EINVAL;
+        
+        nic_data->irc_session = service_connect_blocking(EXCHANGE_SERIALIZE,
+                irc_service, 0, 0);
+        if (nic_data->irc_session == NULL)
+                return errno;
+        
+        return EOK;
+}
 
 /** Inform the NICF about poll mode
@@ -436 +496 @@
                 int rc = nic_ev_addr_changed(nic_data->client_session,
                     address);
-
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);
@@ -485 +544 @@
         if (!addr)
                 return;
+        if (!nic_data)
+                memset(addr, 0, sizeof(nic_address_t));
 
         memcpy(addr, &nic_data->mac, sizeof(nic_address_t));
@@ -607 +668 @@
         nic_data->state = NIC_STATE_STOPPED;
         nic_data->client_session = NULL;
+        nic_data->irc_session = NULL;
         nic_data->poll_mode = NIC_POLL_IMMEDIATE;
         nic_data->default_poll_mode = NIC_POLL_IMMEDIATE;
@@ -913 +975 @@
 nic_t *nic_get_from_ddf_fun(ddf_fun_t *fun)
 {
-        return (nic_t *) ddf_dev_data_get(ddf_fun_get_dev(fun));
+        return (nic_t *) ddf_fun_data_get(fun);
 }