From 70cec6c3b75a43a0ebc05547e97b434bfd4456fb Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Tue, 2 Jun 2015 15:20:19 +1000 Subject: [PATCH] Rename the sdk_prototypes header to sdk_private --- examples/http_get/main.c | 3 +-- examples/http_get_ssl/main.c | 2 +- examples/simple/main.c | 4 ++-- examples/tests/hmac_test_vectors/main.c | 2 +- .../{sdk_prototypes.h => sdk_private.h} | 23 ++++++++++--------- lwip/include/arch/cc.h | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) rename include/espressif/{sdk_prototypes.h => sdk_private.h} (67%) diff --git a/examples/http_get/main.c b/examples/http_get/main.c index d5534cb..b865591 100644 --- a/examples/http_get/main.c +++ b/examples/http_get/main.c @@ -5,6 +5,7 @@ * This sample code is in the public domain., */ #include "espressif/esp_common.h" +#include "espressif/sdk_private.h" #include "FreeRTOS.h" #include "task.h" @@ -15,8 +16,6 @@ #include "lwip/netdb.h" #include "lwip/dns.h" -#include "espressif/sdk_prototypes.h" - #define WEB_SERVER "chainxor.org" #define WEB_PORT 80 #define WEB_URL "http://chainxor.org/" diff --git a/examples/http_get_ssl/main.c b/examples/http_get_ssl/main.c index e400f43..6d06fba 100644 --- a/examples/http_get_ssl/main.c +++ b/examples/http_get_ssl/main.c @@ -7,6 +7,7 @@ * This sample code is in the public domain., */ #include "espressif/esp_common.h" +#include "espressif/sdk_private.h" #include "FreeRTOS.h" #include "task.h" @@ -19,7 +20,6 @@ #include "ssl.h" -#include "espressif/sdk_prototypes.h" #define WEB_SERVER "10.10.10.1" #define WEB_PORT "8000" diff --git a/examples/simple/main.c b/examples/simple/main.c index a9dcded..23964aa 100644 --- a/examples/simple/main.c +++ b/examples/simple/main.c @@ -1,9 +1,9 @@ /* Very basic example that just demonstrates we can run at all! */ -#include "esp_common.h" +#include "espressif/esp_common.h" +#include "espressif/sdk_private.h" #include "FreeRTOS.h" #include "task.h" -#include "espressif/blob_prototypes.h" #include "queue.h" void task1(void *pvParameters) diff --git a/examples/tests/hmac_test_vectors/main.c b/examples/tests/hmac_test_vectors/main.c index 91a92d2..7fc813b 100644 --- a/examples/tests/hmac_test_vectors/main.c +++ b/examples/tests/hmac_test_vectors/main.c @@ -8,9 +8,9 @@ * This sample code is in the public domain., */ #include "espressif/esp_common.h" +#include "espressif/sdk_private.h" #include "FreeRTOS.h" #include "ssl.h" -#include "espressif/sdk_prototypes.h" struct test_vector { const uint8_t *key; diff --git a/include/espressif/sdk_prototypes.h b/include/espressif/sdk_private.h similarity index 67% rename from include/espressif/sdk_prototypes.h rename to include/espressif/sdk_private.h index 4b5e3df..ac98e43 100644 --- a/include/espressif/sdk_prototypes.h +++ b/include/espressif/sdk_private.h @@ -1,14 +1,18 @@ -/* sdk_prototypes.h +/* sdk_private.h - This source file contains function prototypes for functions defined - in the remaining "binary blob" ESP IoT RTOS SDK libraries. Sorted - by which library they appear in. + This source file contains function prototypes for "private" but + useful functions defined in the "binary blob" ESP IoT RTOS SDK libraries. - Function names here have the 'sdk_' prefix that is put on all binary library functions - by the Open RTOS SDK. + For the "public" API, check the esp_common header file and the various + sub-headers it includes. + + Function names here have the 'sdk_' prefix that is attached to all + binary library symbols by the esp-open-rtos build process. + + This file is a part of esp-open-rtos. */ -#ifndef SDK_PROTOTYPES_H -#define SDK_PROTOTYPES_H +#ifndef SDK_PRIVATE_H +#define SDK_PRIVATE_H #include struct ip_addr; @@ -44,7 +48,4 @@ void sdk_system_station_got_ip_set(struct ip_addr *ip_addr, struct ip_addr *sn_m */ void sdk_system_pp_recycle_rx_pkt(void *eb); -const char* sdk_system_get_sdk_version(void); - - #endif diff --git a/lwip/include/arch/cc.h b/lwip/include/arch/cc.h index acd5f3d..e489895 100644 --- a/lwip/include/arch/cc.h +++ b/lwip/include/arch/cc.h @@ -33,7 +33,7 @@ #define __ARCH_CC_H__ /* include ESP SDK prototypes as they're used in some LWIP routines */ -#include "espressif/sdk_prototypes.h" +#include "espressif/sdk_private.h" /* ESP8266 SDK Interface