Changeset 6d8455d in mainline for uspace/lib

Timestamp:

2012-01-14T11:07:34Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f302586

Parents:

f991b6b

Message:

Eliminate packet_t from sending direction of NIC interface.

Location:

uspace/lib

Files:

• c/generic/device/nic.c (modified) (1 diff)
• c/include/device/nic.h (modified) (1 diff)
• drv/generic/remote_nic.c (modified) (2 diffs)
• drv/include/ops/nic.h (modified) (2 diffs)
• nic/include/nic.h (modified) (2 diffs)
• nic/include/nic_driver.h (modified) (1 diff)
• nic/include/nic_impl.h (modified) (1 diff)
• nic/src/nic_driver.c (modified) (3 diffs)
• nic/src/nic_impl.c (modified) (2 diffs)

uspace/lib/c/generic/device/nic.c

@@ -44 +44 @@
 #include <ipc/services.h>
 
-/** Send a packet through the device
- *
- * @param[in] dev_sess
- * @param[in] packet_id Id of the sent packet
- *
- * @return EOK If the operation was successfully completed
- *
- */
-int nic_send_message(async_sess_t *dev_sess, packet_id_t packet_id)
-{
-        async_exch_t *exch = async_exchange_begin(dev_sess);
-        int rc = async_req_2_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
-            NIC_SEND_MESSAGE, packet_id);
-        async_exchange_end(exch);
-        
-        return rc;
+/** Send frame from NIC
+ *
+ * @param[in] dev_sess
+ * @param[in] data     Frame data
+ * @param[in] size     Frame size in bytes
+ *
+ * @return EOK If the operation was successfully completed
+ *
+ */
+int nic_send_frame(async_sess_t *dev_sess, void *data, size_t size)
+{
+        async_exch_t *exch = async_exchange_begin(dev_sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
+            NIC_SEND_MESSAGE, &answer);
+        sysarg_t retval = async_data_write_start(exch, data, size);
+        
+        async_exchange_end(exch);
+        
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                return retval;
+        }
+
+        async_wait_for(req, &retval);
+        return retval;
 }
 

uspace/lib/c/include/device/nic.h

@@ -85 +85 @@
 } nic_funcs_t;
 
-extern int nic_send_message(async_sess_t *, packet_id_t);
+extern int nic_send_frame(async_sess_t *, void *, size_t);
 extern int nic_connect_to_nil(async_sess_t *, services_t, nic_device_id_t);
 extern int nic_get_state(async_sess_t *, nic_device_state_t *);

uspace/lib/drv/generic/remote_nic.c

@@ -39 +39 @@
 #include <errno.h>
 #include <ipc/services.h>
-#include <adt/measured_strings.h>
 #include <sys/time.h>
 #include "ops/nic.h"
 
