Changeset ea788701 in mainline

Timestamp:

2012-01-19T18:14:48Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

321052f7

Parents:

d8da56b

Message:

Remove use of packet_t in NIC framework.

Location:

uspace

Files:

• drv/nic/lo/lo.c (modified) (2 diffs)
• drv/nic/ne2k/dp8390.h (modified) (1 diff)
• lib/nic/include/nic.h (modified) (6 diffs)
• lib/nic/include/nic_rx_control.h (modified) (1 diff)
• lib/nic/src/nic_driver.c (modified) (11 diffs)

uspace/drv/nic/lo/lo.c

@@ -42 +42 @@
 #include <async.h>
 #include <nic.h>
-#include <packet_client.h>
 
 #define NAME  "lo"
@@ -61 +60 @@
 static void lo_send_frame(nic_t *nic_data, void *data, size_t size)
 {
-        packet_t *packet;
-        int rc;
-
-        packet = nic_alloc_packet(nic_data, size);
-        if (packet == NULL)
-                return;
-
-        rc = packet_copy_data(packet, data, size);
-        if (rc != EOK)
-                return;
-
         nic_report_send_ok(nic_data, 1, size);
-        nic_received_noneth_packet(nic_data, packet);
+        nic_received_noneth_frame(nic_data, data, size);
 }
 

uspace/drv/nic/ne2k/dp8390.h

@@ -264 +264 @@
 extern void ne2k_send(nic_t *, void *, size_t);
 extern void ne2k_interrupt(nic_t *, uint8_t, uint8_t);
-extern packet_t *ne2k_alloc_packet(nic_t *, size_t);
 
 extern void ne2k_set_accept_mcast(ne2k_t *, int);

uspace/lib/nic/include/nic.h

@@ -42 +42 @@
 #include <ddf/driver.h>
 #include <device/hw_res_parsed.h>
-#include <net/packet.h>
 #include <ops/nic.h>
 
@@ -72 +71 @@
 
 /**
- * Handler for writing packet data to the NIC device.
- * The function is responsible for releasing the packet.
+ * Handler for writing frame data to the NIC device.
+ * The function is responsible for releasing the frame.
  * It does not return anything, if some error is detected the function just
  * silently fails (logging on debug level is suggested).
@@ -159 +158 @@
  * @return ENOTSUP      If this filter cannot work on this NIC (e.g. the NIC
  *                                      cannot run in promiscuous node or the limit of WOL
- *                                      packets' specifications was reached).
+ *                                      frames' specifications was reached).
  * @return ELIMIT       If this filter must implemented in HW but currently the
  *                                      limit of these HW filters was reached.
@@ -234 +233 @@
 extern int nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *);
 extern void nic_query_address(nic_t *, nic_address_t *);
-extern void nic_received_noneth_packet(nic_t *, packet_t *);
+extern void nic_received_noneth_frame(nic_t *, void *, size_t);
 extern void nic_received_frame(nic_t *, nic_frame_t *);
 extern void nic_received_frame_list(nic_t *, nic_frame_list_t *);
@@ -248 +247 @@
 extern void nic_report_collisions(nic_t *, unsigned);
 
-/* Packet / frame / frame list allocation and deallocation */
-extern packet_t *nic_alloc_packet(nic_t *, size_t);
-extern void nic_release_packet(nic_t *, packet_t *);
+/* Frame / frame list allocation and deallocation */
 extern nic_frame_t *nic_alloc_frame(nic_t *, size_t);
 extern nic_frame_list_t *nic_alloc_frame_list(void);
@@ -275 +272 @@
 extern void nic_sw_period_stop(nic_t *);
 
-/* Packet DMA lock */
-extern int nic_dma_lock_packet(packet_t *, size_t, void **);
-extern int nic_dma_unlock_packet(packet_t *, size_t);
-
 #endif // __NIC_H__
 

uspace/lib/nic/include/nic_rx_control.h

@@ -46 +46 @@
 #include <fibril_synch.h>
 #include <net/device.h>
-#include <net/packet_header.h>
 
 #include "nic_addr_db.h"

uspace/lib/nic/src/nic_driver.c

@@ -51 +51 @@
 #include <net_interface.h>
 #include <ops/nic.h>
-#include <packet_client.h>
-#include <packet_remote.h>
-#include <net/packet_header.h>
 #include <errno.h>
 
@@ -64 +61 @@
 
 /**
- * Initializes libraries required for NIC framework - logger, packet manager
+ * Initializes libraries required for NIC framework - logger
  *
  * @param name  Name of the device/driver (used in logging)
@@ -79 +76 @@
         snprintf(buffer, 256, "drv/" DEVICE_CATEGORY_NIC "/%s", name);
         
-        /* Initialize packet manager */
-        return pm_init();
+        return EOK;
 }
 
@@ -162 +158 @@
 
 /**
- * Setup write packet handler. This MUST be called in the add_device handler
+ * Setup send frame handler. This MUST be called in the add_device handler
  * if the nic_send_message_impl function is used for sending messages (filled
  * as send_message member of the nic_iface_t structure). The function must not
@@ -270 +266 @@
 }
 
-/**
- * Just a wrapper over the packet_get_1_remote function
- */
-packet_t *nic_alloc_packet(nic_t *nic_data, size_t data_size)
-{
-        return packet_get_1_remote(nic_data->net_session, data_size);
-}
-
-
-/**
- * Just a wrapper over the pq_release_remote function
- */
-void nic_release_packet(nic_t *nic_data, packet_t *packet)
-{
-        pq_release_remote(nic_data->net_session, packet_get_id(packet));
-}
-
-/** Allocate frame and packet
+/** Allocate frame
  *
  *  @param nic_data     The NIC driver data
@@ -607 +586 @@
 
 /**
- * The busy flag can be set to 1 only in the write_packet handler, to 0 it can
+ * The busy flag can be set to 1 only in the send_frame handler, to 0 it can
  * be set anywhere.
  *
@@ -616 +595 @@
 {
         /*
-         * When the function is called in write_packet handler the main lock is
+         * When the function is called in send_frame handler the main lock is
          * locked so no race can happen.
          * Otherwise, when it is unexpectedly set to 0 (even with main lock held
@@ -635 +614 @@
 {
         /* Note: this function must not lock main lock, because loopback driver
-         *               calls it inside write_packet handler (with locked main lock) */
+         *               calls it inside send_frame handler (with locked main lock) */
         fibril_rwlock_read_lock(&nic_data->rxc_lock);
         nic_frame_type_t frame_type;
@@ -643 +622 @@
         /* Update statistics */
         fibril_rwlock_write_lock(&nic_data->stats_lock);
-        /* Both sending message up and releasing packet are atomic IPC calls */
+
         if (nic_data->state == NIC_STATE_ACTIVE && check) {
                 nic_data->stats.receive_packets++;
@@ -679 +658 @@
 /**
  * This function is to be used only in the loopback driver. It's workaround
- * for the situation when the packet does not contain ethernet address.
+ * for the situation when the frame does not contain ethernet address.
  * The filtering is therefore not applied here.
  *
  * @param nic_data
- * @param packet
- */
-void nic_received_noneth_packet(nic_t *nic_data, packet_t *packet)
+ * @param data          Frame data
+ * @param size          Frame size in bytes
+ */
+void nic_received_noneth_frame(nic_t *nic_data, void *data, size_t size)
 {
         fibril_rwlock_write_lock(&nic_data->stats_lock);
         nic_data->stats.receive_packets++;
-        nic_data->stats.receive_bytes += packet_get_data_length(packet);
+        nic_data->stats.receive_bytes += size;
         fibril_rwlock_write_unlock(&nic_data->stats_lock);
         
         nil_received_msg(nic_data->nil_session, nic_data->device_id,
-            packet_get_data(packet), packet_get_data_length(packet));
-}
-
-/**
- * Some NICs can receive multiple packets during single interrupt. These can
+            data, size);
+}
+
+/**
+ * Some NICs can receive multiple frames during single interrupt. These can
  * send them in whole list of frames (actually nic_frame_t structures), then
- * the list is deallocated and each packet is passed to the
+ * the list is deallocated and each frame is passed to the
  * nic_received_packet function.
  *
@@ -1315 +1295 @@
 }
 
-/** Lock packet for DMA usage
- *
- * @param packet
- * @return physical address of packet
- */
-int nic_dma_lock_packet(packet_t *packet, size_t size, void **phys)
-{
-        return dmamem_map(packet, SIZE2PAGES(size), 0, 0, phys);
-}
-
-/** Unlock packet after DMA usage
- *
- * @param packet
- */
-int nic_dma_unlock_packet(packet_t *packet, size_t size)
-{
-        return dmamem_unmap(packet, size);
-}
-
 /** @}
  */