Changeset cfb79747 in mainline for uspace/lib/nic/src/nic_impl.c

Timestamp:

2012-02-14T22:06:15Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a31aad1

Parents:

199112e4 (diff), e10d41a (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_impl.c (modified) (6 diffs)

uspace/lib/nic/src/nic_impl.c

@@ -36 +36 @@
  */
 
+#include <errno.h>
 #include <str_error.h>
 #include <ipc/services.h>
 #include <ns.h>
 #include "nic_driver.h"
+#include "nic_ev.h"
 #include "nic_impl.h"
 
@@ -85 +87 @@
         }
         if (state == NIC_STATE_ACTIVE) {
-                if (nic_data->nil_session == NULL || nic_data->net_session == NULL
-                    || nic_data->device_id < 0) {
+                if (nic_data->client_session == NULL) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);
                         return EINVAL;
@@ -116 +117 @@
         if (state == NIC_STATE_STOPPED) {
                 /* Notify upper layers that we are reseting the MAC */
-                int rc = nil_addr_changed_msg(nic_data->nil_session,
-                        nic_data->device_id, &nic_data->default_mac);
+                int rc = nic_ev_addr_changed(nic_data->client_session,
+                        &nic_data->default_mac);
                 nic_data->poll_mode = nic_data->default_poll_mode;
                 memcpy(&nic_data->poll_period, &nic_data->default_poll_period,
@@ -149 +150 @@
         nic_data->state = state;
 
-        nil_device_state_msg(nic_data->nil_session, nic_data->device_id, state);
+        nic_ev_device_state(nic_data->client_session, state);
 
         fibril_rwlock_write_unlock(&nic_data->main_lock);
@@ -182 +183 @@
 
 /**
- * Default implementation of the connect_to_nil method.
- * Connects the driver to the NIL service.
+ * Default implementation of the connect_client method.
+ * Creates callback connection to the client.
  *
  * @param       fun
- * @param       nil_service     ID of the server implementing the NIL service
- * @param       device_id       ID of the device as used in higher layers
- *
- * @return EOK          If the services were bound
- * @return                      Negative error code from service_connect_blocking
- */
-int nic_connect_to_nil_impl(ddf_fun_t *fun, services_t nil_service,
-    nic_device_id_t device_id)
-{
-        nic_t *nic_data = (nic_t *) fun->driver_data;
-        fibril_rwlock_write_lock(&nic_data->main_lock);
+ *
+ * @return EOK          On success, or negative error code.
+ */
+int nic_callback_create_impl(ddf_fun_t *fun)
+{
+        nic_t *nic = (nic_t *) fun->driver_data;
+        fibril_rwlock_write_lock(&nic->main_lock);
         
-        nic_data->device_id = device_id;
+        nic->client_session = async_callback_receive(EXCHANGE_SERIALIZE);
+        if (nic->client_session == NULL) {
+                fibril_rwlock_write_unlock(&nic->main_lock);
+                return ENOMEM;
+        }
         
-        nic_data->nil_session = service_connect_blocking(EXCHANGE_SERIALIZE,
-            nil_service, 0, 0);
-        if (nic_data->nil_session != NULL) {
-                fibril_rwlock_write_unlock(&nic_data->main_lock);
-                return EOK;
-        }
-        
-        fibril_rwlock_write_unlock(&nic_data->main_lock);
-        return EHANGUP;
+        fibril_rwlock_write_unlock(&nic->main_lock);
+        return EOK;
 }
 
@@ -805 +799 @@
 }
 
-/** Default implementation of the device_added method
- *
- * Just calls nic_ready.
- *
- * @param dev
- *
- */
-void nic_device_added_impl(ddf_dev_t *dev)
-{
-        nic_ready((nic_t *) dev->driver_data);
-}
-
 /**
  * Default handler for unknown methods (outside of the NIC interface).