michaelh/zephyr
1
0
Fork 0
Code Releases Activity

uart_esp32: alter the uart.h include order to avoid warning

Browse source 
The esp-idf package contains on the BSP a definition of the BIT macro
unconditionally #defined when rom/uart.h is #included. When Zephyr's
uart.h (which pulls in include/misc/util.h) that conditionally

This generates a compile warning on the re-definiton of BIT by the
esp-idf package.

Thus include uart.h after esp-idf's rom/uart.h to have BIT not
re-defined thanks to Zephyr's conditional definition.

Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
This commit is contained in:
Inaky Perez-Gonzalez 2017-06-20 17:01:58 -07:00 • committed by Anas Nashif
commit 271c518ec6
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/serial/uart_esp32.c
View file

@ -4,8 +4,10 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <uart.h>
/* include rom/uart.h (from the esp-dif package) before Z's uart.h so
* that the definition of BIT is not overriden */
#include <rom/uart.h>
#include <uart.h>
#include <rom/ets_sys.h>
#include <errno.h>