use __ZEPHYR__

Author: mkellner

build/devices/zephyr/config/CMakeLists.txt.prefix

@@ -65,7 +65,6 @@ list(APPEND mOBJECTS $ENV{MODDABLE}/xs/sources/xsdtoa.c)
 list(APPEND mOBJECTS $ENV{MODDABLE}/xs/sources/xsmc.c)
 list(APPEND mOBJECTS $ENV{MODDABLE}/xs/sources/xsre.c)
 
-list(APPEND mFLAGS "-D_ZEPHYR=1")
 list(APPEND mFLAGS "-DmxUseDefaultSharedChunks=1")
 list(APPEND mFLAGS "-DkPocoRotation=0")
 list(APPEND mFLAGS "-DkPocoFrameBuffer=1")

modules/base/instrumentation/modInstrumentation.h

@@ -30,7 +30,7 @@
 	#define kModInstrumentationHasSPIFlashErases 1
 #endif
 
-#if nrf52 || PICO_BUILD || defined(__ets__) || ESP32 || _ZEPHYR
+#if nrf52 || PICO_BUILD || defined(__ets__) || ESP32 || __ZEPHYR__
 	#define kModInstrumentationHasTurns 1
 #endif
 

modules/io/common/builtinCommon.c

@@ -36,7 +36,7 @@
 		SOC_GPIO_VALID_GPIO_MASK >> 32
 #endif
 	};
-#elif defined(__ets__) && !defined(_ZEPHYR)
+#elif defined(__ets__) && !defined(__ZEPHYR__)
 	static uint32_t gDigitalAvailable[kPinBanks] = {
 		(1 <<  0) |
 		(1 <<  1) |
@@ -68,7 +68,7 @@
 		0x00000000		//@@
 #endif
 	};
-#elif _ZEPHYR
+#elif __ZEPHYR__
 	static uint8_t builtinInitialized = 0;
 	static uint32_t gDigitalAvailable[kPinBanks];
 #endif
@@ -215,7 +215,7 @@ void builtinInitIO()
 		builtinInitialized = 1;
 	}
 }
