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

Timestamp:

2012-01-21T23:55:03Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

c38e417

Parents:

86c71de (diff), e98fe28c (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 with mainline

File:

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

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>
@@ -89 +88 @@
     nic_iface_t *iface)
 {
-        if (driver_ops) {
-                if (!driver_ops->device_added)
-                        driver_ops->device_added = nic_device_added_impl;
-        }
-
         if (dev_ops) {
                 if (!dev_ops->open)
@@ -429 +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.
  *
@@ -436 +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;
@@ -462 +450 @@
         
         return EOK;
-}
-
-/** Notify the NET service that the device is ready
- *
- * @param nic NICF structure
- *
- * @return EOK on success
- *
- */
-int nic_ready(nic_t *nic)
-{
-        fibril_rwlock_read_lock(&nic->main_lock);
-        
-        async_sess_t *session = nic->net_session;
-        devman_handle_t handle = nic->dev->handle;
-        
-        fibril_rwlock_read_unlock(&nic->main_lock);
-        
-        if (session == NULL)
-                return EINVAL;
-        
-        return net_driver_ready(session, handle);
 }
 
@@ -726 +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;
@@ -781 +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);