Changeset a1347a7 in mainline for uspace/drv

Timestamp:

2012-01-15T13:51:09Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

bd79281

Parents:

03e0a244 (diff), f302586 (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

Location:

uspace/drv

Files:

• bus/isa/isa.c (modified) (6 diffs)
• bus/isa/isa.dev (modified) (1 diff)
• bus/usb/usbhid/mouse/mousedev.c (modified) (9 diffs)
• bus/usb/usbhid/mouse/mousedev.h (modified) (2 diffs)
• char/i8042/Makefile (moved) (moved from uspace/srv/hw/char/i8042/Makefile ) (1 diff)
• char/i8042/buffer.h (added)
• char/i8042/i8042.c (added)
• char/i8042/i8042.h (added)
• char/i8042/i8042.ma (added)
• char/i8042/main.c (added)
• char/ps2mouse/Makefile (added)
• char/ps2mouse/chardev.c (added)
• char/ps2mouse/chardev.h (moved) (moved from uspace/srv/hw/char/i8042/i8042.h ) (2 diffs)
• char/ps2mouse/main.c (added)
• char/ps2mouse/ps2mouse.c (added)
• char/ps2mouse/ps2mouse.h (added)
• char/ps2mouse/ps2mouse.ma (added)
• char/xtkbd/Makefile (added)
• char/xtkbd/chardev.c (added)
• char/xtkbd/chardev.h (added)
• char/xtkbd/main.c (added)
• char/xtkbd/xtkbd.c (added)
• char/xtkbd/xtkbd.h (added)
• char/xtkbd/xtkbd.ma (added)
• nic/e1k/e1k.c (modified) (13 diffs)
• nic/lo/lo.c (modified) (2 diffs)
• nic/ne2k/dp8390.c (modified) (4 diffs)
• nic/ne2k/dp8390.h (modified) (1 diff)
• nic/ne2k/ne2k.c (modified) (1 diff)
• nic/rtl8139/driver.c (modified) (6 diffs)

uspace/drv/bus/isa/isa.c

@@ -52 +52 @@
 #include <dirent.h>
 #include <fcntl.h>
+#include <ipc/irc.h>
+#include <ipc/services.h>
+#include <sysinfo.h>
+#include <ns.h>
 #include <sys/stat.h>
 #include <ipc/irc.h>
@@ -109 +113 @@
         sysarg_t apic;
         sysarg_t i8259;
-        
+
         async_sess_t *irc_sess = NULL;
-        
+
         if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
             || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) {
@@ -117 +121 @@
                     SERVICE_IRC, 0, 0);
         }
-        
+
         if (!irc_sess)
                 return false;
-        
+
         assert(isa_fun);
         const hw_resource_list_t *res = &isa_fun->hw_resources;
@@ -127 +131 @@
                 if (res->resources[i].type == INTERRUPT) {
                         const int irq = res->resources[i].res.interrupt.irq;
-                        
+
                         async_exch_t *exch = async_exchange_begin(irc_sess);
                         const int rc =
                             async_req_1_0(exch, IRC_ENABLE_INTERRUPT, irq);
                         async_exchange_end(exch);
-                        
+
                         if (rc != EOK) {
                                 async_hangup(irc_sess);
@@ -139 +143 @@
                 }
         }
-        
+
         async_hangup(irc_sess);
         return true;
@@ -397 +401 @@
 
         val = skip_spaces(val);
-        irq = (int)strtol(val, &end, 0x10);
+        irq = (int)strtol(val, &end, 10);
 
         if (val != end)

uspace/drv/bus/isa/isa.dev

@@ -9 +9 @@
         io_range 2f8 8
 
-keyboard:
-        match 100 isa/keyboard
+i8042:
+        match 100 isa/i8042
         irq 1
-        io_range 060 10
+        irq 12
+        io_range 060 5
+        
 
 ne2k:

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -52 +52 @@
 #include "../usbhid.h"
 
-/** Number of simulated arrow-key presses for singel wheel step. */
-#define ARROWS_PER_SINGLE_WHEEL 3
-
 #define NAME "mouse"
 
@@ -69 +66 @@
 
 const char *HID_MOUSE_FUN_NAME = "mouse";
