Changeset 8d7ec69d in mainline for uspace/lib/nic/src

Timestamp:

2012-01-22T10:40:07Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c38e417, cf9cb36

Parents:

e98fe28c

Message:

NIC should talk to its client via a callback connection with NIC-defined
protocol (was using nil, was connecting via NS).

Location:

uspace/lib/nic/src

Files:

• nic_driver.c (modified) (7 diffs)
• nic_ev.c (added)
• nic_impl.c (modified) (5 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -53 +53 @@
 
 #include "nic_driver.h"
+#include "nic_ev.h"
 #include "nic_impl.h"
 
@@ -106 +107 @@
                 if (!iface->send_frame)
                         iface->send_frame = nic_send_frame_impl;
-                if (!iface->connect_to_nil)
-                        iface->connect_to_nil = nic_connect_to_nil_impl;
+                if (!iface->callback_create)
+                        iface->callback_create = nic_callback_create_impl;
                 if (!iface->get_address)
                         iface->get_address = nic_get_address_impl;
@@ -494 +495 @@
         
         /* Notify NIL layer (and uppper) if bound - not in add_device */
-        if (nic_data->nil_session != NULL) {
-                int rc = nil_addr_changed_msg(nic_data->nil_session,
+        if (nic_data->client_session != NULL) {
+                int rc = nic_ev_addr_changed(nic_data->client_session,
                     nic_data->device_id, address);
                 if (rc != EOK) {
@@ -603 +604 @@
                 }
                 fibril_rwlock_write_unlock(&nic_data->stats_lock);
-                nil_received_msg(nic_data->nil_session, nic_data->device_id,
+                nic_ev_received(nic_data->client_session, nic_data->device_id,
                     frame->data, frame->size);
         } else {
@@ -638 +639 @@
         fibril_rwlock_write_unlock(&nic_data->stats_lock);
         
-        nil_received_msg(nic_data->nil_session, nic_data->device_id,
+        nic_ev_received(nic_data->client_session, nic_data->device_id,
             data, size);
 }
@@ -692 +693 @@
         nic_data->device_id = NIC_DEVICE_INVALID_ID;
         nic_data->state = NIC_STATE_STOPPED;
-        nic_data->nil_session = NULL;
+        nic_data->client_session = NULL;
         nic_data->irc_session = NULL;
         nic_data->poll_mode = NIC_POLL_IMMEDIATE;
@@ -746 +747 @@
  */
 static void nic_destroy(nic_t *nic_data) {
-        if (nic_data->nil_session != NULL) {
-                async_hangup(nic_data->nil_session);
+        if (nic_data->client_session != NULL) {
+                async_hangup(nic_data->client_session);
         }
 

uspace/lib/nic/src/nic_impl.c

@@ -40 +40 @@
 #include <ns.h>
 #include "nic_driver.h"
+#include "nic_ev.h"
 #include "nic_impl.h"
 
@@ -85 +86 @@
         }
         if (state == NIC_STATE_ACTIVE) {
-                if (nic_data->nil_session == NULL || nic_data->device_id < 0) {
+                if (nic_data->client_session == NULL || nic_data->device_id < 0) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);
                         return EINVAL;
@@ -115 +116 @@
         if (state == NIC_STATE_STOPPED) {
                 /* Notify upper layers that we are reseting the MAC */
-                int rc = nil_addr_changed_msg(nic_data->nil_session,
+                int rc = nic_ev_addr_changed(nic_data->client_session,
                         nic_data->device_id, &nic_data->default_mac);
                 nic_data->poll_mode = nic_data->default_poll_mode;
@@ -148 +149 @@
         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, nic_data->device_id, state);
 
         fibril_rwlock_write_unlock(&nic_data->main_lock);
@@ -181 +182 @@
 
 /**
- * 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_device_id_t device_id)
+{
+        nic_t *nic = (nic_t *) fun->driver_data;
+        fibril_rwlock_write_lock(&nic->main_lock);
         
-        nic_data->device_id = device_id;
+        nic->device_id = device_id;
         
-        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;
+        nic->client_session = async_callback_receive(EXCHANGE_SERIALIZE);
+        if (nic->client_session == NULL) {
+                fibril_rwlock_write_unlock(&nic->main_lock);
+                return ENOMEM;
         }
         
-        fibril_rwlock_write_unlock(&nic_data->main_lock);
-        return EHANGUP;
+        fibril_rwlock_write_unlock(&nic->main_lock);
+        return EOK;
 }