-#elif defined(_ZEPHYR)
+#elif defined(__ZEPHYR__)
 void builtinInitIO()
 {
 	if (!builtinInitialized) {

modules/io/common/builtinCommon.h

@@ -41,7 +41,7 @@
 				xsUnknownError("no network"); \
 			}
 	#endif
-#elif defined(__ets__) && !defined(_ZEPHYR)
+#elif defined(__ets__) && !defined(__ZEPHYR__)
 	#include "Arduino.h"	// mostly to get xs_rsil
 
 	#define kPinBanks (1)
@@ -61,7 +61,7 @@
 	extern critical_section_t gCommonCriticalMux;
 	#define builtinCriticalSectionBegin()	critical_section_enter_blocking(&gCommonCriticalMux)
 	#define builtinCriticalSectionEnd()		critical_section_exit(&gCommonCriticalMux)
-#elif defined(_ZEPHYR)
+#elif defined(__ZEPHYR__)
 	#include "mc.devicetree.h"
 
 	#define kPinBanks kModZephyrGPIOBankCount
@@ -127,7 +127,7 @@ xsSlot *builtinGetCallback(xsMachine *the, xsIdentifier id);
 	#define builtinGetPin(the, slot) builtinGetUnsignedInteger(the, slot)
 #endif
 
-#if defined(PICO_BUILD) || defined(_ZEPHYR)
+#if defined(PICO_BUILD) || defined(__ZEPHYR__)
 	void builtinInitIO(void);
 #endif
 

modules/io/system/system.c

@@ -24,7 +24,7 @@
 
 #include "builtinCommon.h"
 
-#if defined(__ets__) && !ESP32 && !defined(_ZEPHYR)
+#if defined(__ets__) && !ESP32 && !defined(__ZEPHYR__)
 	extern void system_deep_sleep_instant(uint32_t time_in_us);
 
 static void deepSleepDeliver(void *notThe, void *refcon, uint8_t *message, uint16_t messageLength)
@@ -35,7 +35,7 @@ static void deepSleepDeliver(void *notThe, void *refcon, uint8_t *message, uint1
 
 void xs_system_deepSleep(xsMachine *the)
 {
-#if defined(__ets__) && !ESP32 && !defined(_ZEPHYR)
+#if defined(__ets__) && !ESP32 && !defined(__ZEPHYR__)
 	uint32_t us = 0;
 
 	if (xsmcArgc) {
@@ -53,7 +53,7 @@ void xs_system_restart(xsMachine *the)
 {
 #if ESP32
 	esp_restart();
-#elif defined(__ets__) && !defined(_ZEPHYR)
+#elif defined(__ets__) && !defined(__ZEPHYR__)
 	system_restart();
 #elif defined(PICO_BUILD)
 	pico_reset();
@@ -66,7 +66,7 @@ void xs_system_restart(xsMachine *the)
 /*
 	adapted from modResolve.c
 */
-#if ESP32 || (defined(__ets__) && !defined(_ZEPHYR)) || CYW43_LWIP
+#if ESP32 || (defined(__ets__) && !defined(__ZEPHYR__)) || CYW43_LWIP
 #include "lwip/tcp.h"
 
 typedef struct xsNetResolveRecord xsNetResolveRecord;

tools/test262/_262.c

@@ -91,7 +91,7 @@
 	#define fxUnlockMutex(MUTEX) LeaveCriticalSection(MUTEX)
 	#define fxSleepCondition(CONDITION,MUTEX) SleepConditionVariableCS(CONDITION,MUTEX,INFINITE)
 	#define fxWakeCondition(CONDITION) WakeConditionVariable(CONDITION)
-#elif _ZEPHYR
+#elif __ZEPHYR__
 
 	typedef uint32_t txCondition;
 	typedef void *txMutex;
@@ -394,7 +394,7 @@ void _262_agent_broadcast(txMachine* the)
 		gxAgentCluster.dataValue = xsToInteger(xsArg(1));
 #if mxWindows
 	WakeAllConditionVariable(&(gxAgentCluster.dataCondition));
-#elif PICO_BUILD || _ZEPHYR
+#elif PICO_BUILD || __ZEPHYR__
 #else
 	pthread_cond_broadcast(&(gxAgentCluster.dataCondition));
 #endif
@@ -481,7 +481,7 @@ void _262_agent_sleep(txMachine* the)
 	xsIntegerValue delay = xsToInteger(xsArg(0));
 #ifdef mxUseFreeRTOSTasks
 	vTaskDelay(pdMS_TO_TICKS(delay));
-#elif PICO_BUILD || _ZEPHYR
+#elif PICO_BUILD || __ZEPHYR__
 	modDelayMilliseconds(delay);
 #elif mxWindows
 	Sleep(delay);
@@ -514,7 +514,7 @@ void _262_agent_start(txMachine* the)
 	xTaskCreate(_262_agent_start_aux, "agent", kStack, agent, 8, &(agent->thread));
 #elif mxWindows
 	agent->thread = (HANDLE)_beginthreadex(NULL, 0, _262_agent_start_aux, agent, 0, NULL);
-#elif PICO_BUILD || _ZEPHYR
+#elif PICO_BUILD || __ZEPHYR__
 	_262_agent_start_aux(agent);
 #else	
     pthread_create(&(agent->thread), NULL, &_262_agent_start_aux, agent);
@@ -601,7 +601,7 @@ void _262_agent_stop(txMachine* the)
 				#if mxWindows
 					WaitForSingleObject(agent->thread, INFINITE);
 					CloseHandle(agent->thread);
-				#elif PICO_BUILD || _ZEPHYR
+				#elif PICO_BUILD || __ZEPHYR__
 				#else
 					pthread_join(agent->thread, NULL);
 				#endif
@@ -663,7 +663,7 @@ void _262_evalScript(txMachine* the)
 	mxPullSlot(mxResult);
 }
 
-#if _ZEPHYR
+#if __ZEPHYR__
 
 void k_sys_fatal_error_handler(unsigned int reason, const struct arch_esf *esf)
 {

xs/sources/xsCommon.c

@@ -547,7 +547,7 @@ const txS1 gxCodeSizes[XS_CODE_COUNT] ICACHE_FLASH_ATTR = {
 
 #if mxUseDefaultCStackLimit
 
-#if defined(__ets__) && !defined(_ZEPHYR)
+#if defined(__ets__) && !defined(__ZEPHYR__)
 	#if ESP32
 		#include "freertos/task.h"
 	#else
@@ -613,10 +613,10 @@ char* fxCStackLimit()
 		}
 		pthread_attr_destroy(&attrs);
 		return result;
-	#elif defined(__ets__) && !ESP32 && !defined(_ZEPHYR)
+	#elif defined(__ets__) && !ESP32 && !defined(__ZEPHYR__)
 		extern cont_t g_cont;
 		return 192 + (char *)g_cont.stack;
-	#elif defined(__ets__) && ESP32 && !defined(_ZEPHYR)
+	#elif defined(__ets__) && ESP32 && !defined(__ZEPHYR__)
 		TaskStatus_t info;
 		vTaskGetInfo(NULL, &info, pdFALSE, eReady);
 		return 512 + (char *)info.pxStackBase;