Skip to content

Commit d4afbe5

Browse files
Jason2866Jason2866
committed
solve conflicts
1 parent 285c2de commit d4afbe5

File tree

10 files changed

+306
-149
lines changed

10 files changed

+306
-149
lines changed

Diff for: ‎tools/sdk/esp32/include/coap/port/include/coap_config.h

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* libcoap configure implementation for ESP32 platform.
3+
*
4+
* Uses libcoap software implementation for failover when concurrent
5+
* configure operations are in use.
6+
*
7+
* coap.h -- main header file for CoAP stack of libcoap
8+
*
9+
* Copyright (C) 2010-2012,2015-2016 Olaf Bergmann <[email protected]>
10+
* 2015 Carsten Schoenert <[email protected]>
11+
*
12+
* Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
13+
*
14+
* This file is part of the CoAP library libcoap. Please see README for terms
15+
* of use.
16+
*/
17+
18+
#ifndef _CONFIG_H_
19+
#define _CONFIG_H_
20+
21+
/* Always enabled in ESP-IDF */
22+
#ifndef WITH_POSIX
23+
#define WITH_POSIX
24+
#endif
25+
26+
#include "coap_config_posix.h"
27+
28+
#define HAVE_STDIO_H
29+
#define HAVE_ASSERT_H
30+
31+
#define PACKAGE_STRING PACKAGE_NAME PACKAGE_VERSION
32+
33+
/* it's just provided by libc. i hope we don't get too many of those, as
34+
* actually we'd need autotools again to find out what environment we're
35+
* building in */
36+
#define HAVE_STRNLEN 1
37+
38+
#define HAVE_LIMITS_H
39+
40+
#define COAP_RESOURCES_NOHASH
41+
42+
#endif /* _CONFIG_H_ */

Diff for: ‎tools/sdk/esp32/include/coap/port/include/coap_config_posix.h

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* libcoap configure implementation for ESP32 platform.
3+
*
4+
* Uses libcoap software implementation for failover when concurrent
5+
* configure operations are in use.
6+
*
7+
* coap.h -- main header file for CoAP stack of libcoap
8+
*
9+
* Copyright (C) 2010-2012,2015-2016 Olaf Bergmann <[email protected]>
10+
* 2015 Carsten Schoenert <[email protected]>
11+
*
12+
* Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
13+
*
14+
* This file is part of the CoAP library libcoap. Please see README for terms
15+
* of use.
16+
*/
17+
18+
#ifndef COAP_CONFIG_POSIX_H_
19+
#define COAP_CONFIG_POSIX_H_
20+
21+
#ifdef WITH_POSIX
22+
23+
#include <sys/socket.h>
24+
#include <net/if.h>
25+
26+
#define HAVE_SYS_SOCKET_H
27+
#define HAVE_MALLOC
28+
#define HAVE_ARPA_INET_H
29+
#define HAVE_TIME_H
30+
#define HAVE_NETDB_H
31+
#define HAVE_NETINET_IN_H
32+
#define HAVE_STRUCT_CMSGHDR
33+
#define COAP_DISABLE_TCP 0
34+
35+
#define ipi_spec_dst ipi_addr
36+
struct in6_pktinfo {
37+
struct in6_addr ipi6_addr; /* src/dst IPv6 address */
38+
unsigned int ipi6_ifindex; /* send/recv interface index */
39+
};
40+
#define IN6_IS_ADDR_V4MAPPED(a) \
41+
((((__const uint32_t *) (a))[0] == 0) \
42+
&& (((__const uint32_t *) (a))[1] == 0) \
43+
&& (((__const uint32_t *) (a))[2] == htonl (0xffff)))
44+
45+
/* As not defined, just need to define is as something innocuous */
46+
#define IPV6_PKTINFO IPV6_CHECKSUM
47+
48+
#define PACKAGE_NAME "libcoap-posix"
49+
#define PACKAGE_VERSION "?"
50+
51+
#ifdef CONFIG_MBEDTLS_TLS_ENABLED
52+
#define HAVE_MBEDTLS
53+
#endif /* CONFIG_MBEDTLS_TLS_ENABLED */
54+
#define COAP_CONSTRAINED_STACK 1
55+
#define ESPIDF_VERSION
56+
57+
#define gai_strerror(x) "gai_strerror() not supported"
58+
59+
#endif /* WITH_POSIX */
60+
#endif /* COAP_CONFIG_POSIX_H_ */

