andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

net_device: re-factor code so as to not be specific to lwIP

Browse Source
This commit is contained in:
Peter Lawrence
2020-10-24 20:27:57 -05:00
parent f5b72f5796
commit a097b7e51a
3 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/class/net/net_device.c
View File

@@ -366,23 +366,7 @@ static void handle_incoming_packet(uint32_t len)
}
}
bool accepted = false;
if (size)
{
struct pbuf *p = pbuf_alloc(PBUF_RAW, size, PBUF_POOL);
if (p)
{
/* pbuf_alloc() has already initialized struct; all we need to do is copy the data */
memcpy(p->payload, pnt, size);
accepted = tud_network_recv_cb(p);
if (!accepted) pbuf_free(p);
}
}
if (!accepted)
if (!tud_network_recv_cb(pnt, size))
{
/* if a buffer was never handled by user code, we must renew on the user's behalf */
tud_network_recv_renew();
@@ -429,9 +413,8 @@ bool tud_network_can_xmit(void)
return can_xmit;
}
void tud_network_xmit(struct pbuf *p)
void tud_network_xmit(void *ref, uint16_t arg)
{
struct pbuf *q;
uint8_t *data;
uint16_t len;
@@ -441,14 +424,7 @@ void tud_network_xmit(struct pbuf *p)
len = (_netd_itf.ecm_mode) ? 0 : CFG_TUD_NET_PACKET_PREFIX_LEN;
data = transmitted + len;
/* traverse the "pbuf chain"; see ./lwip/src/core/pbuf.c for more info */
for(q = p; q != NULL; q = q->next)
{
memcpy(data, (char *)q->payload, q->len);
data += q->len;
len += q->len;
if (q->len == q->tot_len) break;
}
len += tud_network_xmit_cb(data, ref, arg);
if (!_netd_itf.ecm_mode)
{

15
src/class/net/net_device.h
View File

@@ -32,15 +32,13 @@
#include "device/usbd.h"
#include "class/cdc/cdc.h"
// TODO should not include external files
#include "lwip/pbuf.h"
#include "netif/ethernet.h"
/* declared here, NOT in usb_descriptors.c, so that the driver can intelligently ZLP as needed */
#define CFG_TUD_NET_ENDPOINT_SIZE (TUD_OPT_HIGH_SPEED ? 512 : 64)
/* Maximum Tranmission Unit (in bytes) of the network, including Ethernet header */
#define CFG_TUD_NET_MTU (1500 + SIZEOF_ETH_HDR)
#ifndef CFG_TUD_NET_MTU
#define CFG_TUD_NET_MTU 1514
#endif
#ifdef __cplusplus
extern "C" {
@@ -54,7 +52,10 @@
void tud_network_init_cb(void);
// client must provide this: return false if the packet buffer was not accepted
bool tud_network_recv_cb(struct pbuf *p);
bool tud_network_recv_cb(const uint8_t *src, uint16_t size);
// client must provide this: copy from network stack packet pointer to dst
uint16_t tud_network_xmit_cb(uint8_t *dst, void *ref, uint16_t arg);
// client must provide this: 48-bit MAC address
// TODO removed later since it is not part of tinyusb stack
@@ -67,7 +68,7 @@ void tud_network_recv_renew(void);
bool tud_network_can_xmit(void);
// if network_can_xmit() returns true, network_xmit() can be called once
void tud_network_xmit(struct pbuf *p);
void tud_network_xmit(void *ref, uint16_t arg);
//--------------------------------------------------------------------+
// INTERNAL USBD-CLASS DRIVER API