Changes in uspace/lib/nic/src/nic_impl.c [9cd8165:00d7e1b] in mainline

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 <packet_client.h>
+#include <packet_remote.h>
 #include "nic_driver.h"
-#include "nic_ev.h"
 #include "nic_impl.h"
 
@@ -87 +87 @@
         }
         if (state == NIC_STATE_ACTIVE) {
-                if (nic_data->client_session == NULL) {
+                if (nic_data->nil_session == NULL || nic_data->net_session == NULL
+                    || nic_data->device_id < 0) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);
                         return EINVAL;
@@ -117 +118 @@
         if (state == NIC_STATE_STOPPED) {
                 /* Notify upper layers that we are reseting the MAC */
-                int rc = nic_ev_addr_changed(nic_data->client_session,
-                        &nic_data->default_mac);
+                int rc = nil_addr_changed_msg(nic_data->nil_session,
+                        nic_data->device_id, &nic_data->default_mac);
                 nic_data->poll_mode = nic_data->default_poll_mode;
                 memcpy(&nic_data->poll_period, &nic_data->default_poll_period,
@@ -150 +151 @@
         nic_data->state = state;
 
-        nic_ev_device_state(nic_data->client_session, state);
+        nil_device_state_msg(nic_data->nil_session, nic_data->device_id, state);
 
         fibril_rwlock_write_unlock(&nic_data->main_lock);
@@ -158 +159 @@
 
 /**
- * Default implementation of the send_frame method.
+ * Default implementation of the send_message method.
  * Send messages to the network.
  *
  * @param       fun
- * @param       data    Frame data
- * @param       size    Frame size in bytes
+ * @param       packet_id       ID of the first packet in a queue of sent packets
  *
  * @return EOK          If the message was sent
- * @return EBUSY        If the device is not in state when the frame can be sent.
- */
-int nic_send_frame_impl(ddf_fun_t *fun, void *data, size_t size)
-{
-        nic_t *nic_data = (nic_t *) fun->driver_data;
+ * @return EBUSY        If the device is not in state when the packet can be set.
+ * @return EINVAL       If the packet ID is invalid
+ */
+int nic_send_message_impl(ddf_fun_t *fun, packet_id_t packet_id)
+{
+        nic_t *nic_data = (nic_t *) fun->driver_data;
+        packet_t *packet, *next;
 
         fibril_rwlock_read_lock(&nic_data->main_lock);
         if (nic_data->state != NIC_STATE_ACTIVE || nic_data->tx_busy) {
                 fibril_rwlock_read_unlock(&nic_data->main_lock);
+                pq_release_remote(nic_data->net_session, packet_id);
                 return EBUSY;
         }
 
-        nic_data->send_frame(nic_data, data, size);
-        return EOK;
-}
-
-/**
- * Default implementation of the connect_client method.
- * Creates callback connection to the client.
+        int rc = packet_translate_remote(nic_data->net_session, &packet, packet_id);
+
+        if (rc != EOK) {
+                fibril_rwlock_read_unlock(&nic_data->main_lock);
+                return EINVAL;
+        }
+
+        /*
+         * Process the packet queue. Each sent packet must be detached from the
+         * queue and destroyed. This is why the cycle differs from loopback's
+         * cycle, where the packets are immediately used in upper layers and
+         * therefore they must not be destroyed (released).
+         */
+        assert(nic_data->write_packet != NULL);
+        do {
+                next = pq_detach(packet);
+                nic_data->write_packet(nic_data, packet);
+                packet = next;
+        } while (packet);
+        fibril_rwlock_read_unlock(&nic_data->main_lock);
+        return EOK;
+}
+
+/**
+ * Default implementation of the connect_to_nil method.
+ * Connects the driver to the NIL service.
  *
  * @param       fun
- *
- * @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);
+ * @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);
         
-        nic->client_session = async_callback_receive(EXCHANGE_SERIALIZE);
-        if (nic->client_session == NULL) {
-                fibril_rwlock_write_unlock(&nic->main_lock);
-                return ENOMEM;
-        }
+        nic_data->device_id = device_id;
         
-        fibril_rwlock_write_unlock(&nic->main_lock);
-        return EOK;
+        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;
 }
 
@@ -799 +828 @@
 }
 
+/** 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).