Changeset 6d8455d in mainline for uspace/drv/nic/ne2k

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/drv/nic/ne2k

Files:

• dp8390.c (modified) (4 diffs)
• dp8390.h (modified) (1 diff)
• ne2k.c (modified) (1 diff)

uspace/drv/nic/ne2k/dp8390.c

@@ -404 +404 @@
  *
  * @param[in,out] ne2k   Network interface structure.
- * @param[in]     packet Frame to be sent.
- *
- */
-void ne2k_send(nic_t *nic_data, packet_t *packet)
+ * @param[in]     data   Pointer to frame data
+ * @param[in]     size   Frame size in bytes
+ *
+ */
+void ne2k_send(nic_t *nic_data, void *data, size_t size)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
@@ -419 +420 @@
                 fibril_condvar_wait(&ne2k->sq_cv, &ne2k->sq_mutex);
         }
-        void *buf = packet_get_data(packet);
-        size_t size = packet_get_data_length(packet);
         
         if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) {
@@ -428 +427 @@
 
         /* Upload the frame to the ethernet card */
-        ne2k_upload(ne2k, buf, ne2k->sq.page * DP_PAGE, size);
+        ne2k_upload(ne2k, data, ne2k->sq.page * DP_PAGE, size);
         ne2k->sq.dirty = true;
         ne2k->sq.size = size;
@@ -438 +437 @@
         pio_write_8(ne2k->port + DP_CR, CR_TXP | CR_STA);
         fibril_mutex_unlock(&ne2k->sq_mutex);
-
-        /* Relase packet */
-        nic_release_packet(nic_data, packet);
 }
 

uspace/drv/nic/ne2k/dp8390.h

@@ -262 +262 @@
 extern int ne2k_up(ne2k_t *);
 extern void ne2k_down(ne2k_t *);
-extern void ne2k_send(nic_t *, packet_t *);
+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);

uspace/drv/nic/ne2k/ne2k.c

@@ -343 +343 @@
                 return ENOMEM;
         
-        nic_set_write_packet_handler(nic_data, ne2k_send);
+        nic_set_send_frame_handler(nic_data, ne2k_send);
         nic_set_state_change_handlers(nic_data,
                 ne2k_on_activating, NULL, ne2k_on_stopping);