Diff for: ‎tools/sdk/esp32c3/include/coap/port/include/coap_config.h

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* libcoap configure implementation for ESP32 platform.
3+
*
4+
* Uses libcoap software implementation for failover when concurrent
5+
* configure operations are in use.
6+
*
7+
* coap.h -- main header file for CoAP stack of libcoap
8+
*
9+
* Copyright (C) 2010-2012,2015-2016 Olaf Bergmann <[email protected]>
10+
* 2015 Carsten Schoenert <[email protected]>
11+
*
12+
* Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
13+
*
14+
* This file is part of the CoAP library libcoap. Please see README for terms
15+
* of use.
16+
*/
17+
18+
#ifndef _CONFIG_H_
19+
#define _CONFIG_H_
20+
21+
/* Always enabled in ESP-IDF */
22+
#ifndef WITH_POSIX
23+
#define WITH_POSIX
24+
#endif
25+
26+
#include "coap_config_posix.h"
27+
28+
#define HAVE_STDIO_H
29+
#define HAVE_ASSERT_H
30+
31+
#define PACKAGE_STRING PACKAGE_NAME PACKAGE_VERSION
32+
33+
/* it's just provided by libc. i hope we don't get too many of those, as
34+
* actually we'd need autotools again to find out what environment we're
35+
* building in */
36+
#define HAVE_STRNLEN 1
37+
38+
#define HAVE_LIMITS_H
39+
40+
#define COAP_RESOURCES_NOHASH
41+
42+
#endif /* _CONFIG_H_ */

Diff for: ‎tools/sdk/esp32c3/include/coap/port/include/coap_config_posix.h

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* libcoap configure implementation for ESP32 platform.
3+
*
4+
* Uses libcoap software implementation for failover when concurrent
5+
* configure operations are in use.
6+
*
7+
* coap.h -- main header file for CoAP stack of libcoap
8+
*
9+
* Copyright (C) 2010-2012,2015-2016 Olaf Bergmann <[email protected]>
10+
* 2015 Carsten Schoenert <[email protected]>
11+
*
12+
* Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
13+
*
14+
* This file is part of the CoAP library libcoap. Please see README for terms
15+
* of use.
16+
*/
17+
18+
#ifndef COAP_CONFIG_POSIX_H_
19+
#define COAP_CONFIG_POSIX_H_
20+
21+
#ifdef WITH_POSIX
22+
23+
#include <sys/socket.h>
24+
#include <net/if.h>
25+
26+
#define HAVE_SYS_SOCKET_H
27+
#define HAVE_MALLOC
28+
#define HAVE_ARPA_INET_H
29+
#define HAVE_TIME_H
30+
#define HAVE_NETDB_H
31+
#define HAVE_NETINET_IN_H
32+
#define HAVE_STRUCT_CMSGHDR
33+
#define COAP_DISABLE_TCP 0
34+
35+
#define ipi_spec_dst ipi_addr
36+
struct in6_pktinfo {
37+
struct in6_addr ipi6_addr; /* src/dst IPv6 address */
38+
unsigned int ipi6_ifindex; /* send/recv interface index */
39+
};
40+
#define IN6_IS_ADDR_V4MAPPED(a) \
41+
((((__const uint32_t *) (a))[0] == 0) \
42+
&& (((__const uint32_t *) (a))[1] == 0) \
43+
&& (((__const uint32_t *) (a))[2] == htonl (0xffff)))
44+
45+
/* As not defined, just need to define is as something innocuous */
46+
#define IPV6_PKTINFO IPV6_CHECKSUM
47+
48+
#define PACKAGE_NAME "libcoap-posix"
49+
#define PACKAGE_VERSION "?"
50+
51+
#ifdef CONFIG_MBEDTLS_TLS_ENABLED
52+
#define HAVE_MBEDTLS
53+
#endif /* CONFIG_MBEDTLS_TLS_ENABLED */
54+
#define COAP_CONSTRAINED_STACK 1
55+
#define ESPIDF_VERSION
56+
57+
#define gai_strerror(x) "gai_strerror() not supported"
58+
59+
#endif /* WITH_POSIX */
60+
#endif /* COAP_CONFIG_POSIX_H_ */

