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

Timestamp:

2012-01-22T11:53:22Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

b7e0260

Parents:

eaa0c3f (diff), 8d7ec69d (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

@@ -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);
         }