yemai/CherryUSB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(class): change ifdef to if for LWIP_TCPIP_CORE_LOCKING_INPUT

Browse Source
This commit is contained in:
sakumisu
2024-05-14 13:59:39 +08:00
parent 207fb7b128
commit 490cac1a0f
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
class/cdc/usbh_cdc_ecm.c
View File

@@ -232,7 +232,7 @@ void usbh_cdc_ecm_rx_thread(void *argument)
int ret;
err_t err;
struct pbuf *p;
#ifdef LWIP_TCPIP_CORE_LOCKING_INPUT
#if LWIP_TCPIP_CORE_LOCKING_INPUT
pbuf_type type = PBUF_ROM;
#else
pbuf_type type = PBUF_POOL;
@@ -271,7 +271,7 @@ find_class:
p = pbuf_alloc(PBUF_RAW, g_cdc_ecm_rx_length, type);
if (p != NULL) {
#ifdef LWIP_TCPIP_CORE_LOCKING_INPUT
#if LWIP_TCPIP_CORE_LOCKING_INPUT
p->payload = g_cdc_ecm_rx_buffer;
#else
memcpy(p->payload, (uint8_t *)g_cdc_ecm_rx_buffer, g_cdc_ecm_rx_length);

4
class/cdc/usbh_cdc_ncm.c
View File

@@ -258,7 +258,7 @@ void usbh_cdc_ncm_rx_thread(void *argument)
int ret;
err_t err;
struct pbuf *p;
#ifdef LWIP_TCPIP_CORE_LOCKING_INPUT
#if LWIP_TCPIP_CORE_LOCKING_INPUT
pbuf_type type = PBUF_ROM;
#else
pbuf_type type = PBUF_POOL;
@@ -321,7 +321,7 @@ find_class:
p = pbuf_alloc(PBUF_RAW, ndp16_datagram->wDatagramLength, type);
if (p != NULL) {
#ifdef LWIP_TCPIP_CORE_LOCKING_INPUT
#if LWIP_TCPIP_CORE_LOCKING_INPUT
p->payload = (uint8_t *)&g_cdc_ncm_rx_buffer[ndp16_datagram->wDatagramIndex];
#else
memcpy(p->payload, (uint8_t *)&g_cdc_ncm_rx_buffer[ndp16_datagram->wDatagramIndex], ndp16_datagram->wDatagramLength);

4
class/vendor/net/usbh_asix.c vendored
View File

@@ -657,7 +657,7 @@ void usbh_asix_rx_thread(void *argument)
uint16_t len;
uint16_t len_crc;
struct pbuf *p;
#ifdef LWIP_TCPIP_CORE_LOCKING_INPUT
#if LWIP_TCPIP_CORE_LOCKING_INPUT
pbuf_type type = PBUF_ROM;
#else
pbuf_type type = PBUF_POOL;
@@ -704,7 +704,7 @@ find_class:
p = pbuf_alloc(PBUF_RAW, len, type);
if (p != NULL) {
#ifdef LWIP_TCPIP_CORE_LOCKING_INPUT
#if LWIP_TCPIP_CORE_LOCKING_INPUT
p->payload = (uint8_t *)&g_asix_rx_buffer[4];
#else
memcpy(p->payload, (uint8_t *)&g_asix_rx_buffer[4], len);

4
class/vendor/net/usbh_rtl8152.c vendored
View File

@@ -2133,7 +2133,7 @@ void usbh_rtl8152_rx_thread(void *argument)
uint16_t len;
uint16_t data_offset;
struct pbuf *p;
#ifdef LWIP_TCPIP_CORE_LOCKING_INPUT
#if LWIP_TCPIP_CORE_LOCKING_INPUT
pbuf_type type = PBUF_ROM;
#else
pbuf_type type = PBUF_POOL;
@@ -2190,7 +2190,7 @@ find_class:
p = pbuf_alloc(PBUF_RAW, len, type);
if (p != NULL) {
#ifdef LWIP_TCPIP_CORE_LOCKING_INPUT
#if LWIP_TCPIP_CORE_LOCKING_INPUT
p->payload = (uint8_t *)&g_rtl8152_rx_buffer[data_offset + sizeof(struct rx_desc)];
#else
memcpy(p->payload, (uint8_t *)&g_rtl8152_rx_buffer[data_offset + sizeof(struct rx_desc)], len);

4
class/wireless/usbh_rndis.c
View File

@@ -439,7 +439,7 @@ void usbh_rndis_rx_thread(void *argument)
struct pbuf *p;
rndis_data_packet_t *pmsg;
rndis_data_packet_t temp;
#ifdef LWIP_TCPIP_CORE_LOCKING_INPUT
#if LWIP_TCPIP_CORE_LOCKING_INPUT
pbuf_type type = PBUF_ROM;
#else
pbuf_type type = PBUF_POOL;
@@ -492,7 +492,7 @@ find_class:
p = pbuf_alloc(PBUF_RAW, pmsg->DataLength, type);
if (p != NULL) {
void *src = (void *)(g_rndis_rx_buffer + pmg_offset + sizeof(rndis_generic_msg_t) + pmsg->DataOffset);
#ifdef LWIP_TCPIP_CORE_LOCKING_INPUT
#if LWIP_TCPIP_CORE_LOCKING_INPUT
p->payload = src;
#else
memcpy(p->payload, src, pmsg->DataLength);