Diff for: ‎tools/sdk/esp32s2/include/coap/port/include/coap_config.h

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* libcoap configure implementation for ESP32 platform.
3+
*
4+
* Uses libcoap software implementation for failover when concurrent
5+
* configure operations are in use.
6+
*
7+
* coap.h -- main header file for CoAP stack of libcoap
8+
*
9+
* Copyright (C) 2010-2012,2015-2016 Olaf Bergmann <[email protected]>
10+
* 2015 Carsten Schoenert <[email protected]>
11+
*
12+
* Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
13+
*
14+
* This file is part of the CoAP library libcoap. Please see README for terms
15+
* of use.
16+
*/
17+
18+
#ifndef _CONFIG_H_
19+
#define _CONFIG_H_
20+
21+
/* Always enabled in ESP-IDF */
22+
#ifndef WITH_POSIX
23+
#define WITH_POSIX
24+
#endif
25+
26+
#include "coap_config_posix.h"
27+
28+
#define HAVE_STDIO_H
29+
#define HAVE_ASSERT_H
30+
31+
#define PACKAGE_STRING PACKAGE_NAME PACKAGE_VERSION
32+
33+
/* it's just provided by libc. i hope we don't get too many of those, as
34+
* actually we'd need autotools again to find out what environment we're
35+
* building in */
36+
#define HAVE_STRNLEN 1
37+
38+
#define HAVE_LIMITS_H
39+
40+
#define COAP_RESOURCES_NOHASH
41+
42+
#endif /* _CONFIG_H_ */

Diff for: ‎tools/sdk/esp32s2/include/coap/port/include/coap_config_posix.h

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* libcoap configure implementation for ESP32 platform.
3+
*
4+
* Uses libcoap software implementation for failover when concurrent
5+
* configure operations are in use.
6+
*
7+
* coap.h -- main header file for CoAP stack of libcoap
8+
*
9+
* Copyright (C) 2010-2012,2015-2016 Olaf Bergmann <[email protected]>
10+
* 2015 Carsten Schoenert <[email protected]>
11+
*
12+
* Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
13+
*
14+
* This file is part of the CoAP library libcoap. Please see README for terms
15+
* of use.
16+
*/
17+
18+
#ifndef COAP_CONFIG_POSIX_H_
19+
#define COAP_CONFIG_POSIX_H_
20+
21+
#ifdef WITH_POSIX
22+
23+
#include <sys/socket.h>
24+
#include <net/if.h>
25+
26+
#define HAVE_SYS_SOCKET_H
27+
#define HAVE_MALLOC
28+
#define HAVE_ARPA_INET_H
29+
#define HAVE_TIME_H
30+
#define HAVE_NETDB_H
31+
#define HAVE_NETINET_IN_H
32+
#define HAVE_STRUCT_CMSGHDR
33+
#define COAP_DISABLE_TCP 0
34+
35+
#define ipi_spec_dst ipi_addr
36+
struct in6_pktinfo {
37+
struct in6_addr ipi6_addr; /* src/dst IPv6 address */
38+
unsigned int ipi6_ifindex; /* send/recv interface index */
39+
};
40+
#define IN6_IS_ADDR_V4MAPPED(a) \
41+
((((__const uint32_t *) (a))[0] == 0) \
42+
&& (((__const uint32_t *) (a))[1] == 0) \
43+
&& (((__const uint32_t *) (a))[2] == htonl (0xffff)))
44+
45+
/* As not defined, just need to define is as something innocuous */
46+
#define IPV6_PKTINFO IPV6_CHECKSUM
47+
48+
#define PACKAGE_NAME "libcoap-posix"
49+
#define PACKAGE_VERSION "?"
50+
51+
#ifdef CONFIG_MBEDTLS_TLS_ENABLED
52+
#define HAVE_MBEDTLS
53+
#endif /* CONFIG_MBEDTLS_TLS_ENABLED */
54+
#define COAP_CONSTRAINED_STACK 1
55+
#define ESPIDF_VERSION
56+
57+
#define gai_strerror(x) "gai_strerror() not supported"
58+
59+
#endif /* WITH_POSIX */
60+
#endif /* COAP_CONFIG_POSIX_H_ */