-static void remote_nic_send_message(ddf_fun_t *dev, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        nic_iface_t *nic_iface = (nic_iface_t *) iface;
-        assert(nic_iface->send_message);
-        
-        packet_id_t packet_id = (packet_id_t) IPC_GET_ARG2(*call);
-        
-        int rc = nic_iface->send_message(dev, packet_id);
-        async_answer_0(callid, rc);
+static void remote_nic_send_frame(ddf_fun_t *dev, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        nic_iface_t *nic_iface = (nic_iface_t *) iface;
+        assert(nic_iface->send_frame);
+        
+        void *data;
+        size_t size;
+        int rc;
+        
+        rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
+        if (rc != EOK) {
+                async_answer_0(callid, EINVAL);
+                return;
+        }
+        
+        rc = nic_iface->send_frame(dev, data, size);
+        async_answer_0(callid, rc);
+        free(data);
 }
 
@@ -1194 +1202 @@
  */
 static remote_iface_func_ptr_t remote_nic_iface_ops[] = {
-        &remote_nic_send_message,
+        &remote_nic_send_frame,
         &remote_nic_connect_to_nil,
         &remote_nic_get_state,

uspace/lib/drv/include/ops/nic.h

@@ -37 +37 @@
 #define LIBDRV_OPS_NIC_H_
 
-#include <net/packet.h>
 #include <ipc/services.h>
 #include <net/device.h>
@@ -46 +45 @@
 typedef struct nic_iface {
         /** Mandatory methods */
-        int (*send_message)(ddf_fun_t *, packet_id_t);
+        int (*send_frame)(ddf_fun_t *, void *, size_t);
         int (*connect_to_nil)(ddf_fun_t *, services_t, nic_device_id_t);
         int (*get_state)(ddf_fun_t *, nic_device_state_t *);

uspace/lib/nic/include/nic.h

@@ -77 +77 @@
  *
  * @param nic_data
- * @param packet        Pointer to the packet to be sent
- */
-typedef void (*write_packet_handler)(nic_t *, packet_t *);
+ * @param data          Pointer to frame data
+ * @param size          Size of frame data in bytes
+ */
+typedef void (*send_frame_handler)(nic_t *, void *, size_t);
 /**
  * The handler for transitions between driver states.
@@ -206 +207 @@
 extern int nic_get_resources(nic_t *, hw_res_list_parsed_t *);
 extern void nic_set_specific(nic_t *, void *);
-extern void nic_set_write_packet_handler(nic_t *, write_packet_handler);
+extern void nic_set_send_frame_handler(nic_t *, send_frame_handler);
 extern void nic_set_state_change_handlers(nic_t *,
         state_change_handler, state_change_handler, state_change_handler);

uspace/lib/nic/include/nic_driver.h

@@ -134 +134 @@
          * Called with the main_lock locked for reading.
          */
-        write_packet_handler write_packet;
+        send_frame_handler send_frame;
         /**
          * Event handler called when device goes to the ACTIVE state.

uspace/lib/nic/include/nic_impl.h

@@ -48 +48 @@
 
 extern int nic_get_address_impl(ddf_fun_t *dev_fun, nic_address_t *address);
-extern int nic_send_message_impl(ddf_fun_t *dev_fun, packet_id_t packet_id);
+extern int nic_send_frame_impl(ddf_fun_t *dev_fun, void *data, size_t size);
 extern int nic_connect_to_nil_impl(ddf_fun_t *dev_fun, services_t nil_service,
         int device_id);

uspace/lib/nic/src/nic_driver.c

@@ -114 +114 @@
                 if (!iface->set_state)
                         iface->set_state = nic_set_state_impl;
-                if (!iface->send_message)
-                        iface->send_message = nic_send_message_impl;
+                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;
@@ -168 +168 @@
  *
  * @param nic_data
- * @param wpfunc                Function handling the write_packet request
- */
-void nic_set_write_packet_handler(nic_t *nic_data, write_packet_handler wpfunc)
-{
-        nic_data->write_packet = wpfunc;
+ * @param sffunc        Function handling the send_frame request
+ */
+void nic_set_send_frame_handler(nic_t *nic_data, send_frame_handler sffunc)
+{
+        nic_data->send_frame = sffunc;
 }
 
@@ -765 +765 @@
         nic_data->poll_mode = NIC_POLL_IMMEDIATE;
         nic_data->default_poll_mode = NIC_POLL_IMMEDIATE;
-        nic_data->write_packet = NULL;
+        nic_data->send_frame = NULL;
         nic_data->on_activating = NULL;
         nic_data->on_going_down = NULL;

uspace/lib/nic/src/nic_impl.c

@@ -39 +39 @@
 #include <ipc/services.h>
 #include <ns.h>
-#include <packet_client.h>
-#include <packet_remote.h>
 #include "nic_driver.h"
 #include "nic_impl.h"
@@ -159 +157 @@
 
 /**
- * Default implementation of the send_message method.
+ * Default implementation of the send_frame method.
  * Send messages to the network.
  *
  * @param       fun
- * @param       packet_id       ID of the first packet in a queue of sent packets
+ * @param       data    Frame data
+ * @param       size    Frame size in bytes
  *
  * @return EOK          If the message was sent
- * @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;
+ * @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;
 
         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;
         }
 
-        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);
+        nic_data->send_frame(nic_data, data, size);
         return EOK;
 }