diff options
| author | hathach <[email protected]> | 2025-10-31 14:21:17 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2025-10-31 14:21:17 +0700 |
| commit | 6837e47584d2512c8251345e09775075f8159c4d (patch) | |
| tree | 06224d3b8f75c9536ba909f954f117d23b7b8245 /lib | |
| parent | cc82e088b5333bae3dba8fb12965271d89cd5117 (diff) | |
| parent | fc3857eb1abefff3cf19816e231e549bf75b9dc3 (diff) | |
Merge branch 'master' into fork/ArcaneNibble/ohci-upstream
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/networking/dhserver.c | 4 | ||||
| -rw-r--r-- | lib/networking/rndis_reports.c | 7 | ||||
| -rw-r--r-- | lib/rt-thread/tusb_config.h | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/lib/networking/dhserver.c b/lib/networking/dhserver.c index 9dedf87e2..87a63c5de 100644 --- a/lib/networking/dhserver.c +++ b/lib/networking/dhserver.c @@ -145,7 +145,7 @@ static __inline void free_entry(dhcp_entry_t *entry) memset(entry->mac, 0, 6); } -uint8_t *find_dhcp_option(uint8_t *attrs, int size, uint8_t attr) +static uint8_t *find_dhcp_option(uint8_t *attrs, int size, uint8_t attr) { int i = 0; while ((i + 1) < size) @@ -159,7 +159,7 @@ uint8_t *find_dhcp_option(uint8_t *attrs, int size, uint8_t attr) return NULL; } -int fill_options(void *dest, +static int fill_options(void *dest, uint8_t msg_type, const char *domain, ip4_addr_t dns, diff --git a/lib/networking/rndis_reports.c b/lib/networking/rndis_reports.c index 451d5405b..e2849fb10 100644 --- a/lib/networking/rndis_reports.c +++ b/lib/networking/rndis_reports.c @@ -29,7 +29,10 @@ #include <stdalign.h> #include <string.h> -#include "class/net/net_device.h" +#include "tusb.h" + +#if CFG_TUD_ECM_RNDIS + #include "rndis_protocol.h" #include "netif/ethernet.h" @@ -299,3 +302,5 @@ void rndis_class_set_handler(uint8_t *data, int size) break; } } + +#endif diff --git a/lib/rt-thread/tusb_config.h b/lib/rt-thread/tusb_config.h index 11dc21983..6f794dc41 100644 --- a/lib/rt-thread/tusb_config.h +++ b/lib/rt-thread/tusb_config.h @@ -24,8 +24,8 @@ * This file is part of the TinyUSB stack. */ -#ifndef _TUSB_CONFIG_H_ -#define _TUSB_CONFIG_H_ +#ifndef TUSB_CONFIG_H_ +#define TUSB_CONFIG_H_ #ifdef __RTTHREAD__ #include <rtconfig.h> @@ -215,4 +215,4 @@ extern "C" { #endif #endif /*__RTTHREAD__*/ -#endif /* _TUSB_CONFIG_H_ */ +#endif /* TUSB_CONFIG_H_ */ |