Revise system headers / enforce c11 #1695
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Use `uint32_t` in preference to `uint32`, etc. * Arduino libraries use a mixture so still need to maintain definitions for those
* Rename `espinc/c_types_compatible.h` as `c_types.h`, revise to use `stdint` and `stdbool` definitions * Place location for `c_types.h` and `mem.h` ahead of SDK version in makefiles * Move system definitions from `user_config.h` into `esp_systemapi.h` (exclude LWIP) * Don't #include `user_config.h` from `esp_systemapi.h` * Move missing memory API definitions out of `esp_systemapi.h` and into `mem.h` * Simplify other headers
* Not a C/C++ standard feature and not consistently applied on all platforms, so avoid where possible.
mikee47
changed the title
slaff
reviewed
May 21, 2019
| @@ -21,8 +21,7 @@ diff -Nuar a/replacements/libc.c b/replacements/libc.c | |||
| + Modified 03 April 2015 by Markus Sattler | |||
| + */ | |||
| + | |||
| +#include <stdint.h> | |||
| +#include "espinc/c_types_compatible.h" | |||
| +#include <c_types.h> | |||
| +#include <stdarg.h> | |||
| + | |||
| +extern int ets_putc(int); | |||
There was a problem hiding this comment.
In this PR make dist-clean did not clean the axtls directory and the new patch was not applied cleanly. Any idea why is that happening?
There was a problem hiding this comment.
Try make dist-clean ENABLE_SSL=1
There was a problem hiding this comment.
We have these optional custom libraries which get built:
pwm_open
mainmm
lwip_full
lwip_open
lwip2
axtls
mqttc
Behaviour is that the library only gets cleaned if the relevant flags are defined, ditto for submodule updating. It would be better of course if they all got cleaned regardless. I can look at this in another PR.
There was a problem hiding this comment.
It would be better of course if they all got cleaned regardless. I can look at this in another PR.
Absolutely. It will also match the current default behaviour.
mikee47
added a commit
to mikee47/Sming
that referenced
this pull request
Nov 21, 2021
Was removed from applications in SmingHub#1695. It's a hangover from C esp8266 SDK applications and makes maintenace difficult because it contains so much stuff.
mikee47
added a commit
to mikee47/Sming
that referenced
this pull request
Nov 21, 2021
Was removed from applications in SmingHub#1695. It's a hangover from C esp8266 SDK applications and makes maintenace difficult because it contains so much stuff.
mikee47
added a commit
to mikee47/Sming
that referenced
this pull request
Nov 22, 2021
Was removed from applications in SmingHub#1695. It's a hangover from C esp8266 SDK applications and makes maintenace difficult because it contains so much stuff.
slaff
pushed a commit
that referenced
this pull request
Nov 23, 2021
This PR removes some long-deprecated code and build logic from the framework, and fixes some low-level (system) header file inconsistencies between architectures. **user_config.h** This header was removed from samples in #1695. It's a hangover from the Espressif SDK applications and doesn't fit very well into the framework structure. The file has been removed from all framework code but one copy left with a deprecation warning. Note added to upgrade docs. **System header files** Each architecture has a set of system header files, located here: - Arch/Esp8266/Components/esp8266 - Arch/Esp32/Components/esp32 - Arch/Host/Components/esp_hal - Arch/Rp2040/Components/rp2040 In particular the ESP8266 SDK headers are problematic so have been moved into the `esp8266` Component: - Remove sntp.h as can just use lwip/sntp.h - Apply coding style, fix type definitions for consistency - Integrate 'missing' SDK definitions - these are no longer scattered around on an ad-hoc basis - Split out `user_interface.h` into `esp_system.h` and `esp_wifi.h` - LWIP_OPEN_SRC is always true so can remove SDK version of `ip_addr.h` - Move `BIT`, `TRUE`, `FALSE`, `LOCAL` macros into `c_types.h` For other architectures: - Move `os_random` and `os_get_random` into `esp_system` (get rid of esp_libc) - Remove `system_set_os_print` and `ets_install_putc1` (not used) **Remove pre-SDK 3 support** There was an issue with small flash sizes but this now seems to be resolved. Tested with Basic_Blink sample and 256K, 512K flash size, no problem. Now using only libraries from the SDK: all header/linker files are in framework. Simplifies build system and code. `SDK_BASE` definition is no longer publicised. SDK submodule renamed from `ESP8266_NONOS_SDK` to `sdk`. **lwip** - Use single `lwip_includes.h` file, relocated to Network Component, rather than one-per-arch - Fix esp_open_lwip - Fix lwip2, but as it's forked can use that instead of patching **Other simplifications** - esp8266 `esp_cplusplus.h` header not necessary, single function used only by startup code - Remove new-pwm submodule, replace with patched source instead - Provide better esp32 `system_get_time` implementation - Remove deprecated headers (including SmingCore/SmingCore.h) - Move SERIAL_BAUD_RATE, __ESP8266_EX__ and __ESP32_EX__ definitions into makefiles **Build system** - Fix issue with missing Component -clean targets. e.g. `make lwip2-clean` will always fail because ENABLE_CUSTOM_LWIP option never gets set, so `lwip2-clean` target never gets created - Fix `component-samples` build target, should honour COMPONENT_SOC setting - Fix `component-samples-clean` build target, broken **Integration tests** Add `component-samples` to esp32 build, requires only a few simple library fixes to build all variants.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Build
Cfiles within modules to c11 standard (previously defaulted tognu90)Standardise data types, e.g. use
uint32_tnotuint32Tidy and simplify
c_types.hespinc/c_types_compatible.hasc_types.hstdintandstdbooldefinitionsesp_attr.hsming_attr.huser_config.hshouldn't contain system definitionsuser_config.hintoesp_systemapi.h(exclude LWIP)user_config.hfromesp_systemapi.hesp_systemapi.hand intomem.hSimplify Library/sample code using <esp_systemapi.h> instead of assortment of low-level headers
Add
WEAK_ATTRmacro to allow selective weak symbol support