From 7153003aaf083babc0b98deb167ee8b5118d2912 Mon Sep 17 00:00:00 2001 From: Jeroen Domburg Date: Tue, 28 Mar 2017 14:21:27 +0800 Subject: [PATCH] Undo merge weirdness --- components/esp32/include/soc/soc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/esp32/include/soc/soc.h b/components/esp32/include/soc/soc.h index 2dfd7b093..1301a7c23 100755 --- a/components/esp32/include/soc/soc.h +++ b/components/esp32/include/soc/soc.h @@ -65,8 +65,9 @@ #define BIT(nr) (1UL << (nr)) #else #define BIT(nr) (1 << (nr)) -#endif //__ASSEMBLER__ +#endif +#ifndef __ASSEMBLER__ //write value to register #define REG_WRITE(_r, _v) (*(volatile uint32_t *)(_r)) = (_v)