mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-20 00:36:01 -04:00
Merge branch 'bugfix/cpp_extern' into 'master'
Add extern C header guards to some files Closes IDFGH-2025 and IDFGH-2093 See merge request espressif/esp-idf!6611
This commit is contained in:
commit
a74988ae3b
@ -15,6 +15,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file esp32/clk.h
|
* @file esp32/clk.h
|
||||||
*
|
*
|
||||||
@ -85,3 +89,7 @@ int esp_clk_xtal_freq(void);
|
|||||||
* @return Value or RTC counter, expressed in microseconds
|
* @return Value or RTC counter, expressed in microseconds
|
||||||
*/
|
*/
|
||||||
uint64_t esp_clk_rtc_time(void);
|
uint64_t esp_clk_rtc_time(void);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@ -13,6 +13,11 @@
|
|||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file esp_clk.h
|
* @file esp_clk.h
|
||||||
@ -73,3 +78,7 @@ int esp_clk_apb_freq(void);
|
|||||||
* @return Value or RTC counter, expressed in microseconds
|
* @return Value or RTC counter, expressed in microseconds
|
||||||
*/
|
*/
|
||||||
uint64_t esp_clk_rtc_time(void);
|
uint64_t esp_clk_rtc_time(void);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@ -17,6 +17,10 @@
|
|||||||
#include "hal/spi_types.h"
|
#include "hal/spi_types.h"
|
||||||
#include "esp_flash.h"
|
#include "esp_flash.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
/// Configurations for the SPI Flash to init
|
/// Configurations for the SPI Flash to init
|
||||||
typedef struct {
|
typedef struct {
|
||||||
spi_host_device_t host_id; ///< Bus to use
|
spi_host_device_t host_id; ///< Bus to use
|
||||||
@ -53,3 +57,6 @@ esp_err_t spi_bus_add_flash_device(esp_flash_t **out_chip, const esp_flash_spi_d
|
|||||||
*/
|
*/
|
||||||
esp_err_t spi_bus_remove_flash_device(esp_flash_t *chip);
|
esp_err_t spi_bus_remove_flash_device(esp_flash_t *chip);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user