Index: uspace/drv/nic/e1k/e1k.c =================================================================== --- uspace/drv/nic/e1k/e1k.c (revision 6d8455d96fd6cd160666aef7ea55519828d14f42) +++ uspace/drv/nic/e1k/e1k.c (revision 1bc35b5107055e337dd8c8f42e37c47db3ecb6f5) @@ -52,7 +52,4 @@ #include #include -#include -#include -#include #include "e1k.h" @@ -62,13 +59,13 @@ /* Must be power of 8 */ -#define E1000_RX_PACKETS_COUNT 128 -#define E1000_TX_PACKETS_COUNT 128 +#define E1000_RX_FRAME_COUNT 128 +#define E1000_TX_FRAME_COUNT 128 #define E1000_RECEIVE_ADDRESS 16 -/** Maximum sending packet size */ +/** Maximum sending frame size */ #define E1000_MAX_SEND_FRAME_SIZE 2048 -/** Maximum receiving packet size */ -#define E1000_MAX_RECEIVE_PACKET_SIZE 2048 +/** Maximum receiving frmae size */ +#define E1000_MAX_RECEIVE_FRAME_SIZE 2048 /** nic_driver_data_t* -> e1000_t* cast */ @@ -137,11 +134,13 @@ void *rx_ring_virt; - /** Packets in rx ring */ - packet_t **rx_ring_packets; + /** Ring of RX frames, physical address */ + void **rx_frame_phys; + /** Ring of RX frames, virtual address */ + void **rx_frame_virt; /** VLAN tag */ uint16_t vlan_tag; - /** Add VLAN tag to packet */ + /** Add VLAN tag to frame */ bool vlan_tag_add; @@ -477,5 +476,5 @@ } -/** Get state of acceptance of weird packets +/** Get state of acceptance of weird frames * * @param device Device to check @@ -495,5 +494,5 @@ }; -/** Set acceptance of weird packets +/** Set acceptance of weird frames * * @param device Device to update @@ -679,5 +678,5 @@ } -/** Disable receiving packets for default address +/** Disable receiving frames for default address * * @param e1000 E1000 data structure @@ -691,5 +690,5 @@ } -/** Enable receiving packets for default address +/** Enable receiving frames for default address * * @param e1000 E1000 data structure @@ -751,5 +750,5 @@ } -/** Enable accepting of broadcast packets +/** Enable accepting of broadcast frames * * @param e1000 E1000 data structure @@ -763,5 +762,5 @@ } -/** Disable accepting of broadcast packets +/** Disable accepting of broadcast frames * * @param e1000 E1000 data structure @@ -799,5 +798,5 @@ } -/** Set multicast packets acceptance mode +/** Set multicast frames acceptance mode * * @param nic NIC device to update @@ -853,5 +852,5 @@ } -/** Set unicast packets acceptance mode +/** Set unicast frames acceptance mode * * @param nic NIC device to update @@ -911,5 +910,5 @@ } -/** Set broadcast packets acceptance mode +/** Set broadcast frames acceptance mode * * @param nic NIC device to update @@ -996,5 +995,5 @@ if (vlan_mask) { /* - * Disable receiving, so that packet matching + * Disable receiving, so that frame matching * partially written VLAN is not received. */ @@ -1063,7 +1062,7 @@ } -/** Fill receive descriptor with new empty packet - * - * Store packet in e1000->rx_ring_packets +/** Fill receive descriptor with new empty buffer + * + * Store frame in e1000->rx_frame_phys * * @param nic NIC data stricture @@ -1074,22 +1073,9 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - packet_t *packet = - nic_alloc_packet(nic, E1000_MAX_RECEIVE_PACKET_SIZE); - - assert(packet); - - *(e1000->rx_ring_packets + offset) = packet; + e1000_rx_descriptor_t *rx_descriptor = (e1000_rx_descriptor_t *) (e1000->rx_ring_virt + offset * sizeof(e1000_rx_descriptor_t)); - void *phys; - int rc = - nic_dma_lock_packet(packet, E1000_MAX_RECEIVE_PACKET_SIZE, &phys); - - if (rc == EOK) - rx_descriptor->phys_addr = PTR_TO_U64(phys + packet->data_start); - else - rx_descriptor->phys_addr = 0; - + rx_descriptor->phys_addr = PTR_TO_U64(e1000->rx_frame_phys[offset]); rx_descriptor->length = 0; rx_descriptor->checksum = 0; @@ -1155,10 +1141,10 @@ } -/** Receive packets +/** Receive frames * * @param nic NIC data * */ -static void e1000_receive_packets(nic_t *nic) +static void e1000_receive_frames(nic_t *nic) { e1000_t *e1000 = DRIVER_DATA_NIC(nic); @@ -1167,5 +1153,5 @@ uint32_t *tail_addr = E1000_REG_ADDR(e1000, E1000_RDT); - uint32_t next_tail = e1000_inc_tail(*tail_addr, E1000_RX_PACKETS_COUNT); + uint32_t next_tail = e1000_inc_tail(*tail_addr, E1000_RX_FRAME_COUNT); e1000_rx_descriptor_t *rx_descriptor = (e1000_rx_descriptor_t *) @@ -1173,16 +1159,18 @@ while (rx_descriptor->status & 0x01) { - uint32_t packet_size = rx_descriptor->length - E1000_CRC_SIZE; + uint32_t frame_size = rx_descriptor->length - E1000_CRC_SIZE; - packet_t *packet = *(e1000->rx_ring_packets + next_tail); - packet_suffix(packet, packet_size); - - nic_dma_unlock_packet(packet, E1000_MAX_RECEIVE_PACKET_SIZE); - nic_received_packet(nic, packet); + nic_frame_t *frame = nic_alloc_frame(nic, frame_size); + if (frame != NULL) { + memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size); + nic_received_frame(nic, frame); + } else { + ddf_msg(LVL_ERROR, "Memory allocation failed. Frame dropped."); + } e1000_fill_new_rx_descriptor(nic, next_tail); - *tail_addr = e1000_inc_tail(*tail_addr, E1000_RX_PACKETS_COUNT); - next_tail = e1000_inc_tail(*tail_addr, E1000_RX_PACKETS_COUNT); + *tail_addr = e1000_inc_tail(*tail_addr, E1000_RX_FRAME_COUNT); + next_tail = e1000_inc_tail(*tail_addr, E1000_RX_FRAME_COUNT); rx_descriptor = (e1000_rx_descriptor_t *) @@ -1225,5 +1213,5 @@ { if (icr & ICR_RXT0) - e1000_receive_packets(nic); + e1000_receive_frames(nic); } @@ -1274,5 +1262,5 @@ } -/** Force receiving all packets in the receive buffer +/** Force receiving all frames in the receive buffer * * @param nic NIC data @@ -1347,9 +1335,9 @@ static void e1000_initialize_rx_registers(e1000_t *e1000) { - E1000_REG_WRITE(e1000, E1000_RDLEN, E1000_RX_PACKETS_COUNT * 16); + E1000_REG_WRITE(e1000, E1000_RDLEN, E1000_RX_FRAME_COUNT * 16); E1000_REG_WRITE(e1000, E1000_RDH, 0); /* It is not posible to let HW use all descriptors */ - E1000_REG_WRITE(e1000, E1000_RDT, E1000_RX_PACKETS_COUNT - 1); + E1000_REG_WRITE(e1000, E1000_RDT, E1000_RX_FRAME_COUNT - 1); /* Set Broadcast Enable Bit */ @@ -1371,5 +1359,5 @@ int rc = dmamem_map_anonymous( - E1000_RX_PACKETS_COUNT * sizeof(e1000_rx_descriptor_t), + E1000_RX_FRAME_COUNT * sizeof(e1000_rx_descriptor_t), AS_AREA_READ | AS_AREA_WRITE, 0, &e1000->rx_ring_phys, &e1000->rx_ring_virt); @@ -1382,52 +1370,88 @@ (uint32_t) PTR_TO_U64(e1000->rx_ring_phys)); - e1000->rx_ring_packets = - malloc(E1000_RX_PACKETS_COUNT * sizeof(packet_t *)); - // FIXME: Check return value - + e1000->rx_frame_phys = + calloc(E1000_RX_FRAME_COUNT, sizeof(void *)); + e1000->rx_frame_virt = + calloc(E1000_RX_FRAME_COUNT, sizeof(void *)); + if (e1000->rx_frame_phys == NULL || e1000->rx_frame_virt == NULL) { + rc = ENOMEM; + goto error; + } + + size_t i; + void *frame_virt; + void *frame_phys; + + for (i = 0; i < E1000_RX_FRAME_COUNT; i++) { + rc = dmamem_map_anonymous( + E1000_MAX_SEND_FRAME_SIZE, AS_AREA_READ | AS_AREA_WRITE, + 0, &frame_phys, &frame_virt); + if (rc != EOK) + goto error; + + e1000->rx_frame_virt[i] = frame_virt; + e1000->rx_frame_phys[i] = frame_phys; + } + + /* Write descriptor */ + for (i = 0; i < E1000_RX_FRAME_COUNT; i++) + e1000_fill_new_rx_descriptor(nic, i); + + e1000_initialize_rx_registers(e1000); + + fibril_mutex_unlock(&e1000->rx_lock); + return EOK; +error: + for (i = 0; i < E1000_RX_FRAME_COUNT; i++) { + if (e1000->rx_frame_virt[i] != NULL) { + dmamem_unmap_anonymous(e1000->rx_frame_virt[i]); + e1000->rx_frame_virt[i] = NULL; + e1000->rx_frame_phys[i] = NULL; + } + } + if (e1000->rx_frame_phys != NULL) { + free(e1000->rx_frame_phys); + e1000->rx_frame_phys = NULL; + } + if (e1000->rx_frame_virt != NULL) { + free(e1000->rx_frame_virt); + e1000->rx_frame_phys = NULL; + } + return rc; +} + +/** Uninitialize receive structure + * + * @param nic NIC data + * + */ +static void e1000_uninitialize_rx_structure(nic_t *nic) +{ + e1000_t *e1000 = DRIVER_DATA_NIC(nic); + + /* Write descriptor */ + for (unsigned int offset = 0; offset < E1000_RX_FRAME_COUNT; offset++) { + dmamem_unmap_anonymous(e1000->rx_frame_virt[offset]); + e1000->rx_frame_virt[offset] = NULL; + e1000->rx_frame_phys[offset] = NULL; + } + + free(e1000->rx_frame_virt); + free(e1000->rx_frame_phys); + e1000->rx_frame_virt = NULL; + e1000->rx_frame_phys = NULL; + dmamem_unmap_anonymous(e1000->rx_ring_virt); +} + +/** Clear receive descriptor ring + * + * @param e1000 E1000 data + * + */ +static void e1000_clear_rx_ring(e1000_t *e1000) +{ /* Write descriptor */ for (unsigned int offset = 0; - offset < E1000_RX_PACKETS_COUNT; - offset++) - e1000_fill_new_rx_descriptor(nic, offset); - - e1000_initialize_rx_registers(e1000); - - fibril_mutex_unlock(&e1000->rx_lock); - return EOK; -} - -/** Uninitialize receive structure - * - * @param nic NIC data - * - */ -static void e1000_uninitialize_rx_structure(nic_t *nic) -{ - e1000_t *e1000 = DRIVER_DATA_NIC(nic); - - /* Write descriptor */ - for (unsigned int offset = 0; - offset < E1000_RX_PACKETS_COUNT; - offset++) { - packet_t *packet = *(e1000->rx_ring_packets + offset); - nic_dma_unlock_packet(packet, E1000_MAX_RECEIVE_PACKET_SIZE); - nic_release_packet(nic, packet); - } - - free(e1000->rx_ring_packets); - dmamem_unmap_anonymous(e1000->rx_ring_virt); -} - -/** Clear receive descriptor ring - * - * @param e1000 E1000 data - * - */ -static void e1000_clear_rx_ring(e1000_t *e1000) -{ - /* Write descriptor */ - for (unsigned int offset = 0; - offset < E1000_RX_PACKETS_COUNT; + offset < E1000_RX_FRAME_COUNT; offset++) e1000_clear_rx_descriptor(e1000, offset); @@ -1498,5 +1522,5 @@ static void e1000_initialize_tx_registers(e1000_t *e1000) { - E1000_REG_WRITE(e1000, E1000_TDLEN, E1000_TX_PACKETS_COUNT * 16); + E1000_REG_WRITE(e1000, E1000_TDLEN, E1000_TX_FRAME_COUNT * 16); E1000_REG_WRITE(e1000, E1000_TDH, 0); E1000_REG_WRITE(e1000, E1000_TDT, 0); @@ -1530,5 +1554,5 @@ int rc = dmamem_map_anonymous( - E1000_TX_PACKETS_COUNT * sizeof(e1000_tx_descriptor_t), + E1000_TX_FRAME_COUNT * sizeof(e1000_tx_descriptor_t), AS_AREA_READ | AS_AREA_WRITE, 0, &e1000->tx_ring_phys, &e1000->tx_ring_virt); @@ -1537,8 +1561,8 @@ 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 *)); + E1000_TX_FRAME_COUNT * sizeof(e1000_tx_descriptor_t)); + + e1000->tx_frame_phys = calloc(E1000_TX_FRAME_COUNT, sizeof(void *)); + e1000->tx_frame_virt = calloc(E1000_TX_FRAME_COUNT, sizeof(void *)); if (e1000->tx_frame_phys == NULL || e1000->tx_frame_virt == NULL) { @@ -1547,5 +1571,5 @@ } - for (i = 0; i < E1000_TX_PACKETS_COUNT; i++) { + for (i = 0; i < E1000_TX_FRAME_COUNT; i++) { rc = dmamem_map_anonymous( E1000_MAX_SEND_FRAME_SIZE, AS_AREA_READ | AS_AREA_WRITE, @@ -1572,5 +1596,5 @@ if (e1000->tx_frame_phys != NULL && e1000->tx_frame_virt != NULL) { - for (i = 0; i < E1000_TX_PACKETS_COUNT; i++) { + for (i = 0; i < E1000_TX_FRAME_COUNT; i++) { if (e1000->tx_frame_virt[i] != NULL) { dmamem_unmap_anonymous(e1000->tx_frame_virt[i]); @@ -1603,5 +1627,5 @@ size_t i; - for (i = 0; i < E1000_TX_PACKETS_COUNT; i++) { + for (i = 0; i < E1000_TX_FRAME_COUNT; i++) { dmamem_unmap_anonymous(e1000->tx_frame_virt[i]); e1000->tx_frame_virt[i] = NULL; @@ -1630,5 +1654,5 @@ /* Write descriptor */ for (unsigned int offset = 0; - offset < E1000_TX_PACKETS_COUNT; + offset < E1000_TX_FRAME_COUNT; offset++) e1000_clear_tx_descriptor(nic, offset); @@ -1687,5 +1711,5 @@ } -/** Activate the device to receive and transmit packets +/** Activate the device to receive and transmit frames * * @param nic NIC driver data @@ -2283,5 +2307,5 @@ if (!descriptor_available) { - /* Packet lost */ + /* Frame lost */ fibril_mutex_unlock(&e1000->tx_lock); return; @@ -2312,5 +2336,5 @@ tdt++; - if (tdt == E1000_TX_PACKETS_COUNT) + if (tdt == E1000_TX_FRAME_COUNT) tdt = 0; Index: uspace/drv/nic/e1k/e1k.h =================================================================== --- uspace/drv/nic/e1k/e1k.h (revision 6d8455d96fd6cd160666aef7ea55519828d14f42) +++ uspace/drv/nic/e1k/e1k.h (revision 1bc35b5107055e337dd8c8f42e37c47db3ecb6f5) @@ -39,5 +39,5 @@ #include -/** Ethernet CRC size after packet received in rx_descriptor */ +/** Ethernet CRC size after frame received in rx_descriptor */ #define E1000_CRC_SIZE 4 @@ -109,5 +109,5 @@ /** Transmit descriptor COMMAND field bits */ typedef enum { - TXDESCRIPTOR_COMMAND_VLE = (1 << 6), /**< VLAN Packet Enable */ + TXDESCRIPTOR_COMMAND_VLE = (1 << 6), /**< VLAN frame Enable */ TXDESCRIPTOR_COMMAND_RS = (1 << 3), /**< Report Status */ TXDESCRIPTOR_COMMAND_IFCS = (1 << 1), /**< Insert FCS */ Index: uspace/drv/nic/ne2k/dp8390.c =================================================================== --- uspace/drv/nic/ne2k/dp8390.c (revision 6d8455d96fd6cd160666aef7ea55519828d14f42) +++ uspace/drv/nic/ne2k/dp8390.c (revision 1bc35b5107055e337dd8c8f42e37c47db3ecb6f5) @@ -59,6 +59,4 @@ #include #include -#include -#include #include "dp8390.h" @@ -76,5 +74,5 @@ uint8_t status; - /** Pointer to next packet */ + /** Pointer to next frame */ uint8_t next; @@ -393,6 +391,6 @@ /* * 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,6 +446,5 @@ return NULL; - void *buf = packet_suffix(frame->packet, length); - bzero(buf, length); + bzero(frame->data, length); uint8_t last = page + length / DP_PAGE; @@ -455,10 +452,10 @@ 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,5 +538,5 @@ * 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,5 +581,5 @@ 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; Index: uspace/drv/nic/ne2k/ne2k.c =================================================================== --- uspace/drv/nic/ne2k/ne2k.c (revision 6d8455d96fd6cd160666aef7ea55519828d14f42) +++ uspace/drv/nic/ne2k/ne2k.c (revision 1bc35b5107055e337dd8c8f42e37c47db3ecb6f5) @@ -261,5 +261,5 @@ /* Note: some frame with previous physical address may slip to NIL here * (for a moment the filtering is not exact), but ethernet should be OK with - * that. Some packet may also be lost, but this is not a problem. + * that. Some frames may also be lost, but this is not a problem. */ ne2k_set_physical_address((ne2k_t *) nic_get_specific(nic_data), address); Index: uspace/drv/nic/rtl8139/defs.h =================================================================== --- uspace/drv/nic/rtl8139/defs.h (revision 6d8455d96fd6cd160666aef7ea55519828d14f42) +++ uspace/drv/nic/rtl8139/defs.h (revision 1bc35b5107055e337dd8c8f42e37c47db3ecb6f5) @@ -42,8 +42,8 @@ #define RTL8139_IO_SIZE 256 -/** The maximal transmitted packet length in bytes allowed according to RTL8139 +/** The maximal transmitted frame length in bytes allowed according to RTL8139 * documentation (see SIZE part of TSD documentation) */ -#define RTL8139_PACKET_MAX_LENGTH 1792 +#define RTL8139_FRAME_MAX_LENGTH 1792 @@ -94,5 +94,5 @@ CR = 0x37, /**< Command register, 1b */ - CAPR = 0x38, /**< Current address of packet read, 2b */ + CAPR = 0x38, /**< Current address of frame read, 2b */ CBA = 0x3a, /**< Current buffer address, 2b */ @@ -282,5 +282,5 @@ RCR_MulERINT = 1 << 17, /**< Multiple early interrupt select */ - /** Minimal error packet length (1 = 8B, 0 = 64B). If AER/AR is set, RER8 + /** Minimal error frame length (1 = 8B, 0 = 64B). If AER/AR is set, RER8 * is "Don't care" */ @@ -302,10 +302,10 @@ RCR_WRAP = 1 << 7, /**< Rx buffer wrapped */ - RCR_ACCEPT_ERROR = 1 << 5, /**< Accept error packet */ - RCR_ACCEPT_RUNT = 1 << 4, /**< Accept Runt (8-64 bytes) packets */ + RCR_ACCEPT_ERROR = 1 << 5, /**< Accept error frame */ + RCR_ACCEPT_RUNT = 1 << 4, /**< Accept Runt (8-64 bytes) frames */ RCR_ACCEPT_BROADCAST = 1 << 3, /**< Accept broadcast */ RCR_ACCEPT_MULTICAST = 1 << 2, /**< Accept multicast */ RCR_ACCEPT_PHYS_MATCH = 1 << 1, /**< Accept device MAC address match */ - RCR_ACCEPT_ALL_PHYS = 1 << 0, /**< Accept all packets with + RCR_ACCEPT_ALL_PHYS = 1 << 0, /**< Accept all frames with * phys. desticnation */ @@ -362,5 +362,5 @@ ANAR_ACK = (1 << 14), /**< Capability reception acknowledge */ ANAR_REMOTE_FAULT = (1 << 13), /**< Remote fault detection capability */ - ANAR_PAUSE = (1 << 10), /**< Symetric pause packet capability */ + ANAR_PAUSE = (1 << 10), /**< Symetric pause frame capability */ ANAR_100T4 = (1 << 9), /**< T4, not supported by the device */ ANAR_100TX_FD = (1 << 8), /**< 100BASE_TX full duplex */ @@ -399,5 +399,5 @@ CONFIG3_GNT_SELECT = (1 << 7), /**< Gnt select */ CONFIG3_PARM_EN = (1 << 6), /**< Parameter enabled (100MBit mode) */ - CONFIG3_MAGIC = (1 << 5), /**< WoL Magic packet enable */ + CONFIG3_MAGIC = (1 << 5), /**< WoL Magic frame enable */ CONFIG3_LINK_UP = (1 << 4), /**< Wakeup if link is reestablished */ CONFIG3_CLKRUN_EN = (1 << 2), /**< CLKRUN enabled */ /* TODO: check what does it mean */ @@ -416,9 +416,9 @@ }; -/** Maximal runt packet size + 1 */ +/** Maximal runt frame size + 1 */ #define RTL8139_RUNT_MAX_SIZE 64 -/** Bits in packet header */ -enum rtl8139_packet_header { +/** Bits in frame header */ +enum rtl8139_frame_header { RSR_MAR = (1 << 15), /**< Multicast received */ RSR_PAM = (1 << 14), /**< Physical address match */ @@ -426,10 +426,10 @@ RSR_ISE = (1 << 5), /**< Invalid symbol error, 100BASE-TX only */ - RSR_RUNT = (1 << 4), /**< Runt packet (< RTL8139_RUNT_MAX_SIZE bytes) */ - - RSR_LONG = (1 << 3), /**< Long packet (size > 4k bytes) */ + RSR_RUNT = (1 << 4), /**< Runt frame (< RTL8139_RUNT_MAX_SIZE bytes) */ + + RSR_LONG = (1 << 3), /**< Long frmae (size > 4k bytes) */ RSR_CRC = (1 << 2), /**< CRC error */ RSR_FAE = (1 << 1), /**< Frame alignment error */ - RSR_ROK = (1 << 0) /**< Good packet received */ + RSR_ROK = (1 << 0) /**< Good frame received */ }; @@ -451,5 +451,5 @@ */ - APPEND_CRC = 1 << 16, /**< Append CRC at the end of a packet */ + APPEND_CRC = 1 << 16, /**< Append CRC at the end of a frame */ MXTxDMA_SHIFT = 8, /**< Max. DMA Burst per TxDMA shift, burst = 16^value */ @@ -459,5 +459,5 @@ TX_RETRY_COUNT_SIZE = 4, /**< Retries before aborting size */ - CLEAR_ABORT = 1 << 0 /**< Retransmit aborted packet at the last + CLEAR_ABORT = 1 << 0 /**< Retransmit aborted frame at the last * transmitted descriptor */ @@ -478,11 +478,11 @@ extern const struct rtl8139_hwver_map rtl8139_versions[RTL8139_VER_COUNT + 1]; -/** Size in the packet header while copying from RxFIFO to Rx buffer */ +/** Size in the frame header while copying from RxFIFO to Rx buffer */ #define RTL8139_EARLY_SIZE UINT16_C(0xfff0) -/** The only supported pause packet time value */ +/** The only supported pause frame time value */ #define RTL8139_PAUSE_VAL UINT16_C(0xFFFF) -/** Size of the packet header in front of the received frame */ -#define RTL_PACKET_HEADER_SIZE 4 +/** Size of the frame header in front of the received frame */ +#define RTL_FRAME_HEADER_SIZE 4 /** 8k buffer */ Index: uspace/drv/nic/rtl8139/driver.c =================================================================== --- uspace/drv/nic/rtl8139/driver.c (revision 6d8455d96fd6cd160666aef7ea55519828d14f42) +++ uspace/drv/nic/rtl8139/driver.c (revision 1bc35b5107055e337dd8c8f42e37c47db3ecb6f5) @@ -39,5 +39,5 @@ #include #include -#include +//#include #include @@ -152,5 +152,5 @@ } -/** Update the mask of accepted packets in the RCR register according to +/** Update the mask of accepted frames in the RCR register according to * rcr_accept_mode value in rtl8139_t * @@ -170,5 +170,5 @@ } -/** Fill the mask of accepted multicast packets in the card registers +/** Fill the mask of accepted multicast frames in the card registers * * @param rtl8139 The rtl8139 private data @@ -394,5 +394,5 @@ #define rtl8139_tbuf_busy(tsd) ((pio_read_32(tsd) & TSD_OWN) == 0) -/** Send packet with the hardware +/** Send frame with the hardware * * note: the main_lock is locked when framework calls this function @@ -412,5 +412,5 @@ ddf_msg(LVL_DEBUG, "Sending frame"); - if (size > RTL8139_PACKET_MAX_LENGTH) { + if (size > RTL8139_FRAME_MAX_LENGTH) { ddf_msg(LVL_ERROR, "Send frame: frame too long, %zu bytes", size); @@ -437,5 +437,5 @@ fibril_mutex_unlock(&rtl8139->tx_lock); - /* Get address of the buffer descriptor and packet data */ + /* Get address of the buffer descriptor and frame data */ void *tsd = rtl8139->io_port + TSD0 + tx_curr * 4; void *buf_addr = rtl8139->tx_buff[tx_curr]; @@ -505,32 +505,25 @@ } -/** Create packet structure from the buffer data +/** Create frame structure from the buffer data * * @param nic_data NIC driver data * @param rx_buffer The receiver buffer * @param rx_size The buffer size - * @param packet_start The offset where packet data start - * @param packet_size The size of the packet data - * - * @return The packet list node (not connected) - */ -static nic_frame_t *rtl8139_read_packet(nic_t *nic_data, - void *rx_buffer, size_t rx_size, size_t packet_start, size_t packet_size) -{ - nic_frame_t *frame = nic_alloc_frame(nic_data, packet_size); + * @param frame_start The offset where packet data start + * @param frame_size The size of the frame data + * + * @return The frame list node (not connected) + */ +static nic_frame_t *rtl8139_read_frame(nic_t *nic_data, + void *rx_buffer, size_t rx_size, size_t frame_start, size_t frame_size) +{ + nic_frame_t *frame = nic_alloc_frame(nic_data, frame_size); if (! frame) { - ddf_msg(LVL_ERROR, "Can not allocate frame for received packet."); + ddf_msg(LVL_ERROR, "Can not allocate frame for received frame."); return NULL; } - void *packet_data = packet_suffix(frame->packet, packet_size); - if (!packet_data) { - ddf_msg(LVL_ERROR, "Can not get the packet suffix."); - nic_release_frame(nic_data, frame); - return NULL; - } - - void *ret = rtl8139_memcpy_wrapped(packet_data, rx_buffer, packet_start, - RxBUF_SIZE, packet_size); + void *ret = rtl8139_memcpy_wrapped(frame->data, rx_buffer, frame_start, + RxBUF_SIZE, frame_size); if (ret == NULL) { nic_release_frame(nic_data, frame); @@ -568,10 +561,10 @@ } -/** Receive all packets in queue +/** Receive all frames in queue * * @param nic_data The controller data - * @return The linked list of packet_list_t nodes, each containing one packet - */ -static nic_frame_list_t *rtl8139_packet_receive(nic_t *nic_data) + * @return The linked list of nic_frame_list_t nodes, each containing one frame + */ +static nic_frame_list_t *rtl8139_frame_receive(nic_t *nic_data) { rtl8139_t *rtl8139 = nic_get_specific(nic_data); @@ -581,5 +574,5 @@ nic_frame_list_t *frames = nic_alloc_frame_list(); if (!frames) - ddf_msg(LVL_ERROR, "Can not allocate frame list for received packets."); + ddf_msg(LVL_ERROR, "Can not allocate frame list for received frames."); void *rx_buffer = rtl8139->rx_buff_virt; @@ -605,12 +598,12 @@ while (!rtl8139_hw_buffer_empty(rtl8139)) { void *rx_ptr = rx_buffer + rx_offset % RxBUF_SIZE; - uint32_t packet_header = uint32_t_le2host( *((uint32_t*)rx_ptr) ); - uint16_t size = packet_header >> 16; - uint16_t packet_size = size - RTL8139_CRC_SIZE; - /* received packet flags in packet header */ - uint16_t rcs = (uint16_t) packet_header; + uint32_t frame_header = uint32_t_le2host( *((uint32_t*)rx_ptr) ); + uint16_t size = frame_header >> 16; + uint16_t frame_size = size - RTL8139_CRC_SIZE; + /* received frame flags in frame header */ + uint16_t rcs = (uint16_t) frame_header; if (size == RTL8139_EARLY_SIZE) { - /* The packet copying is still in progress, break receiving */ + /* The frame copying is still in progress, break receiving */ ddf_msg(LVL_DEBUG, "Early threshold reached, not completely coppied"); break; @@ -618,7 +611,7 @@ /* Check if the header is valid, otherwise we are lost in the buffer */ - if (size == 0 || size > RTL8139_PACKET_MAX_LENGTH) { + if (size == 0 || size > RTL8139_FRAME_MAX_LENGTH) { ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4"PRIu16", " - "header 0x%4"PRIx16". Offset: %zu)", size, packet_header, + "header 0x%4"PRIx16". Offset: %zu)", size, frame_header, rx_offset); goto rx_err; @@ -629,11 +622,11 @@ } - cur_read += size + RTL_PACKET_HEADER_SIZE; + cur_read += size + RTL_FRAME_HEADER_SIZE; if (cur_read > max_read) break; if (frames) { - nic_frame_t *frame = rtl8139_read_packet(nic_data, rx_buffer, - RxBUF_SIZE, rx_offset + RTL_PACKET_HEADER_SIZE, packet_size); + nic_frame_t *frame = rtl8139_read_frame(nic_data, rx_buffer, + RxBUF_SIZE, rx_offset + RTL_FRAME_HEADER_SIZE, frame_size); if (frame) @@ -642,7 +635,7 @@ /* Update offset */ - rx_offset = ALIGN_UP(rx_offset + size + RTL_PACKET_HEADER_SIZE, 4); - - /* Write lesser value to prevent overflow into unread packet + rx_offset = ALIGN_UP(rx_offset + size + RTL_FRAME_HEADER_SIZE, 4); + + /* Write lesser value to prevent overflow into unread frame * (the recomendation from the RealTech rtl8139 programming guide) */ @@ -727,5 +720,5 @@ tx_used++; - /* If the packet was sent */ + /* If the frame was sent */ if (tsd_value & TSD_TOK) { size_t size = REG_GET_VAL(tsd_value, TSD_SIZE); @@ -757,9 +750,9 @@ } -/** Receive all packets from the buffer +/** Receive all frames from the buffer * * @param rtl8139 driver private data */ -static void rtl8139_receive_packets(nic_t *nic_data) +static void rtl8139_receive_frames(nic_t *nic_data) { assert(nic_data); @@ -769,5 +762,5 @@ fibril_mutex_lock(&rtl8139->rx_lock); - nic_frame_list_t *frames = rtl8139_packet_receive(nic_data); + nic_frame_list_t *frames = rtl8139_frame_receive(nic_data); fibril_mutex_unlock(&rtl8139->rx_lock); @@ -825,5 +818,5 @@ } - /* Check transmittion interrupts first to allow transmit next packets + /* Check transmittion interrupts first to allow transmit next frames * sooner */ @@ -832,5 +825,5 @@ } if (isr & INT_ROK) { - rtl8139_receive_packets(nic_data); + rtl8139_receive_frames(nic_data); } if (isr & (INT_RER | INT_RXOVW | INT_FIFOOVW)) { @@ -933,5 +926,5 @@ } -/** Activate the device to receive and transmit packets +/** Activate the device to receive and transmit frames * * @param nic_data The nic driver data @@ -1213,10 +1206,10 @@ goto failed; - /* Set default packet acceptance */ + /* Set default frame acceptance */ rtl8139->rcr_data.ucast_mask = RTL8139_RCR_UCAST_DEFAULT; rtl8139->rcr_data.mcast_mask = RTL8139_RCR_MCAST_DEFAULT; rtl8139->rcr_data.bcast_mask = RTL8139_RCR_BCAST_DEFAULT; rtl8139->rcr_data.defect_mask = RTL8139_RCR_DEFECT_DEFAULT; - /* Set receiver early treshold to 8/16 of packet length */ + /* Set receiver early treshold to 8/16 of frame length */ rtl8139->rcr_data.rcr_base = (0x8 << RCR_ERTH_SHIFT); @@ -1477,5 +1470,5 @@ }; -/** Check if pause packet operations are valid in current situation +/** Check if pause frame operations are valid in current situation * * @param rtl8139 RTL8139 private structure @@ -1502,5 +1495,5 @@ } -/** Get current pause packet configuration +/** Get current pause frame configuration * * Values are filled with NIC_RESULT_NOT_AVAILABLE if the value has no sense in @@ -1508,7 +1501,7 @@ * * @param[in] fun The DDF structure of the RTL8139 - * @param[out] we_send Sign if local constroller sends pause packets - * @param[out] we_receive Sign if local constroller receives pause packets - * @param[out] time Time filled in pause packets. 0xFFFF in rtl8139 + * @param[out] we_send Sign if local constroller sends pause frame + * @param[out] we_receive Sign if local constroller receives pause frame + * @param[out] time Time filled in pause frames. 0xFFFF in rtl8139 * * @return EOK if succeed @@ -1540,12 +1533,12 @@ }; -/** Set current pause packet configuration +/** Set current pause frame configuration * * @param fun The DDF structure of the RTL8139 - * @param allow_send Sign if local constroller sends pause packets - * @param allow_receive Sign if local constroller receives pause packets + * @param allow_send Sign if local constroller sends pause frame + * @param allow_receive Sign if local constroller receives pause frames * @param time Time to use, ignored (not supported by device) * - * @return EOK if succeed, INVAL if the pause packet has no sence + * @return EOK if succeed, INVAL if the pause frame has no sence */ static int rtl8139_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, @@ -1796,5 +1789,5 @@ } -/** Set unicast packets acceptance mode +/** Set unicast frames acceptance mode * * @param nic_data The nic device to update @@ -1854,5 +1847,5 @@ } -/** Set multicast packets acceptance mode +/** Set multicast frames acceptance mode * * @param nic_data The nic device to update @@ -1899,5 +1892,5 @@ } -/** Set broadcast packets acceptance mode +/** Set broadcast frames acceptance mode * * @param nic_data The nic device to update @@ -1929,5 +1922,5 @@ } -/** Get state of acceptance of weird packets +/** Get state of acceptance of weird frames * * @param[in] device The device to check @@ -1951,5 +1944,5 @@ }; -/** Set acceptance of weird packets +/** Set acceptance of weird frames * * @param device The device to update @@ -2127,5 +2120,5 @@ } -/** Force receiving all packets in the receive buffer +/** Force receiving all frames in the receive buffer * * @param device The device to receive Index: uspace/drv/nic/rtl8139/driver.h =================================================================== --- uspace/drv/nic/rtl8139/driver.h (revision 6d8455d96fd6cd160666aef7ea55519828d14f42) +++ uspace/drv/nic/rtl8139/driver.h (revision 1bc35b5107055e337dd8c8f42e37c47db3ecb6f5) @@ -39,5 +39,5 @@ /** Transmittion buffers count */ #define TX_BUFF_COUNT 4 -/** Size of buffer for one packet +/** Size of buffer for one frame * - 2kB */ @@ -49,11 +49,11 @@ #define RTL8139_CRC_SIZE 4 -/** The default mode of accepting unicast packets */ +/** The default mode of accepting unicast frames */ #define RTL8139_RCR_UCAST_DEFAULT RCR_ACCEPT_PHYS_MATCH -/** The default mode of accepting multicast packets */ +/** The default mode of accepting multicast frames */ #define RTL8139_RCR_MCAST_DEFAULT 0 -/** The default mode of accepting broadcast packets */ +/** The default mode of accepting broadcast frames */ #define RTL8139_RCR_BCAST_DEFAULT RCR_ACCEPT_BROADCAST -/** The default mode of accepting defect packets */ +/** The default mode of accepting defect frames */ #define RTL8139_RCR_DEFECT_DEFAULT 0 @@ -112,5 +112,5 @@ size_t tx_used; - /** Buffer for receiving packets */ + /** Buffer for receiving frames */ void *rx_buff_phys; void *rx_buff_virt;