-const char *HID_MOUSE_WHEEL_FUN_NAME = "mouse-wheel";
 const char *HID_MOUSE_CATEGORY = "mouse";
-const char *HID_MOUSE_WHEEL_CATEGORY = "keyboard";
 
 /** Default idle rate for mouses. */
@@ -126 +121 @@
 
         usb_log_debug("%s: fun->name: %s\n", __FUNCTION__, fun->name);
-        usb_log_debug("%s: mouse_sess: %p, wheel_sess: %p\n",
-            __FUNCTION__, mouse_dev->mouse_sess, mouse_dev->wheel_sess);
-
-        async_sess_t **sess_ptr = (fun == mouse_dev->mouse_fun) ?
-            &mouse_dev->mouse_sess : &mouse_dev->wheel_sess;
+        usb_log_debug("%s: mouse_sess: %p\n",
+            __FUNCTION__, mouse_dev->mouse_sess);
 
         async_sess_t *sess =
             async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
         if (sess != NULL) {
-                if (*sess_ptr == NULL) {
-                        *sess_ptr = sess;
+                if (mouse_dev->mouse_sess == NULL) {
+                        mouse_dev->mouse_sess = sess;
                         usb_log_debug("Console session to %s set ok (%p).\n",
                             fun->name, sess);
@@ -144 +136 @@
                             fun->name);
                         async_answer_0(icallid, ELIMIT);
+                        async_hangup(sess);
                 }
         } else {
@@ -150 +143 @@
         }
 }
-
-/*----------------------------------------------------------------------------*/
-
-static void usb_mouse_send_wheel(const usb_mouse_t *mouse_dev, int wheel)
-{
-        unsigned int key = (wheel > 0) ? KC_UP : KC_DOWN;
-
-        if (mouse_dev->wheel_sess == NULL) {
-                usb_log_warning(
-                    "Connection to console not ready, wheel roll discarded.\n");
-                return;
-        }
-
-        const unsigned count =
-            ((wheel < 0) ? -wheel : wheel) * ARROWS_PER_SINGLE_WHEEL;
-        for (unsigned i = 0; i < count; i++) {
-                /* Send arrow press and release. */
-                usb_log_debug2("Sending key %d to the console\n", key);
-                
-                async_exch_t *exch = async_exchange_begin(mouse_dev->wheel_sess);
-                
-                async_msg_4(exch, KBDEV_EVENT, KEY_PRESS, key, 0, 0);
-                async_msg_4(exch, KBDEV_EVENT, KEY_RELEASE, key, 0, 0);
-                
-                async_exchange_end(exch);
-        }
-}
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
 static int get_mouse_axis_move_value(uint8_t rid, usb_hid_report_t *report,
     int32_t usage)
@@ -203 +167 @@
         return result;
 }
-
+/*----------------------------------------------------------------------------*/
 static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev,
     usb_mouse_t *mouse_dev)
@@ -221 +185 @@
             &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
 
