Ver código fonte

fix ci, fix wars

pikastech 3 anos atrás
pai
commit
fc5e21140b

+ 1 - 1
package/PikaStdDevice/PikaStdDevice_GPIO.c

@@ -151,8 +151,8 @@ void PikaStdDevice_GPIO_platformRead(PikaObj* self) {
 void PikaStdDevice_GPIO_setCallBack(PikaObj* self,
                                     Arg* eventCallback,
                                     int filter) {
-    pika_dev* dev = _get_dev(self);
 #if PIKA_EVENT_ENABLE
+    pika_dev* dev = _get_dev(self);
     _PikaStdDevice_setCallBack(self, eventCallback, (uintptr_t)dev);
     /* regist event to pika_hal */
     pika_hal_GPIO_config cfg_cb = {0};

+ 1 - 1
package/PikaStdDevice/PikaStdDevice_UART.c

@@ -182,8 +182,8 @@ void PikaStdDevice_UART_platformWriteBytes(PikaObj* self) {
 void PikaStdDevice_UART_setCallBack(PikaObj* self,
                                     Arg* eventCallBack,
                                     int filter) {
-    pika_dev* dev = _get_dev(self);
 #if PIKA_EVENT_ENABLE
+    pika_dev* dev = _get_dev(self);
     _PikaStdDevice_setCallBack(self, eventCallBack, (uintptr_t)dev);
     /* regist event to pika_hal */
     pika_hal_UART_config cfg_cb = {0};

+ 1 - 1
port/linux/package/pikascript/pikascript-lib/PikaStdDevice/PikaStdDevice_GPIO.c

@@ -151,8 +151,8 @@ void PikaStdDevice_GPIO_platformRead(PikaObj* self) {
 void PikaStdDevice_GPIO_setCallBack(PikaObj* self,
                                     Arg* eventCallback,
                                     int filter) {
-    pika_dev* dev = _get_dev(self);
 #if PIKA_EVENT_ENABLE
+    pika_dev* dev = _get_dev(self);
     _PikaStdDevice_setCallBack(self, eventCallback, (uintptr_t)dev);
     /* regist event to pika_hal */
     pika_hal_GPIO_config cfg_cb = {0};

+ 1 - 1
port/linux/package/pikascript/pikascript-lib/PikaStdDevice/PikaStdDevice_UART.c

@@ -182,8 +182,8 @@ void PikaStdDevice_UART_platformWriteBytes(PikaObj* self) {
 void PikaStdDevice_UART_setCallBack(PikaObj* self,
                                     Arg* eventCallBack,
                                     int filter) {
-    pika_dev* dev = _get_dev(self);
 #if PIKA_EVENT_ENABLE
+    pika_dev* dev = _get_dev(self);
     _PikaStdDevice_setCallBack(self, eventCallBack, (uintptr_t)dev);
     /* regist event to pika_hal */
     pika_hal_UART_config cfg_cb = {0};

+ 6 - 0
src/PikaVM.c

@@ -93,7 +93,11 @@ int _VMEvent_getVMCnt(void) {
 }
 
 int _VMEvent_getEventPickupCnt(void) {
+#if !PIKA_EVENT_ENABLE
+    return -1;
+#else
     return PikaVMSignal.event_pickup_cnt;
+#endif
 }
 
 #if PIKA_EVENT_ENABLE
@@ -185,6 +189,7 @@ PIKA_RES __eventListener_pushEvent(PikaEventListener* lisener,
 #if !PIKA_EVENT_ENABLE
     pika_platform_printf("PIKA_EVENT_ENABLE is not enable");
     pika_platform_panic_handle();
+    return PIKA_RES_ERR_OPERATION_FAILED;
 #else
     /* push to event_cq_buff */
     if (_ecq_isFull(&PikaVMSignal.cq)) {
@@ -217,6 +222,7 @@ PIKA_RES __eventListener_popEvent(PikaEventListener** lisener_p,
 #if !PIKA_EVENT_ENABLE
     pika_platform_printf("PIKA_EVENT_ENABLE is not enable");
     pika_platform_panic_handle();
+    return PIKA_RES_ERR_OPERATION_FAILED;
 #else
     /* pop from event_cq_buff */
     if (_ecq_isEmpty(&PikaVMSignal.cq)) {