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

Timestamp:

2012-01-19T08:13:45Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8da56b

Parents:

3ea725e

Message:

Remove most use of packet_t from NIC drivers.

File:

• uspace/drv/nic/ne2k/dp8390.c (modified) (7 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;
         
@@ -393 +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;
@@ -448 +446 @@
                 return NULL;
         
-        void *buf = packet_suffix(frame->packet, length);
-        bzero(buf, length);
+        bzero(frame->data, length);
         uint8_t last = page + length / DP_PAGE;
         
@@ -455 +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);
         }
@@ -541 +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.
                  */
@@ -584 +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;