-        if ((shift_x != 0) || (shift_y != 0)) {
+        if (shift_x || shift_y || wheel) {
                 async_exch_t *exch =
                     async_exchange_begin(mouse_dev->mouse_sess);
                 if (exch != NULL) {
-                        async_req_2_0(exch, MOUSEEV_MOVE_EVENT, shift_x, shift_y);
+                        async_msg_3(exch, MOUSEEV_MOVE_EVENT,
+                            shift_x, shift_y, wheel);
                         async_exchange_end(exch);
                 }
         }
-
-        if (wheel != 0)
-                usb_mouse_send_wheel(mouse_dev, wheel);
 
         /* Buttons */
@@ -341 +303 @@
         mouse->mouse_fun = fun;
 
-        /*
-         * Special function for acting as keyboard (wheel)
-         */
-        usb_log_debug("Creating DDF function %s...\n",
-                      HID_MOUSE_WHEEL_FUN_NAME);
-        fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed,
-            HID_MOUSE_WHEEL_FUN_NAME);
-        if (fun == NULL) {
-                usb_log_error("Could not create DDF function node `%s'.\n",
-                    HID_MOUSE_WHEEL_FUN_NAME);
-                FUN_UNBIND_DESTROY(mouse->mouse_fun);
-                mouse->mouse_fun = NULL;
-                return ENOMEM;
-        }
-
-        /*
-         * Store the initialized HID device and HID ops
-         * to the DDF function.
-         */
-        fun->ops = &mouse->ops;
-        fun->driver_data = mouse;
-
-        rc = ddf_fun_bind(fun);
-        if (rc != EOK) {
-                usb_log_error("Could not bind DDF function `%s': %s.\n",
-                    fun->name, str_error(rc));
-                FUN_UNBIND_DESTROY(mouse->mouse_fun);
-                mouse->mouse_fun = NULL;
-
-                fun->driver_data = NULL;
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-
-        usb_log_debug("Adding DDF function to category %s...\n", 
-            HID_MOUSE_WHEEL_CATEGORY);
-        rc = ddf_fun_add_to_category(fun, HID_MOUSE_WHEEL_CATEGORY);
-        if (rc != EOK) {
-                usb_log_error(
-                    "Could not add DDF function to category %s: %s.\n",
-                    HID_MOUSE_WHEEL_CATEGORY, str_error(rc));
-
-                FUN_UNBIND_DESTROY(mouse->mouse_fun);
-                mouse->mouse_fun = NULL;
-                FUN_UNBIND_DESTROY(fun);
-                return rc;
-        }
-        mouse->wheel_fun = fun;
-
         return EOK;
 }
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
 /** Get highest index of a button mentioned in given report.
  *
@@ -516 +427 @@
         }
 
-        if (mouse_dev->wheel_sess != NULL) {
-                const int ret = async_hangup(mouse_dev->wheel_sess);
-                if (ret != EOK)
-                        usb_log_warning("Failed to hang up wheel session: "
-                            "%p, %s.\n", mouse_dev->wheel_sess, str_error(ret));
-        }
-
         FUN_UNBIND_DESTROY(mouse_dev->mouse_fun);
-        FUN_UNBIND_DESTROY(mouse_dev->wheel_fun);
 
         free(mouse_dev->buttons);

uspace/drv/bus/usb/usbhid/mouse/mousedev.h

@@ -48 +48 @@
         /** IPC session to console (consumer). */
         async_sess_t *mouse_sess;
-        async_sess_t *wheel_sess;
 
         /* Mouse buttons statuses. */
@@ -57 +56 @@
         /* DDF mouse function */
         ddf_fun_t *mouse_fun;
-        /* DDF mouse function */
-        ddf_fun_t *wheel_fun;
 } usb_mouse_t;
 

uspace/drv/char/i8042/Makefile

@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../../../..
+USPACE_PREFIX = ../../..
+LIBS = $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
 BINARY = i8042
 
 SOURCES = \
-        i8042.c
+        i8042.c \
+        main.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/char/ps2mouse/chardev.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/** @addtogroup kbd_port
- * @ingroup  kbd
+/** @addtogroup drvmouse
  * @{
  */
-
 /** @file
- * @brief i8042 port driver.
+ * @brief ps/2 mouse driver.
  */
 
-#ifndef i8042_H_
-#define i8042_H_
+#ifndef _CHARDEV_H_
+#define _CHARDEV_H_
 
-#include <sys/types.h>
-#include <libarch/ddi.h>
+#include <libarch/types.h>
 #include <async.h>
 
-/** i8042 HW I/O interface */
-struct i8042 {
-        ioport8_t data;
-        uint8_t pad[3];
-        ioport8_t status;
-} __attribute__ ((packed));
-typedef struct i8042 i8042_t;
-
-/** Softstate structure, one for each serial port (primary and aux). */
-typedef struct {
-        service_id_t service_id;
-        async_sess_t *client_sess;
-} i8042_port_t;
+ssize_t chardev_read(async_exch_t *, void *, size_t);
+ssize_t chardev_write(async_exch_t *, const void *, size_t);
 
 #endif
