Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
f7a545b9
Unverified
Commit
f7a545b9
authored
Jul 23, 2019
by
Johny Mattsson
Committed by
GitHub
Jul 23, 2019
Browse files
Evict c_types.h, tidy up a other c_prefixes. (#2841)
parent
526d21da
Changes
81
Show whitespace changes
Inline
Side-by-side
Makefile
View file @
f7a545b9
...
@@ -33,7 +33,9 @@ SDK_DIR := $(TOP_DIR)/$(SDK_REL_DIR)
...
@@ -33,7 +33,9 @@ SDK_DIR := $(TOP_DIR)/$(SDK_REL_DIR)
ESPTOOL_VER
:=
2.6
ESPTOOL_VER
:=
2.6
# Ensure that the Espresif SDK is searched before the tool-chain's SDK (if any)
# 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)
LDFLAGS
:=
-L
$(SDK_DIR)
/lib
-L
$(SDK_DIR)
/ld
$(LDFLAGS)
ifdef
DEBUG
ifdef
DEBUG
...
...
app/coap/coap_client.c
View file @
f7a545b9
#include "user_config.h"
#include "user_config.h"
#include
"c_types
.h
"
#include
<stdint
.h
>
#include "coap.h"
#include "coap.h"
#include "hash.h"
#include "hash.h"
...
...
app/coap/coap_io.h
View file @
f7a545b9
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
extern
"C"
{
extern
"C"
{
#endif
#endif
#include "c_types.h"
#include "lwip/ip_addr.h"
#include "lwip/ip_addr.h"
#include "espconn.h"
#include "espconn.h"
#include "pdu.h"
#include "pdu.h"
...
...
app/coap/coap_server.c
View file @
f7a545b9
#include "user_config.h"
#include "user_config.h"
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include <stdlib.h>
#include <stdlib.h>
#include "coap.h"
#include "coap.h"
...
...
app/coap/str.c
View file @
f7a545b9
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*/
*/
#include <stdlib.h>
#include <stdlib.h>
#include
"c_types
.h
"
#include
<stddef
.h
>
#include "str.h"
#include "str.h"
...
...
app/crypto/digests.h
View file @
f7a545b9
#ifndef _CRYPTO_DIGESTS_H_
#ifndef _CRYPTO_DIGESTS_H_
#define _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
(
*
create_ctx_fn
)(
void
*
ctx
);
typedef
void
(
*
update_ctx_fn
)(
void
*
ctx
,
const
uint8_t
*
msg
,
int
len
);
typedef
void
(
*
update_ctx_fn
)(
void
*
ctx
,
const
uint8_t
*
msg
,
int
len
);
typedef
void
(
*
finalize_ctx_fn
)(
uint8_t
*
digest
,
void
*
ctx
);
typedef
void
(
*
finalize_ctx_fn
)(
uint8_t
*
digest
,
void
*
ctx
);
typedef
s
int32_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.
* Description of a message digest mechanism.
...
...
app/crypto/mech.h
View file @
f7a545b9
#ifndef _MECH_H_
#ifndef _MECH_H_
#define _MECH_H_
#define _MECH_H_
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
typedef
struct
typedef
struct
{
{
...
...
app/crypto/sha2.h
View file @
f7a545b9
#ifndef __SHA2_H__
#ifndef __SHA2_H__
#define __SHA2_H__
#define __SHA2_H__
#include <c_types.h>
#include <stdint.h>
#include <stddef.h>
/**************************************************************************
/**************************************************************************
* SHA256/384/512 declarations
* SHA256/384/512 declarations
...
...
app/dht/dht.h
View file @
f7a545b9
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
// #else
// #else
// #include <Arduino.h>
// #include <Arduino.h>
// #endif
// #endif
#include
"c_types
.h
"
#include
<stdint
.h
>
#define DHT_LIB_VERSION "0.1.14"
#define DHT_LIB_VERSION "0.1.14"
...
...
app/driver/pwm2.c
View file @
f7a545b9
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
* Nikolay Fiykov
* Nikolay Fiykov
*/
*/
#include <std
lib
.h>
#include <std
def
.h>
#include
"c_types
.h
"
#include
<stdint
.h
>
#include "mem.h"
#include "mem.h"
#include "pin_map.h"
#include "pin_map.h"
#include "platform.h"
#include "platform.h"
...
...
app/driver/readline.c
View file @
f7a545b9
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#include "os_type.h"
#include "os_type.h"
#include "osapi.h"
#include "osapi.h"
#include "driver/uart.h"
#include "driver/uart.h"
#include
"c_types
.h
"
#include
<stdint
.h
>
LOCAL
os_timer_t
readline_timer
;
LOCAL
os_timer_t
readline_timer
;
...
...
app/driver/rotary.c
View file @
f7a545b9
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
*/
*/
#include "platform.h"
#include "platform.h"
#include
"c_types
.h
"
#include
<stdint
.h
>
#include <stdlib.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdio.h>
#include "driver/rotary.h"
#include "driver/rotary.h"
...
...
app/driver/switec.c
View file @
f7a545b9
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
*/
*/
#include "platform.h"
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include <stdlib.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdio.h>
#include "driver/switec.h"
#include "driver/switec.h"
...
...
app/esp-gdbstub/gdbstub.c
View file @
f7a545b9
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
#include "gdbstub.h"
#include "gdbstub.h"
#include "ets_sys.h"
#include "ets_sys.h"
#include "eagle_soc.h"
#include "eagle_soc.h"
#include "c_types.h"
#include "gpio.h"
#include "gpio.h"
#include "xtensa/corebits.h"
#include "xtensa/corebits.h"
#include "driver/uart.h"
#include "driver/uart.h"
...
...
app/include/arch/cc.h
View file @
f7a545b9
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
#define __ARCH_CC_H__
#define __ARCH_CC_H__
//#include <string.h>
//#include <string.h>
#include
"c_types
.h
"
#include
<stdint
.h
>
#include "ets_sys.h"
#include "ets_sys.h"
#include "osapi.h"
#include "osapi.h"
#define EFAULT 14
#define EFAULT 14
...
...
app/include/driver/onewire.h
View file @
f7a545b9
#ifndef __ONEWIRE_H__
#ifndef __ONEWIRE_H__
#define __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
// You can exclude certain features from OneWire. In theory, this
// might save some space. In practice, the compiler automatically
// might save some space. In practice, the compiler automatically
...
...
app/include/driver/pwm2.h
View file @
f7a545b9
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
#ifndef __PWM2_H__
#ifndef __PWM2_H__
#define __PWM2_H__
#define __PWM2_H__
#include
"c_types
.h
"
#include
<stdint
.h
>
#include "pin_map.h"
#include "pin_map.h"
typedef
struct
{
typedef
struct
{
...
...
app/include/driver/rotary.h
View file @
f7a545b9
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
#ifndef __ROTARY_H__
#ifndef __ROTARY_H__
#define __ROTARY_H__
#define __ROTARY_H__
#include
"c_types
.h
"
#include
<stdint
.h
>
#define ROTARY_CHANNEL_COUNT 3
#define ROTARY_CHANNEL_COUNT 3
...
...
app/include/driver/switec.h
View file @
f7a545b9
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
#ifndef __SWITEC_H__
#ifndef __SWITEC_H__
#define __SWITEC_H__
#define __SWITEC_H__
#include
"c_types
.h
"
#include
<stdint
.h
>
#define SWITEC_CHANNEL_COUNT 3
#define SWITEC_CHANNEL_COUNT 3
...
...
app/include/driver/uart.h
View file @
f7a545b9
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#include "uart_register.h"
#include "uart_register.h"
#include "eagle_soc.h"
#include "eagle_soc.h"
#include
"c_types
.h
"
#include
<stdint
.h
>
#include "os_type.h"
#include "os_type.h"
#define RX_BUFF_SIZE 0x100
#define RX_BUFF_SIZE 0x100
...
...
Prev
1
2
3
4
5
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment