michaelh/zephyr
1
0
Fork 0
Code Releases Activity

esp32: Fix redefinition of BIT() macro

Browse source 
Esp-idf defines the BIT macro that is also defined in Zephyr's
misc/util.h.  Fix the issue by including the esp-idf headers first, so
that a check in util.h won't redefine the macro if it's already
defined.

Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
This commit is contained in:
Leandro Pereira 2017-08-18 15:15:47 -07:00 • committed by Anas Nashif
commit d52de29fba
5 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/watchdog/wdt_esp32.c
View file

@ -4,14 +4,15 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <string.h>
#include <watchdog.h>
#include <device.h>
/* Include esp-idf headers first to avoid redefining BIT() macro */
#include <rom/ets_sys.h>
#include <soc/rtc_cntl_reg.h>
#include <soc/timer_group_reg.h>
#include <string.h>
#include <watchdog.h>
#include <device.h>
struct wdt_esp32_data {
struct wdt_config config;
};