-
 /**
  * @}

uspace/drv/nic/e1k/e1k.c

@@ -67 +67 @@
 #define E1000_RECEIVE_ADDRESS  16
 
+/** Maximum sending packet size */
+#define E1000_MAX_SEND_FRAME_SIZE  2048
 /** Maximum receiving packet size */
 #define E1000_MAX_RECEIVE_PACKET_SIZE  2048
@@ -125 +127 @@
         void *tx_ring_virt;
         
-        /** Packets in tx ring  */
-        packet_t **tx_ring_packets;
+        /** Ring of TX frames, physical address */
+        void **tx_frame_phys;
+        /** Ring of TX frames, virtual address */
+        void **tx_frame_virt;
         
         /** Physical rx ring address */
@@ -223 +227 @@
 static int e1000_on_activating(nic_t *);
 static int e1000_on_stopping(nic_t *);
-static void e1000_write_packet(nic_t *, packet_t *);
+static void e1000_send_frame(nic_t *, void *, size_t);
 
 /** Commands to deal with interrupt
@@ -1126 +1130 @@
             (e1000->tx_ring_virt + offset * sizeof(e1000_tx_descriptor_t));
         
-        if (tx_descriptor->length) {
-                packet_t *old_packet = *(e1000->tx_ring_packets + offset);
-                if (old_packet)
-                        nic_release_packet(nic, old_packet);
-        }
-        
         tx_descriptor->phys_addr = 0;
         tx_descriptor->length = 0;
@@ -1522 +1520 @@
 static int e1000_initialize_tx_structure(e1000_t *e1000)
 {
+        size_t i;
+        
         fibril_mutex_lock(&e1000->tx_lock);
+        
+        e1000->tx_ring_phys = NULL;
+        e1000->tx_ring_virt = NULL;
+        e1000->tx_frame_phys = NULL;
+        e1000->tx_frame_virt = NULL;
         
         int rc = dmamem_map_anonymous(
@@ -1529 +1534 @@
             &e1000->tx_ring_virt);
         if (rc != EOK)
-                return rc;
+                goto error;
         
         bzero(e1000->tx_ring_virt,
             E1000_TX_PACKETS_COUNT * sizeof(e1000_tx_descriptor_t));
+        
+        e1000->tx_frame_phys = calloc(E1000_TX_PACKETS_COUNT, sizeof(void *));
+        e1000->tx_frame_virt = calloc(E1000_TX_PACKETS_COUNT, sizeof(void *));
+
+        if (e1000->tx_frame_phys == NULL || e1000->tx_frame_virt == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+        
+        for (i = 0; i < E1000_TX_PACKETS_COUNT; i++) {
+                rc = dmamem_map_anonymous(
+                    E1000_MAX_SEND_FRAME_SIZE, AS_AREA_READ | AS_AREA_WRITE,
+                    0, &e1000->tx_frame_phys[i], &e1000->tx_frame_virt[i]);
+                if (rc != EOK)
+                        goto error;
+        }
         
         E1000_REG_WRITE(e1000, E1000_TDBAH,
@@ -1539 +1560 @@
             (uint32_t) PTR_TO_U64(e1000->tx_ring_phys));
         
-        e1000->tx_ring_packets =
-            malloc(E1000_TX_PACKETS_COUNT * sizeof(packet_t *));
-        // FIXME: Check return value
-        
         e1000_initialize_tx_registers(e1000);
         
         fibril_mutex_unlock(&e1000->tx_lock);
         return EOK;
+        
+error:
+        if (e1000->tx_ring_virt != NULL) {
+                dmamem_unmap_anonymous(e1000->tx_ring_virt);
+                e1000->tx_ring_virt = NULL;
+        }
+        
+        if (e1000->tx_frame_phys != NULL && e1000->tx_frame_virt != NULL) {
+                for (i = 0; i < E1000_TX_PACKETS_COUNT; i++) {
+                        if (e1000->tx_frame_virt[i] != NULL) {
+                                dmamem_unmap_anonymous(e1000->tx_frame_virt[i]);
+                                e1000->tx_frame_virt[i] = NULL;
+                                e1000->tx_frame_phys[i] = NULL;
+                        }
+                }
+        }
+        
+        if (e1000->tx_frame_phys != NULL) {
+                free(e1000->tx_frame_phys);
+                e1000->tx_frame_phys = NULL;
+        }
+        
+        if (e1000->tx_frame_virt != NULL) {
+                free(e1000->tx_frame_virt);
+                e1000->tx_frame_phys = NULL;
+        }
+        
+        return rc;
 }
 
@@ -1556 +1601 @@
 static void e1000_uninitialize_tx_structure(e1000_t *e1000)
 {
-        free(e1000->tx_ring_packets);
+        size_t i;
+        
+        for (i = 0; i < E1000_TX_PACKETS_COUNT; i++) {
+                dmamem_unmap_anonymous(e1000->tx_frame_virt[i]);
+                e1000->tx_frame_virt[i] = NULL;
+                e1000->tx_frame_phys[i] = NULL;
+        }
+        
+        if (e1000->tx_frame_phys != NULL) {
+                free(e1000->tx_frame_phys);
+                e1000->tx_frame_phys = NULL;
+        }
+        
+        if (e1000->tx_frame_virt != NULL) {
+                free(e1000->tx_frame_virt);
+                e1000->tx_frame_phys = NULL;
+        }
         dmamem_unmap_anonymous(e1000->tx_ring_virt);
 }
@@ -1771 +1832 @@
         
         nic_set_specific(nic, e1000);
-        nic_set_write_packet_handler(nic, e1000_write_packet);
+        nic_set_send_frame_handler(nic, e1000_send_frame);
         nic_set_state_change_handlers(nic, e1000_on_activating,
             e1000_on_down, e1000_on_stopping);
@@ -2190 +2251 @@
 }
 
-/** Send packet
+/** Send frame
  *
  * @param nic    NIC driver data structure
- * @param packet Packet to send
+ * @param data   Frame data
+ * @param size   Frame size in bytes
  *
  * @return EOK if succeed
@@ -2199 +2261 @@
  *
  */
