Changeset 15d0046 in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (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

File:

• uspace/lib/nic/src/nic_driver.c (modified) (6 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>
@@ -378 +375 @@
 }
 
-
-/**
- * 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 
  *
@@ -420 +390 @@
         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
@@ -496 +436 @@
                 int rc = nic_ev_addr_changed(nic_data->client_session,
                     address);
+
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);
@@ -668 +609 @@
         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;
@@ -975 +915 @@
 nic_t *nic_get_from_ddf_fun(ddf_fun_t *fun)
 {
-        return (nic_t *) ddf_fun_data_get(fun);
+        return (nic_t *) ddf_dev_data_get(ddf_fun_get_dev(fun));
 }