Diff for: ‎tools/sdk/esp32s2/include/hal/esp32s2/include/hal/i2s_ll.h

-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ static inline void i2s_ll_enable_clock(i2s_dev_t *hw)
101101
* @brief I2S module disable clock.
102102
*
103103
* @param hw Peripheral I2S hardware instance address.
104-
* @param enable Set true to enable tx msb right
105104
*/
106105
static inline void i2s_ll_disable_clock(i2s_dev_t *hw)
107106
{

Diff for: ‎tools/sdk/esp32s2/include/hal/include/hal/i2s_hal.h

-6
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,13 @@ typedef struct {
106106
* @brief Reset I2S RX channel
107107
*
108108
* @param hal Context of the HAL layer
109-
* @param i2s_num The uart port number, the max port number is (I2S_NUM_MAX -1)
110109
*/
111110
#define i2s_hal_reset_rx(hal) i2s_ll_rx_reset((hal)->dev)
112111

113112
/**
114113
* @brief Reset I2S RX fifo
115114
*
116115
* @param hal Context of the HAL layer
117-
* @param sel The source clock index
118116
*/
119117
#define i2s_hal_reset_rx_fifo(hal) i2s_ll_rx_reset_fifo((hal)->dev)
120118

@@ -227,7 +225,6 @@ void i2s_hal_enable_slave_fd_mode(i2s_hal_context_t *hal);
227225
*/
228226
#define i2s_hal_set_rx_sample_bit(hal, chan_bit, data_bit) i2s_ll_rx_set_sample_bit((hal)->dev, chan_bit, data_bit)
229227

230-
#if SOC_I2S_SUPPORTS_PCM
231228
/**
232229
* @brief Configure I2S TX module clock devider
233230
*
@@ -268,7 +265,6 @@ void i2s_hal_rx_clock_config(i2s_hal_context_t *hal, i2s_hal_clock_cfg_t *clk_cf
268265
*/
269266
#define i2s_hal_tx_enable_slave_mode(hal, enable) i2s_ll_tx_set_slave_mod((hal)->dev, enable)
270267

271-
#if SOC_I2S_SUPPORTS_PDM_TX
272268
/**
273269
* @brief Enable I2S rx slave mode
274270
*
@@ -281,8 +277,6 @@ void i2s_hal_rx_clock_config(i2s_hal_context_t *hal, i2s_hal_clock_cfg_t *clk_cf
281277
* @brief Enable loopback mode
282278
*
283279
* @param hal Context of the HAL layer
284-
* @return
285-
* - fp configuration paramater
286280
*/
287281
#define i2s_hal_enable_sig_loopback(hal) i2s_ll_share_bck_ws((hal)->dev, true)
288282

Diff for: ‎tools/sdk/esp32s2/include/spi_flash/include/spi_flash_private.h

-12
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,6 @@
3333
extern "C" {
3434
#endif
3535

36-
/**
37-
* This struct provide MSPI Flash necessary timing related config
38-
*/
39-
typedef struct {
40-
uint8_t flash_clk_div; /*!< clock divider of Flash module. */
41-
uint8_t flash_extra_dummy; /*!< timing required extra dummy length for Flash */
42-
bool flash_setup_en; /*!< SPI0/1 Flash setup enable or not */
43-
uint8_t flash_setup_time; /*!< SPI0/1 Flash setup time. This value should be set to register directly */
44-
bool flash_hold_en; /*!< SPI0/1 Flash hold enable or not */
45-
uint8_t flash_hold_time; /*!< SPI0/1 Flash hold time. This value should be set to register directly */
46-
} spi_timing_flash_config_t;
47-
4836
/**
4937
* @brief Register ROM functions and init flash device registers to make use of octal flash
5038
*/

0 commit comments

Comments
 (0)