]> granicus.if.org Git - esp-idf/commitdiff
esp32: make soc header compatible with assembler
authorIvan Grokhotkov <ivan@espressif.com>
Sat, 18 Mar 2017 09:27:19 +0000 (17:27 +0800)
committerIvan Grokhotkov <ivan@espressif.com>
Fri, 24 Mar 2017 02:11:14 +0000 (10:11 +0800)
components/esp32/include/soc/soc.h

index 1b3e35dd47f483cce7bf52b2d9b4c769f9d5ed30..9b0c82fc1c5e59655f5fd771228a7a50f68fdb60 100755 (executable)
@@ -15,7 +15,9 @@
 #ifndef _ESP32_SOC_H_
 #define _ESP32_SOC_H_
 
+#ifndef __ASSEMBLER__
 #include <stdint.h>
+#endif
 
 //Register Bits{{
 #define BIT31   0x80000000
 #define ETS_UNCACHED_ADDR(addr) (addr)
 #define ETS_CACHED_ADDR(addr) (addr) 
 
+#ifndef __ASSEMBLER__
 #define BIT(nr)                 (1UL << (nr))
+#else
+#define BIT(nr)                 (1 << (nr))
+#endif //__ASSEMBLER__
 
 //write value to register
 #define REG_WRITE(_r, _v)    (*(volatile uint32_t *)(_r)) = (_v)