diff options
| author | hathach <[email protected]> | 2024-04-09 20:26:26 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2024-04-09 22:04:43 +0700 |
| commit | 2bce68a065aa873ffd738b5a90639b3b4b18d2c2 (patch) | |
| tree | c1a2bfc42a3be56b4751969681005665dfaf90ad /lib/networking | |
| parent | 75cf8e21a7e525eb24b7fd34fe5859cba331fcc2 (diff) | |
| parent | 68a08e33d2a1a3b02a28c616bc825eb674700833 (diff) | |
Merge branch 'master' into dwc2-interrupts
Diffstat (limited to 'lib/networking')
| -rw-r--r-- | lib/networking/dhserver.h | 6 | ||||
| -rw-r--r-- | lib/networking/dnserver.h | 6 | ||||
| -rw-r--r-- | lib/networking/rndis_reports.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/lib/networking/dhserver.h b/lib/networking/dhserver.h index b3642459a..b0d57ac4e 100644 --- a/lib/networking/dhserver.h +++ b/lib/networking/dhserver.h @@ -56,7 +56,13 @@ typedef struct dhcp_config dhcp_entry_t *entries; } dhcp_config_t; +#ifdef __cplusplus +extern "C" { +#endif err_t dhserv_init(const dhcp_config_t *config); void dhserv_free(void); +#ifdef __cplusplus +} +#endif #endif /* DHSERVER_H */ diff --git a/lib/networking/dnserver.h b/lib/networking/dnserver.h index 50b29be89..a7a7f9acb 100644 --- a/lib/networking/dnserver.h +++ b/lib/networking/dnserver.h @@ -41,7 +41,13 @@ typedef bool (*dns_query_proc_t)(const char *name, ip4_addr_t *addr); +#ifdef __cplusplus +extern "C" { +#endif err_t dnserv_init(const ip_addr_t *bind, uint16_t port, dns_query_proc_t query_proc); void dnserv_free(void); +#ifdef __cplusplus +} +#endif #endif diff --git a/lib/networking/rndis_reports.c b/lib/networking/rndis_reports.c index cc14f174c..60afb8615 100644 --- a/lib/networking/rndis_reports.c +++ b/lib/networking/rndis_reports.c @@ -43,7 +43,7 @@ static usb_eth_stat_t usb_eth_stat = { 0, 0, 0, 0 }; static uint32_t oid_packet_filter = 0x0000000; static rndis_state_t rndis_state; -CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t ndis_report[8] = { 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; +CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t ndis_report[8] = { 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; static const uint32_t OIDSupportedList[] = { |