-static void e1000_write_packet(nic_t *nic, packet_t *packet)
+static void e1000_send_frame(nic_t *nic, void *data, size_t size)
 {
         assert(nic);
@@ -2217 +2279 @@
         
         /* Descriptor done */
-        if (tx_descriptor_addr->status & TXDESCRIPTOR_STATUS_DD) {
+        if (tx_descriptor_addr->status & TXDESCRIPTOR_STATUS_DD)
                 descriptor_available = true;
-                packet_t *old_packet = *(e1000->tx_ring_packets + tdt);
-                if (old_packet) {
-                        size_t old_packet_size = packet_get_data_length(old_packet);
-                        nic_dma_unlock_packet(old_packet, old_packet_size);
-                        nic_release_packet(nic, old_packet);
-                }
-        }
         
         if (!descriptor_available) {
@@ -2233 +2288 @@
         }
         
-        size_t packet_size = packet_get_data_length(packet);
-        
-        void *phys;
-        int rc = nic_dma_lock_packet(packet, packet_size, &phys);
-        if (rc != EOK) {
-                fibril_mutex_unlock(&e1000->tx_lock);
-                return;
-        }
-        
-        *(e1000->tx_ring_packets + tdt) = packet;
-        
-        tx_descriptor_addr->phys_addr =
-            PTR_TO_U64(phys + packet->data_start);
-        tx_descriptor_addr->length = packet_size;
+        memcpy(e1000->tx_frame_virt[tdt], data, size);
+        
+        tx_descriptor_addr->phys_addr = PTR_TO_U64(e1000->tx_frame_phys[tdt]);
+        tx_descriptor_addr->length = size;
         
         /*

uspace/drv/nic/lo/lo.c

@@ -59 +59 @@
 };
 
-static void lo_write_packet(nic_t *nic_data, packet_t *packet)
+static void lo_send_frame(nic_t *nic_data, void *data, size_t size)
 {
-        nic_report_send_ok(nic_data, 1, packet_get_data_length(packet));
+        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);
 }
@@ -88 +99 @@
         
         dev->driver_data = nic_data;
-        nic_set_write_packet_handler(nic_data, lo_write_packet);
+        nic_set_send_frame_handler(nic_data, lo_send_frame);
         
         int rc = nic_connect_to_services(nic_data);

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);

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);