Changeset 01380b1 in mainline

Timestamp:

2012-01-21T16:59:43Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e98fe28c

Parents:

ce7676c

Message:

libnic no longer needs net_session.

Location:

uspace/lib/nic

Files:

• include/nic_driver.h (modified) (1 diff)
• src/nic_driver.c (modified) (5 diffs)
• src/nic_impl.c (modified) (1 diff)

uspace/lib/nic/include/nic_driver.h

@@ -80 +80 @@
         /** Device's default MAC address (assigned the first time, used in STOP) */
         nic_address_t default_mac;
-        /** Session to SERVICE_NETWORKING */
-        async_sess_t *net_session;
         /** Session to SERVICE_ETHERNET or SERVICE_NILDUMMY */
         async_sess_t *nil_session;

uspace/lib/nic/src/nic_driver.c

@@ -49 +49 @@
 #include <devman.h>
 #include <ddf/interrupt.h>
-#include <net_interface.h>
 #include <ops/nic.h>
 #include <errno.h>
@@ -424 +423 @@
 
 /**
- * Connect to the NET and IRQ services. This function should be called only from
+ * Connect to IRC service. This function should be called only from
  * the add_device handler, thus no locking is required.
  *
@@ -431 +430 @@
  * @return EOK          If connection was successful.
  * @return EINVAL       If the IRC service cannot be determined.
- * @return EREFUSED     If NET or IRC service cannot be connected.
+ * @return EREFUSED     If IRC service cannot be connected.
  */
 int nic_connect_to_services(nic_t *nic_data)
 {
-        /* NET service */
-        nic_data->net_session = service_connect_blocking(EXCHANGE_SERIALIZE,
-                SERVICE_NETWORKING, 0, 0);
-        if (nic_data->net_session == NULL)
-                return errno;
-        
         /* IRC service */
         sysarg_t apic;
@@ -699 +692 @@
         nic_data->device_id = NIC_DEVICE_INVALID_ID;
         nic_data->state = NIC_STATE_STOPPED;
-        nic_data->net_session = NULL;
         nic_data->nil_session = NULL;
         nic_data->irc_session = NULL;
@@ -754 +746 @@
  */
 static void nic_destroy(nic_t *nic_data) {
-        if (nic_data->net_session != NULL) {
-                async_hangup(nic_data->net_session);
-        }
-
         if (nic_data->nil_session != NULL) {
                 async_hangup(nic_data->nil_session);

uspace/lib/nic/src/nic_impl.c

@@ -85 +85 @@
         }
         if (state == NIC_STATE_ACTIVE) {
-                if (nic_data->nil_session == NULL || nic_data->net_session == NULL
-                    || nic_data->device_id < 0) {
+                if (nic_data->nil_session == NULL || nic_data->device_id < 0) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);
                         return EINVAL;