Unverified Commit f7a545b9 authored by Johny Mattsson's avatar Johny Mattsson Committed by GitHub
Browse files

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

parent 526d21da
......@@ -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
......
#include "user_config.h"
#include "c_types.h"
#include <stdint.h>
#include "coap.h"
#include "hash.h"
......
......@@ -5,7 +5,6 @@
extern "C" {
#endif
#include "c_types.h"
#include "lwip/ip_addr.h"
#include "espconn.h"
#include "pdu.h"
......
#include "user_config.h"
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include <stdlib.h>
#include "coap.h"
......
......@@ -7,7 +7,7 @@
*/
#include <stdlib.h>
#include "c_types.h"
#include <stddef.h>
#include "str.h"
......
#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.
......
#ifndef _MECH_H_
#define _MECH_H_
#include "c_types.h"
#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
typedef struct
{
......
#ifndef __SHA2_H__
#define __SHA2_H__
#include <c_types.h>
#include <stdint.h>
#include <stddef.h>
/**************************************************************************
* SHA256/384/512 declarations
......
......@@ -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
//
\ No newline at end of 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,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;
......
......@@ -11,7 +11,7 @@
*/
#include "platform.h"
#include "c_types.h"
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include "driver/rotary.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
#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
......
......@@ -8,7 +8,7 @@
#ifndef __PWM2_H__
#define __PWM2_H__
#include "c_types.h"
#include <stdint.h>
#include "pin_map.h"
typedef struct {
......
......@@ -4,7 +4,7 @@
#ifndef __ROTARY_H__
#define __ROTARY_H__
#include "c_types.h"
#include <stdint.h>
#define ROTARY_CHANNEL_COUNT 3
......
......@@ -4,7 +4,7 @@
#ifndef __SWITEC_H__
#define __SWITEC_H__
#include "c_types.h"
#include <stdint.h>
#define SWITEC_CHANNEL_COUNT 3
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment