Changeset 6d8455d in mainline for uspace/drv/nic/rtl8139/driver.c

Timestamp:

2012-01-14T11:07:34Z (12 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.

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (6 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -389 +389 @@
 static int rtl8139_on_activated(nic_t *nic_data);
 static int rtl8139_on_stopped(nic_t *nic_data);
-static void rtl8139_write_packet(nic_t *nic_data, packet_t *packet);
+static void rtl8139_send_frame(nic_t *nic_data, void *data, size_t size);
 
 /** Check if the transmit buffer is busy */
@@ -399 +399 @@
  *
  * @param nic_data  The nic driver data structure
- * @param packet    The packet to send
+ * @param data      Frame data
+ * @param size      Frame size in bytes
  *
  * @return EOK if succeed, error code in the case of error
  */
-static void rtl8139_write_packet(nic_t *nic_data, packet_t *packet)
+static void rtl8139_send_frame(nic_t *nic_data, void *data, size_t size)
 {
         assert(nic_data);
@@ -409 +410 @@
         rtl8139_t *rtl8139 = nic_get_specific(nic_data);
         assert(rtl8139);
-        ddf_msg(LVL_DEBUG, "Sending packet");
-
-        /* Get the packet data and check if it can be send */
-        size_t packet_length = packet_get_data_length(packet);
-        void *packet_data = packet_get_data(packet);
-
-        assert(packet_data);
-
-        if ((packet_length > RTL8139_PACKET_MAX_LENGTH) || !packet_data) {
-                ddf_msg(LVL_ERROR, "Write packet length error: data %p, length %z", 
-                    packet_data, packet_length);
+        ddf_msg(LVL_DEBUG, "Sending frame");
+
+        if (size > RTL8139_PACKET_MAX_LENGTH) {
+                ddf_msg(LVL_ERROR, "Send frame: frame too long, %zu bytes",
+                    size);
                 nic_report_send_error(rtl8139->nic_data, NIC_SEC_OTHER, 1);
                 goto err_size;
         }
 
-        assert((packet_length & TSD_SIZE_MASK) == packet_length);
+        assert((size & TSD_SIZE_MASK) == size);
 
         /* Lock transmitter structure for obtaining next buffer */
@@ -449 +444 @@
         assert(!rtl8139_tbuf_busy(tsd));
 
-        /* Write packet data to the buffer, set the size to TSD and clear OWN bit */
-        memcpy(buf_addr, packet_data, packet_length);
+        /* Write frame data to the buffer, set the size to TSD and clear OWN bit */
+        memcpy(buf_addr, data, size);
 
         /* Set size of the data to send */
         uint32_t tsd_value = pio_read_32(tsd);
-        tsd_value = rtl8139_tsd_set_size(tsd_value, packet_length);
+        tsd_value = rtl8139_tsd_set_size(tsd_value, size);
         pio_write_32(tsd, tsd_value);
 
@@ -462 +457 @@
         tsd_value &= ~(uint32_t)TSD_OWN;
         pio_write_32(tsd, tsd_value);
-        nic_release_packet(nic_data, packet);
         return;
 
 err_busy_no_inc:
 err_size:
-        nic_release_packet(nic_data, packet);
         return;
 };
@@ -1022 +1015 @@
         rtl8139->nic_data = nic_data;
         nic_set_specific(nic_data, rtl8139);
-        nic_set_write_packet_handler(nic_data, rtl8139_write_packet);
+        nic_set_send_frame_handler(nic_data, rtl8139_send_frame);
         nic_set_state_change_handlers(nic_data,
                 rtl8139_on_activated, NULL, rtl8139_on_stopped);