MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Evict c_types.h, tidy up a other c_prefixes. (#2841)

This commit is contained in:
Johny Mattsson 2019-07-23 14:22:38 +10:00 committed by GitHub
parent 526d21dab4
commit f7a545b951
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
81 changed files with 250 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -33,7 +33,9 @@ SDK_DIR := $(TOP_DIR)/$(SDK_REL_DIR)
ESPTOOL_VER := 2.6
# Ensure that the Espresif SDK is searched before the tool-chain's SDK (if any)
CCFLAGS:= -I$(TOP_DIR)/sdk-overrides/include -I$(TOP_DIR)/app/include/lwip/app -I$(SDK_DIR)/include
# Also, prevent the SDK's c_types.h from being included from anywhere, by
# predefining its include-guard.
CCFLAGS:= -I$(TOP_DIR)/sdk-overrides/include -I$(TOP_DIR)/app/include/lwip/app -I$(SDK_DIR)/include -D_C_TYPES_H_
LDFLAGS:= -L$(SDK_DIR)/lib -L$(SDK_DIR)/ld $(LDFLAGS)
ifdef DEBUG

2
app/coap/coap_client.c
View File

@ -1,5 +1,5 @@
#include "user_config.h"
#include "c_types.h"
#include <stdint.h>
#include "coap.h"
#include "hash.h"

1
app/coap/coap_io.h
View File

@ -5,7 +5,6 @@
extern "C" {
#endif
#include "c_types.h"
#include "lwip/ip_addr.h"
#include "espconn.h"
#include "pdu.h"

3
app/coap/coap_server.c
View File

@ -1,5 +1,6 @@
#include "user_config.h"
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include <stdlib.h>
#include "coap.h"

2
app/coap/str.c
View File

@ -7,7 +7,7 @@
*/
#include <stdlib.h>
#include "c_types.h"
#include <stddef.h>
#include "str.h"

5
app/crypto/digests.h
View File

@ -1,12 +1,13 @@
#ifndef _CRYPTO_DIGESTS_H_
#define _CRYPTO_DIGESTS_H_
#include <c_types.h>
#include <stdint.h>
#include <stddef.h>
typedef void (*create_ctx_fn)(void *ctx);
typedef void (*update_ctx_fn)(void *ctx, const uint8_t *msg, int len);
typedef void (*finalize_ctx_fn)(uint8_t *digest, void *ctx);
typedef sint32_t ( *read_fn )(int fd, void *ptr, size_t len);
typedef int32_t ( *read_fn )(int fd, void *ptr, size_t len);
/**
* Description of a message digest mechanism.

4
app/crypto/mech.h
View File

@ -1,7 +1,9 @@
#ifndef _MECH_H_
#define _MECH_H_
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
typedef struct
{

3
app/crypto/sha2.h
View File

@ -1,7 +1,8 @@
#ifndef __SHA2_H__
#define __SHA2_H__
#include <c_types.h>
#include <stdint.h>
#include <stddef.h>
/**************************************************************************
* SHA256/384/512 declarations

4
app/dht/dht.h
View File

@ -17,7 +17,7 @@
// #else
// #include <Arduino.h>
// #endif
#include "c_types.h"
#include <stdint.h>
#define DHT_LIB_VERSION "0.1.14"
@ -67,4 +67,4 @@ double dht_getTemperature(void);
#endif
//
// END OF FILE
//
//

4
app/driver/pwm2.c
View File

@ -5,8 +5,8 @@
* Nikolay Fiykov
*/
#include <stdlib.h>
#include "c_types.h"
#include <stddef.h>
#include <stdint.h>
#include "mem.h"
#include "pin_map.h"
#include "platform.h"

2
app/driver/readline.c
View File

@ -2,7 +2,7 @@
#include "os_type.h"
#include "osapi.h"
#include "driver/uart.h"
#include "c_types.h"
#include <stdint.h>
LOCAL os_timer_t readline_timer;

2
app/driver/rotary.c
View File

@ -11,7 +11,7 @@
*/
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include "driver/rotary.h"

3
app/driver/switec.c
View File

@ -14,7 +14,8 @@
*/
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include "driver/switec.h"

1
app/esp-gdbstub/gdbstub.c
View File

@ -10,7 +10,6 @@
#include "gdbstub.h"
#include "ets_sys.h"
#include "eagle_soc.h"
#include "c_types.h"
#include "gpio.h"
#include "xtensa/corebits.h"
#include "driver/uart.h"

2
app/include/arch/cc.h
View File

@ -35,7 +35,7 @@
#define __ARCH_CC_H__
//#include <string.h>
#include "c_types.h"
#include <stdint.h>
#include "ets_sys.h"
#include "osapi.h"
#define EFAULT 14

3
app/include/driver/onewire.h
View File

@ -1,7 +1,8 @@
#ifndef __ONEWIRE_H__
#define __ONEWIRE_H__
#include "c_types.h"
#include <stdint.h>
#include <stdbool.h>
// You can exclude certain features from OneWire. In theory, this
// might save some space. In practice, the compiler automatically

2
app/include/driver/pwm2.h
View File

@ -8,7 +8,7 @@
#ifndef __PWM2_H__
#define __PWM2_H__
#include "c_types.h"
#include <stdint.h>
#include "pin_map.h"
typedef struct {

2
app/include/driver/rotary.h
View File

@ -4,7 +4,7 @@
#ifndef __ROTARY_H__
#define __ROTARY_H__
#include "c_types.h"
#include <stdint.h>
#define ROTARY_CHANNEL_COUNT 3

2
app/include/driver/switec.h
View File

@ -4,7 +4,7 @@
#ifndef __SWITEC_H__
#define __SWITEC_H__
#include "c_types.h"
#include <stdint.h>
#define SWITEC_CHANNEL_COUNT 3

2
app/include/driver/uart.h
View File

@ -3,7 +3,7 @@
#include "uart_register.h"
#include "eagle_soc.h"
#include "c_types.h"
#include <stdint.h>
#include "os_type.h"
#define RX_BUFF_SIZE 0x100

3
app/include/lwip/app/espconn_buf.h
View File

@ -14,7 +14,8 @@
* Created on: Apr 22, 2016
* Author: liuhan
*/
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include "ets_sys.h"
#include "os_type.h"

2
app/include/pm/pmSleep.h
View File

@ -1,7 +1,7 @@
#ifndef __FPM_SLEEP_H__
#define __FPM_SLEEP_H__
#include "user_interface.h"
#include "c_types.h"
#include <stdint.h>
#include "lauxlib.h"
#include "gpio.h"
#include "platform.h"

2
app/include/rom.h
View File

@ -3,7 +3,7 @@
#ifndef _ROM_H_
#define _ROM_H_
#include "c_types.h"
#include <stdint.h>
#include "ets_sys.h"
// SHA1 is assumed to match the netbsd sha1.h headers

2
app/include/rtc/rtcaccess.h
View File

@ -1,7 +1,7 @@
#ifndef RTC_ACCESS_H
#define RTC_ACCESS_H
#include <c_types.h>
#include <stdint.h>
#define RTC_MMIO_BASE 0x60000700
#define RTC_USER_MEM_BASE 0x60001200

2
app/include/rtc/rtctime.h
View File

@ -38,7 +38,7 @@
* relevant functions and expose these instead, through the rtctime.c module.
*/
#include <c_types.h>
#include <stdint.h>
#include "sections.h"
#ifndef _RTCTIME_INTERNAL_H_

3
app/include/user_mbedtls.h
View File

@ -1,4 +1,5 @@
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include "user_config.h"

1
app/libc/stdlib.c
View File

@ -3,6 +3,7 @@
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
#include <stdint.h>
#ifdef LUA_CROSS_COMPILER
#define ICACHE_RODATA_ATTR

1
app/lua/legc.c
View File

@ -2,7 +2,6 @@
#include "legc.h"
#include "lstate.h"
#include "c_types.h"
void legc_set_mode(lua_State *L, int mode, int limit) {
global_State *g = G(L);

61
app/lua/luac_cross.h
View File

@ -6,73 +6,14 @@
#define luac_cross_h
#ifdef LUA_CROSS_COMPILER
#define C_HEADER_ASSERT <assert.h>
#define C_HEADER_CTYPE <ctype.h>
#define C_HEADER_ERRNO <errno.h>
#define C_HEADER_FCNTL <fcntl.h>
#define C_HEADER_LOCALE <locale.h>
#define C_HEADER_MATH <math.h>
#define C_HEADER_STDIO <stdio.h>
#define C_HEADER_STDLIB <stdlib.h>
#define C_HEADER_STRING <string.h>
#define C_HEADER_TIME <time.h>
#define ICACHE_RODATA_ATTR
#define c_abs abs
#define c_exit exit
#define c_fclose fclose
#define c_feof feof
#define c_ferror ferror
#define c_fopen fopen
#define c_fread fread
#define c_free free
#define c_freopen freopen
#define c_getc getc
#define c_getenv getenv
#define c_malloc malloc
#define c_memcmp memcmp
#define c_memcpy memcpy
#define c_printf printf
#define c_puts puts
#define c_reader reader
#define c_realloc realloc
#define c_sprintf sprintf
#define c_stderr stderr
#define c_stdin stdin
#define c_stdout stdout
#define c_strcat strcat
#define c_strchr strchr
#define c_strcmp strcmp
#define c_strcoll strcoll
#define c_strcpy strcpy
#define c_strcspn strcspn
#define c_strerror strerror
#define c_strlen strlen
#define c_strncat strncat
#define c_strncmp strncmp
#define c_strncpy strncpy
#define c_strpbrk strpbrk
#define c_strrchr strrchr
#define c_strstr strstr
double c_strtod(const char *__n, char **__end_PTR);
#define c_ungetc ungetc
#define c_strtol strtol
#define c_strtoul strtoul
#define dbg_printf printf
#else
#define C_HEADER_ASSERT "c_assert.h"
#define C_HEADER_CTYPE "c_ctype.h"
#define C_HEADER_ERRNO "c_errno.h"
#define C_HEADER_FCNTL "c_fcntl.h"
#define C_HEADER_LOCALE "c_locale.h"
#define C_HEADER_MATH "c_math.h"
#define C_HEADER_STDIO "c_stdio.h"
#define C_HEADER_STDLIB "c_stdlib.h"
#define C_HEADER_STRING "c_string.h"
#define C_HEADER_TIME "c_time.h"
#endif /* LUA_CROSS_COMPILER */
#endif /* luac_cross_h */

8
app/lua/luac_cross/lflashimg.c
View File

@ -7,10 +7,10 @@
#define LUAC_CROSS_FILE
#include "luac_cross.h"
#include C_HEADER_CTYPE
#include C_HEADER_STDIO
#include C_HEADER_STDLIB
#include C_HEADER_STRING
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define lflashimg_c
#define LUA_CORE

12
app/lua/luac_cross/loslib.c
View File

@ -7,11 +7,11 @@
#define LUAC_CROSS_FILE
#include "luac_cross.h"
#include C_HEADER_ERRNO
#include C_HEADER_LOCALE
#include C_HEADER_STDLIB
#include C_HEADER_STRING
#include C_HEADER_TIME
#include <errno.h>
#include <locale.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#define loslib_c
#define LUA_LIB
@ -217,7 +217,7 @@ static int os_setlocale (lua_State *L) {
static int os_exit (lua_State *L) {
c_exit(luaL_optint(L, 1, EXIT_SUCCESS));
exit(luaL_optint(L, 1, EXIT_SUCCESS));
}
LROT_PUBLIC_BEGIN(oslib)

8
app/lua/luac_cross/luac.c
View File

@ -7,10 +7,10 @@
#define LUAC_CROSS_FILE
#include "luac_cross.h"
#include C_HEADER_ERRNO
#include C_HEADER_STDIO
#include C_HEADER_STDLIB
#include C_HEADER_STRING
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#define luac_c

4
app/lua/luac_cross/print.c
View File

@ -7,8 +7,8 @@
#define LUAC_CROSS_FILE
#include "luac_cross.h"
#include C_HEADER_CTYPE
#include C_HEADER_STDIO
#include <ctype.h>
#include <stdio.h>
#define luac_c
#define LUA_CORE

2
app/lwip/core/sys_arch.c
View File

@ -2,7 +2,7 @@
* copyright (c) 2010 - 2011 espressif system
*/
#include "c_types.h"
#include <stdint.h>
#include "ets_sys.h"
#include "osapi.h"
#include "os_type.h"

2
app/mbedtls/app/Espconn_mem.c
View File

@ -1,4 +1,4 @@
#include "c_types.h"
#include <stdint.h>
#include "mem.h"
#include "user_interface.h"

2
app/mbedtls/app/lwIPFile.c
View File

@ -22,7 +22,7 @@
*
*/
#include "c_types.h"
#include <stdint.h>
#include <stdio.h>
//#include "os.h"

2
app/modules/adc.c
View File

@ -4,7 +4,7 @@
#include "lauxlib.h"
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
#include "user_interface.h"
// Lua: read(id) , return system adc

2
app/modules/bloom.c
View File

@ -7,7 +7,7 @@
#include "module.h"
#include "lauxlib.h"
#include <string.h>
#include "c_types.h"
#include <stdint.h>
#include "../crypto/sha2.h"
#if defined(LUA_USE_MODULES_BLOOM) && !defined(SHA2_ENABLE)

4
app/modules/coap.c
View File

@ -5,9 +5,9 @@
#include "platform.h"
#include <string.h>
#include <stdlib.h>
#include <stddef.h>
#include "c_types.h"
#include <stdint.h>
#include "mem.h"
#include "lwip/ip_addr.h"
#include "espconn.h"

4
app/modules/cron.c
View File

@ -4,12 +4,12 @@
#include "lauxlib.h"
#include "lmem.h"
#include "user_interface.h"
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include <string.h>
#include "ets_sys.h"
#include "time.h"
#include "rtc/rtctime.h"
#include "stdlib.h"
#include "mem.h"
struct cronent_desc {

4
app/modules/crypto.c
View File

@ -4,8 +4,8 @@
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "c_types.h"
#include <stdlib.h>
#include <stdint.h>
#include <stddef.h>
#include "vfs.h"
#include "../crypto/digests.h"
#include "../crypto/mech.h"

2
app/modules/file.c
View File

@ -5,7 +5,7 @@
#include "lmem.h"
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
#include "vfs.h"
#include <string.h>

2
app/modules/gdbstub.c
View File

@ -17,7 +17,7 @@
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
#include "user_interface.h"
#include "../esp-gdbstub/gdbstub.h"

2
app/modules/gpio.c
View File

@ -6,7 +6,7 @@
#include "lmem.h"
#include "platform.h"
#include "user_interface.h"
#include "c_types.h"
#include <stdint.h>
#include <string.h>
#include "gpio.h"
#include "hw_timer.h"

2
app/modules/gpio_pulse.c
View File

@ -3,7 +3,7 @@
#include "lmem.h"
#include "platform.h"
#include "user_interface.h"
#include "c_types.h"
#include <stdint.h>
#include <string.h>
#include "gpio.h"
#include "hw_timer.h"

2
app/modules/mdns.c
View File

@ -7,7 +7,7 @@
#include <stdlib.h>
#include <alloca.h>
#include "c_types.h"
#include <stdint.h>
#include "lwip/ip_addr.h"
#include "nodemcu_mdns.h"
#include "user_interface.h"

4
app/modules/mqtt.c
View File

@ -5,9 +5,9 @@
#include "platform.h"
#include <string.h>
#include <stdlib.h>
#include <stddef.h>
#include "c_types.h"
#include <stdint.h>
#include "mem.h"
#include "lwip/ip_addr.h"
#include "espconn.h"

4
app/modules/net.c
View File

@ -7,9 +7,9 @@
#include <string.h>
#include <strings.h>
#include <stdlib.h>
#include <stddef.h>
#include "c_types.h"
#include <stdint.h>
#include "mem.h"
#include "osapi.h"
#include "lwip/err.h"

2
app/modules/node.c
View File

@ -16,7 +16,7 @@
#include "platform.h"
#include "lflash.h"
#include "c_types.h"
#include <stdint.h>
#include <string.h>
#include "driver/uart.h"
#include "user_interface.h"

2
app/modules/pwm.c
View File

@ -3,7 +3,7 @@
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
// Lua: realfrequency = setup( id, frequency, duty )
static int lpwm_setup( lua_State* L )

2
app/modules/pwm2.c
View File

@ -7,7 +7,7 @@
// Module for interfacing with PWM2 driver
#include "c_types.h"
#include <stdint.h>
#include "lauxlib.h"
#include "module.h"
#include "driver/pwm2.h"

4
app/modules/rotary.c
View File

@ -9,10 +9,10 @@
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
#include <stdlib.h>
#include "user_interface.h"
#include "driver/rotary.h"
#include <stdlib.h>
#define MASK(x) (1 << ROTARY_ ## x ## _INDEX)

3
app/modules/somfy.c
View File

@ -11,6 +11,7 @@
//#define NODE_DEBUG
#include <stdint.h>
#include "os_type.h"
#include "osapi.h"
#include "sections.h"
@ -245,4 +246,4 @@ int luaopen_somfy( lua_State *L ) {
return 0;
}
NODEMCU_MODULE(SOMFY, "somfy", somfy, luaopen_somfy);
NODEMCU_MODULE(SOMFY, "somfy", somfy, luaopen_somfy);

2
app/modules/sqlite3.c
View File

@ -30,7 +30,7 @@
#define LSQLITE_OMIT_UPDATE_HOOK 1
#define SQLITE_OMIT_PROGRESS_CALLBACK 1
#include <c_stdlib.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>

2
app/modules/switec.c
View File

@ -16,7 +16,7 @@
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
#include "task/task.h"
#include "driver/switec.h"

4
app/modules/tls.c
View File

@ -9,9 +9,9 @@
#include "lmem.h"
#include <string.h>
#include <stdlib.h>
#include <stddef.h>
#include "c_types.h"
#include <stdint.h>
#include "mem.h"
#include "lwip/ip_addr.h"
#include "espconn.h"

2
app/modules/tmr.c
View File

@ -51,7 +51,7 @@ tmr.softwd(int)
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
#include "user_interface.h"
#include "pm/swtimer.h"

2
app/modules/uart.c
View File

@ -4,7 +4,7 @@
#include "lauxlib.h"
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
#include <string.h>
#include "rom.h"

4
app/modules/websocket.c
View File

@ -13,9 +13,9 @@
#include "platform.h"
#include "module.h"
#include "c_types.h"
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <stddef.h>
#include "websocketclient.h"

4
app/modules/wifi.c
View File

@ -7,10 +7,10 @@
#include "platform.h"
#include <string.h>
#include <stdlib.h>
#include <stddef.h>
#include "ctype.h"
#include "c_types.h"
#include <stdint.h>
#include "user_interface.h"
#include "wifi_common.h"

4
app/modules/wifi_eventmon.c
View File

@ -5,9 +5,9 @@
#include "platform.h"
#include <string.h>
#include <stdlib.h>
#include <stddef.h>
#include "c_types.h"
#include <stdint.h>
#include "user_interface.h"
#include "smart.h"
#include "smartconfig.h"

4
app/modules/wifi_monitor.c
View File

@ -6,10 +6,10 @@
#include "platform.h"
#include <string.h>
#include <stdlib.h>
#include <stddef.h>
#include "ctype.h"
#include "c_types.h"
#include <stdint.h>
#include "user_interface.h"
#include "wifi_common.h"
#include "sys/network_80211.h"

2
app/mqtt/mqtt_msg.h
View File

@ -7,7 +7,7 @@
#ifndef MQTT_MSG_H
#define MQTT_MSG_H
#include "c_types.h"
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif

3
app/platform/cpu_esp8266.h
View File

@ -2,6 +2,9 @@
#define __CPU_ESP8266_H__
#ifndef NO_CPU_ESP8266_INCLUDE
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
#include "os_type.h"
#include "spi_flash.h"
#include "pin_map.h"

2
app/platform/pin_map.h
View File

@ -2,7 +2,7 @@
#ifndef __PIN_MAP_H__
#define __PIN_MAP_H__
#include "c_types.h"
#include <stdint.h>
#include "user_config.h"
#include "gpio.h"

2
app/platform/platform.h
View File

@ -3,9 +3,9 @@
#ifndef __PLATFORM_H__
#define __PLATFORM_H__
#include <stdint.h>
#include "cpu_esp8266.h"
#include "c_types.h"
#include "driver/pwm.h"
#include "driver/uart.h"
#include "task/task.h"

2
app/platform/sdcard.c
View File

@ -1,6 +1,6 @@
#include "platform.h"
#include "driver/spi.h"
#include "c_types.h"
#include <stdint.h>
#include "sdcard.h"

3
app/platform/sdcard.h
View File

@ -1,7 +1,8 @@
#ifndef _SDCARD_H
#define _SDCARD_H
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
int platform_sdcard_init( uint8_t spi_no, uint8_t ss_pin );
int platform_sdcard_status( void );

4
app/pm/swtimer.c
View File

@ -48,8 +48,8 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
//#define SWTMR_DEBUG
#if !defined(SWTMR_DBG) && defined(LUA_USE_MODULES_SWTMR_DBG)

2
app/sjson/memcompat.h
View File

@ -1,7 +1,7 @@
#ifndef __MEMCOMPAT_H__
#define __MEMCOMPAT_H__
#include "c_types.h"
#include <stdint.h>
#include "mem.h"
#endif

4
app/sqlite3/esp8266.c
View File

@ -8,9 +8,9 @@
**/
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
#include "c_types.h"
#include <stdint.h>
#include <osapi.h>
#include <vfs.h>
#include <time.h>

92
app/sqlite3/sqlite3.c
View File

@ -2795,7 +2795,7 @@ SQLITE_API void sqlite3_free_table(char **result);
** table and column names into a constructed SQL statement.
**
** ^(The "%z" formatting option works like "%s" but with the
** addition that after the c_string has been read and copied into
** addition that after the string has been read and copied into
** the result, [sqlite3_free()] is called on the input string.)^
*/
SQLITE_API char *sqlite3_mprintf(const char*,...);
@ -29771,7 +29771,7 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
/*
** standard include files.
*/
#include <sys/c_types.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
@ -78053,7 +78053,7 @@ static int findNextHostParameter(const char *zSql, int *pnToken){
** obtained from sqlite3DbMalloc(). If sqlite3.nVdbeExec is 1, then the
** string contains a copy of zRawSql but with host parameters expanded to
** their current bindings. Or, if sqlite3.nVdbeExec is greater than 1,
** then the returned c_string holds a copy of zRawSql with "-- " prepended
** then the returned string holds a copy of zRawSql with "-- " prepended
** to each line of text.
**
** If the SQLITE_TRACE_SIZE_LIMIT macro is defined to an integer, then
@ -89198,8 +89198,8 @@ SQLITE_PRIVATE int sqlite3JournalSize(sqlite3_vfs *pVfs){
** an SQL statement.
*/
/* #include "sqliteInt.h" */
/* #include <c_stdlib.h> */
/* #include <c_string.h> */
/* #include <stdlib.h> */
/* #include <string.h> */
/*
@ -105553,7 +105553,7 @@ SQLITE_PRIVATE void sqlite3ResolvePartIdxLabel(Parse *pParse, int iLabel){
** time functions, are implemented separately.)
*/
/* #include "sqliteInt.h" */
/* #include <c_stdlib.h> */
/* #include <stdlib.h> */
/* #include <assert.h> */
/* #include "vdbeInt.h" */
@ -108885,7 +108885,7 @@ SQLITE_PRIVATE void sqlite3OpenTable(
/*
** Return a pointer to the column affinity string associated with index
** pIdx. A column affinity c_string has one character for each column in
** pIdx. A column affinity string has one character for each column in
** the table, according to the affinity of the column:
**
** Character Column affinity
@ -108951,7 +108951,7 @@ SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){
** then just set the P4 operand of the previous opcode (which should be
** an OP_MakeRecord) to the affinity string.
**
** A column affinity c_string has one character per column:
** A column affinity string has one character per column:
**
** Character Column affinity
** ------------------------------
@ -135437,7 +135437,7 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
** The following is the concatenation of all %include directives from the
** input grammar file:
*/
/* #include <c_stdio.h> */
/* #include <stdio.h> */
/************ Begin %include sections from the grammar ************************/
/* #include "sqliteInt.h" */
@ -136309,7 +136309,7 @@ struct yyParser {
typedef struct yyParser yyParser;
#ifndef NDEBUG
/* #include <c_stdio.h> */
/* #include <stdio.h> */
static FILE *yyTraceFILE = 0;
static char *yyTracePrompt = 0;
#endif /* NDEBUG */
@ -138629,7 +138629,7 @@ SQLITE_PRIVATE void sqlite3Parser(
** parser for analysis.
*/
/* #include "sqliteInt.h" */
/* #include <c_stdlib.h> */
/* #include <stdlib.h> */
/* Character classes for tokenizing
**
@ -145471,10 +145471,10 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeIsdiacritic(int);
#endif
/* #include <assert.h> */
/* #include <c_stdlib.h> */
/* #include <stdlib.h> */
/* #include <stddef.h> */
/* #include <c_stdio.h> */
/* #include <c_string.h> */
/* #include <stdio.h> */
/* #include <string.h> */
/* #include <stdarg.h> */
/* #include "fts3.h" */
@ -151141,7 +151141,7 @@ SQLITE_API int sqlite3_fts3_init(
/* #include "fts3Int.h" */
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
/* #include <c_string.h> */
/* #include <string.h> */
/* #include <assert.h> */
typedef struct Fts3auxTable Fts3auxTable;
@ -151758,7 +151758,7 @@ SQLITE_API int sqlite3_fts3_enable_parentheses = 0;
*/
#define SQLITE_FTS3_DEFAULT_NEAR_PARAM 10
/* #include <c_string.h> */
/* #include <string.h> */
/* #include <assert.h> */
/*
@ -152786,7 +152786,7 @@ SQLITE_PRIVATE void sqlite3Fts3ExprFree(Fts3Expr *pDel){
#ifdef SQLITE_TEST
/* #include <c_stdio.h> */
/* #include <stdio.h> */
/*
** Function to query the hash-table of tokenizers (see README.tokenizers).
@ -153019,8 +153019,8 @@ SQLITE_PRIVATE int sqlite3Fts3ExprInitTestInterface(sqlite3* db){
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
/* #include <assert.h> */
/* #include <c_stdlib.h> */
/* #include <c_string.h> */
/* #include <stdlib.h> */
/* #include <string.h> */
/* #include "fts3_hash.h" */
@ -153404,9 +153404,9 @@ SQLITE_PRIVATE void *sqlite3Fts3HashInsert(
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
/* #include <assert.h> */
/* #include <c_stdlib.h> */
/* #include <c_stdio.h> */
/* #include <c_string.h> */
/* #include <stdlib.h> */
/* #include <stdio.h> */
/* #include <string.h> */
/* #include "fts3_tokenizer.h" */
@ -154070,7 +154070,7 @@ SQLITE_PRIVATE void sqlite3Fts3PorterTokenizerModule(
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
/* #include <assert.h> */
/* #include <c_string.h> */
/* #include <string.h> */
/*
** Return true if the two-argument version of fts3_tokenizer()
@ -154272,7 +154272,7 @@ SQLITE_PRIVATE int sqlite3Fts3InitTokenizer(
#else
# include "tcl.h"
#endif
/* #include <c_string.h> */
/* #include <string.h> */
/*
** Implementation of a special SQL scalar function for testing tokenizers
@ -154588,9 +154588,9 @@ SQLITE_PRIVATE int sqlite3Fts3InitHashTable(
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
/* #include <assert.h> */
/* #include <c_stdlib.h> */
/* #include <c_stdio.h> */
/* #include <c_string.h> */
/* #include <stdlib.h> */
/* #include <stdio.h> */
/* #include <string.h> */
/* #include "fts3_tokenizer.h" */
@ -154840,7 +154840,7 @@ SQLITE_PRIVATE void sqlite3Fts3SimpleTokenizerModule(
/* #include "fts3Int.h" */
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
/* #include <c_string.h> */
/* #include <string.h> */
/* #include <assert.h> */
typedef struct Fts3tokTable Fts3tokTable;
@ -155276,9 +155276,9 @@ SQLITE_PRIVATE int sqlite3Fts3InitTok(sqlite3 *db, Fts3Hash *pHash){
/* #include "fts3Int.h" */
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
/* #include <c_string.h> */
/* #include <string.h> */
/* #include <assert.h> */
/* #include <c_stdlib.h> */
/* #include <stdlib.h> */
#define FTS_MAX_APPENDABLE_HEIGHT 16
@ -160954,7 +160954,7 @@ SQLITE_PRIVATE int sqlite3Fts3Optimize(Fts3Table *p){
/* #include "fts3Int.h" */
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
/* #include <c_string.h> */
/* #include <string.h> */
/* #include <assert.h> */
/*
@ -162124,7 +162124,7 @@ static int fts3MatchinfoLcs(Fts3Cursor *pCsr, MatchInfo *pInfo){
** be returned by the matchinfo() function. Argument zArg contains the
** format string passed as the second argument to matchinfo (or the
** default value "pcx" if no second argument was specified). The format
** c_string has already been validated and the pInfo->aMatchinfo[] array
** string has already been validated and the pInfo->aMatchinfo[] array
** is guaranteed to be large enough for the output.
**
** If bGlobal is true, then populate all fields of the matchinfo() output.
@ -162668,9 +162668,9 @@ SQLITE_PRIVATE void sqlite3Fts3Matchinfo(
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
/* #include <assert.h> */
/* #include <c_stdlib.h> */
/* #include <c_stdio.h> */
/* #include <c_string.h> */
/* #include <stdlib.h> */
/* #include <stdio.h> */
/* #include <string.h> */
/* #include "fts3_tokenizer.h" */
@ -163473,9 +163473,9 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeFold(int c, int bRemoveDiacritic){
/* #include "sqlite3.h" */
#endif
/* #include <c_string.h> */
/* #include <string.h> */
/* #include <assert.h> */
/* #include <c_stdio.h> */
/* #include <stdio.h> */
#ifndef SQLITE_AMALGAMATION
#include "sqlite3rtree.h"
@ -168105,8 +168105,8 @@ SQLITE_PRIVATE void sqlite3Fts3IcuTokenizerModule(
*/
/* #include <assert.h> */
/* #include <c_string.h> */
/* #include <c_stdio.h> */
/* #include <string.h> */
/* #include <stdio.h> */
/* #include "sqlite3.h" */
@ -174118,7 +174118,7 @@ SQLITE_PRIVATE int sqlite3DbstatRegister(sqlite3 *db){ return SQLITE_OK; }
#if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
/* #include "sqlite3session.h" */
/* #include <assert.h> */
/* #include <c_string.h> */
/* #include <string.h> */
#ifndef SQLITE_AMALGAMATION
/* # include "sqliteInt.h" */
@ -178800,8 +178800,8 @@ SQLITE_API int sqlite3changeset_concat_strm(
#endif
SQLITE_EXTENSION_INIT1
/* #include <assert.h> */
/* #include <c_string.h> */
/* #include <c_stdlib.h> */
/* #include <string.h> */
/* #include <stdlib.h> */
/* #include <stdarg.h> */
/* Mark a function parameter as unused, to suppress nuisance compiler
@ -181812,7 +181812,7 @@ struct fts5_api {
/* #include "sqlite3ext.h" */
SQLITE_EXTENSION_INIT1
/* #include <c_string.h> */
/* #include <string.h> */
/* #include <assert.h> */
#ifndef SQLITE_AMALGAMATION
@ -182624,7 +182624,7 @@ static int sqlite3Fts5UnicodeFold(int c, int bRemoveDiacritic);
** The following is the concatenation of all %include directives from the
** input grammar file:
*/
/* #include <c_stdio.h> */
/* #include <stdio.h> */
/************ Begin %include sections from the grammar ************************/
/* #include "fts5Int.h" */
@ -182929,7 +182929,7 @@ struct fts5yyParser {
typedef struct fts5yyParser fts5yyParser;
#ifndef NDEBUG
/* #include <c_stdio.h> */
/* #include <stdio.h> */
static FILE *fts5yyTraceFILE = 0;
static char *fts5yyTracePrompt = 0;
#endif /* NDEBUG */
@ -185988,7 +185988,7 @@ static void *sqlite3Fts5ParserAlloc(void *(*mallocProc)(u64));
static void sqlite3Fts5ParserFree(void*, void (*freeProc)(void*));
static void sqlite3Fts5Parser(void*, int, Fts5Token, Fts5Parse*);
#ifndef NDEBUG
/* #include <c_stdio.h> */
/* #include <stdio.h> */
static void sqlite3Fts5ParserTrace(FILE*, char*);
#endif

2
app/tsl2561/tsl2561.h
View File

@ -33,7 +33,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**************************************************************************/
#include "c_types.h"
#include <stdint.h>
#ifndef _TSL2561_H_
#define _TSL2561_H_

5
app/websocket/websocketclient.c
View File

@ -27,9 +27,8 @@
#include "espconn.h"
#include "mem.h"
#include "limits.h"
#include "stdlib.h"
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>

6
sdk-overrides/include/c_types.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef _SDKOVERRIDES_C_TYPES_H_
#define _SDKOVERRIDES_C_TYPES_H_
#error "Please do not use c_types.h, use <stdint.h> instead"
#endif

4
sdk-overrides/include/ets_sys.h
View File

@ -1,6 +1,10 @@
#ifndef SDK_OVERRIDES_INCLUDE_ETS_SYS_H_
#define SDK_OVERRIDES_INCLUDE_ETS_SYS_H_
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
#include_next "ets_sys.h"
#include <stdarg.h>

5
sdk-overrides/include/osapi.h
View File

@ -1,9 +1,12 @@
#ifndef _SDK_OVERRIDE_OSAPI_H_
#define _SDK_OVERRIDE_OSAPI_H_
#include <stdbool.h>
#include <stdint.h>
#include <stddef.h>
#include_next "osapi.h"
#include <stddef.h>
#include "rom.h"
unsigned int uart_baudrate_detect(unsigned int uart_no, unsigned int async);

7
sdk-overrides/include/stdbool.h
View File

@ -2,6 +2,11 @@
#define __stdbool_h__
// For compatibility with SDK. Boo.
#include_next "c_types.h"
typedef unsigned char bool;
#define BOOL bool
#define true (1)
#define false (0)
#define TRUE true
#define FALSE false
#endif

65
sdk-overrides/include/stdint.h Normal file
View File

@ -0,0 +1,65 @@
#ifndef _SDKOVERRIDES_STDINT_H_
#define _SDKOVERRIDES_STDINT_H_
#include_next "stdint.h"
// Compatibility cruft from c_types.h, ideally we should get rid of this!
typedef signed char sint8_t;
typedef signed short sint16_t;
typedef signed int sint32_t;
typedef signed long long sint64_t;
typedef unsigned long long u_int64_t;
typedef float real32_t;
typedef double real64_t;
typedef unsigned char uint8;
typedef unsigned char u8;
typedef signed char sint8;
typedef signed char int8;
typedef signed char s8;
typedef unsigned short uint16;
typedef unsigned short u16;
typedef signed short sint16;
typedef signed short s16;
typedef unsigned int uint32;
typedef unsigned int u_int;
typedef unsigned int u32;
typedef signed int sint32;
typedef signed int s32;
typedef int int32;
typedef signed long long sint64;
typedef unsigned long long uint64;
typedef unsigned long long u64;
typedef float real32;
typedef double real64;
#define __le16 u16
// And this stuff really doesn't belong in a types file in the first place...
#ifndef __packed
#define __packed __attribute__((packed))
#endif
#define LOCAL static
typedef enum {
OK = 0,
FAIL,
PENDING,
BUSY,
CANCEL,
} STATUS;
#define BIT(nr) (1UL << (nr))
#define REG_SET_BIT(_r, _b) (*(volatile uint32_t*)(_r) |= (_b))
#define REG_CLR_BIT(_r, _b) (*(volatile uint32_t*)(_r) &= ~(_b))
#define DMEM_ATTR __attribute__((section(".bss")))
#define SHMEM_ATTR
#define ICACHE_FLASH_ATTR __attribute__((section(".irom0.text")))
#define ICACHE_RODATA_ATTR __attribute__((section(".irom.text")))
#define STORE_ATTR __attribute__((aligned(4)))
#endif

2
sdk-overrides/include/stdlib.h
View File

@ -2,7 +2,7 @@
#define _OVERRIDE_STDLIB_H_
#include_next "stdlib.h"
#include <stdbool.h>
#include "mem.h"
#define free os_free

4
sdk-overrides/include/user_interface.h
View File

@ -1,6 +1,10 @@
#ifndef SDK_OVERRIDES_INCLUDE_USER_INTERFACE_H_
#define SDK_OVERRIDES_INCLUDE_USER_INTERFACE_H_
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
#include_next "user_interface.h"
bool wifi_softap_deauth(uint8 mac[6]);