Changeset b7068da in mainline for uspace/drv/nic/ne2k/dp8390.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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/drv/nic/ne2k/dp8390.c (modified) (12 diffs)

uspace/drv/nic/ne2k/dp8390.c

@@ -59 +59 @@
 #include <stdio.h>
 #include <libarch/ddi.h>
-#include <net/packet.h>
-#include <packet_client.h>
 #include "dp8390.h"
 
@@ -76 +74 @@
         uint8_t status;
         
-        /** Pointer to next packet */
+        /** Pointer to next frame */
         uint8_t next;
         
@@ -142 +140 @@
 static void ne2k_upload(ne2k_t *ne2k, void *buf, size_t addr, size_t size)
 {
+        size_t esize_ru = (size + 1) & ~1;
         size_t esize = size & ~1;
         
-        pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff);
-        pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff);
+        pio_write_8(ne2k->port + DP_RBCR0, esize_ru & 0xff);
+        pio_write_8(ne2k->port + DP_RBCR1, (esize_ru >> 8) & 0xff);
         pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff);
         pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff);
@@ -392 +391 @@
         /*
          * Reset the transmit ring. If we were transmitting a frame,
-         * we pretend that the packet is processed. Higher layers will
-         * retransmit if the packet wasn't actually sent.
+         * we pretend that the frame is processed. Higher layers will
+         * retransmit if the frame wasn't actually sent.
          */
         ne2k->sq.dirty = false;
@@ -403 +402 @@
  *
  * @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);
@@ -418 +418 @@
                 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)) {
@@ -427 +425 @@
 
         /* 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;
@@ -437 +435 @@
         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);
 }
 
@@ -451 +446 @@
                 return NULL;
         
-        void *buf = packet_suffix(frame->packet, length);
-        bzero(buf, length);
+        bzero(frame->data, length);
         uint8_t last = page + length / DP_PAGE;
         
@@ -458 +452 @@
                 size_t left = (ne2k->stop_page - page) * DP_PAGE
                     - sizeof(recv_header_t);
-                ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t),
+                ne2k_download(ne2k, frame->data, page * DP_PAGE + sizeof(recv_header_t),
                     left);
-                ne2k_download(ne2k, buf + left, ne2k->start_page * DP_PAGE,
+                ne2k_download(ne2k, frame->data + left, ne2k->start_page * DP_PAGE,
                     length - left);
         } else {
-                ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t),
+                ne2k_download(ne2k, frame->data, page * DP_PAGE + sizeof(recv_header_t),
                     length);
         }
@@ -544 +538 @@
                  * Update the boundary pointer
                  * to the value of the page
-                 * prior to the next packet to
+                 * prior to the next frame to
                  * be processed.
                  */
@@ -587 +581 @@
                 fibril_mutex_lock(&ne2k->sq_mutex);
                 if (ne2k->sq.dirty) {
-                        /* Prepare the buffer for next packet */
+                        /* Prepare the buffer for next frame */
                         ne2k->sq.dirty = false;
                         ne2k->sq.size = 0;