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

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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) (2 diffs)

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