Skip to content

Commit 813bb30

Browse files
pikasTechpikasTech
committed
fix ac5 warnnings sync
1 parent 9ad6199 commit 813bb30

File tree

10 files changed

+39
-21
lines changed

10 files changed

+39
-21
lines changed

‎package/PikaStdDevice/PikaStdDevice_GPIO.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void PikaStdDevice_GPIO_setCallback(PikaObj* self,
131131
_PikaStdDevice_setCallback(self, eventCallback, (uintptr_t)dev);
132132
/* regist event to pika_hal */
133133
pika_hal_GPIO_config cfg_cb = {0};
134-
cfg_cb.event_callback = (void*)_PikaStdDevice_event_handler;
134+
cfg_cb.event_callback = _PikaStdDevice_GPIO_event_handler;
135135
cfg_cb.event_callback_filter = filter;
136136
cfg_cb.event_callback_ena = PIKA_HAL_EVENT_CALLBACK_ENA_ENABLE;
137137
pika_hal_ioctl(dev, PIKA_HAL_IOCTL_CONFIG, &cfg_cb);

‎package/PikaStdDevice/PikaStdDevice_Timer.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ static pika_dev* _get_dev(PikaObj* self) {
3737
obj_setPtr(self, "pika_dev", dev);
3838
return dev;
3939
}
40-
return dev;
4140
}
4241

4342
void PikaStdDevice_Timer___init__(PikaObj* self) {
@@ -94,7 +93,7 @@ void PikaStdDevice_Timer_setCallback(PikaObj* self, Arg* callback, int filter) {
9493
_PikaStdDevice_setCallback(self, callback, (uintptr_t)dev);
9594
/* regist event to pika_hal */
9695
pika_hal_TIM_config cfg_cb = {0};
97-
cfg_cb.event_callback = (void*)_PikaStdDevice_event_handler;
96+
cfg_cb.event_callback = _PikaStdDevice_TIM_event_handler;
9897
cfg_cb.event_callback_filter = filter;
9998
cfg_cb.event_callback_ena = PIKA_HAL_EVENT_CALLBACK_ENA_ENABLE;
10099
pika_hal_ioctl(dev, PIKA_HAL_IOCTL_CONFIG, &cfg_cb);

‎package/PikaStdDevice/PikaStdDevice_UART.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void PikaStdDevice_UART_enable(PikaObj* self) {
2828
cfg.baudrate = obj_getInt(self, "baudRate");
2929
cfg.flow_control = obj_getInt(self, "flowControl");
3030
cfg.stop_bits = obj_getInt(self, "stopBits");
31-
cfg.parity = obj_getInt(self, "parity");
31+
cfg.parity = (PIKA_HAL_UART_PARITY)obj_getInt(self, "parity");
3232
cfg.data_bits = obj_getInt(self, "dataBits");
3333
if (!strEqu(obj_getStr(self, "TXpin"), "none")) {
3434
cfg.TX = pika_hal_open(PIKA_HAL_GPIO, obj_getStr(self, "TXpin"));
@@ -183,7 +183,7 @@ void PikaStdDevice_UART_setCallback(PikaObj* self,
183183
_PikaStdDevice_setCallback(self, eventCallBack, (uintptr_t)dev);
184184
/* regist event to pika_hal */
185185
pika_hal_UART_config cfg_cb = {0};
186-
cfg_cb.event_callback = (void*)_PikaStdDevice_event_handler;
186+
cfg_cb.event_callback = _PikaStdDevice_UART_event_handler;
187187
cfg_cb.event_callback_filter = filter;
188188
cfg_cb.event_callback_ena = PIKA_HAL_EVENT_CALLBACK_ENA_ENABLE;
189189
pika_hal_ioctl(dev, PIKA_HAL_IOCTL_CONFIG, &cfg_cb);

‎package/PikaStdDevice/PikaStdDevice_common.c‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
#include "PikaStdDevice_common.h"
22

33
extern PikaEventListener* g_pika_device_event_listener;
4-
void _PikaStdDevice_event_handler(pika_dev* dev, int signal) {
4+
void _PikaStdDevice_GPIO_event_handler(pika_dev* dev,
5+
PIKA_HAL_GPIO_EVENT_SIGNAL signal) {
6+
pika_eventListener_sendSignal(g_pika_device_event_listener, (uintptr_t)dev,
7+
signal);
8+
}
9+
10+
void _PikaStdDevice_TIM_event_handler(pika_dev* dev,
11+
PIKA_HAL_TIM_EVENT_SIGNAL signal) {
12+
pika_eventListener_sendSignal(g_pika_device_event_listener, (uintptr_t)dev,
13+
signal);
14+
}
15+
16+
void _PikaStdDevice_UART_event_handler(pika_dev* dev,
17+
PIKA_HAL_UART_EVENT_SIGNAL signal) {
518
pika_eventListener_sendSignal(g_pika_device_event_listener, (uintptr_t)dev,
619
signal);
720
}

‎package/PikaStdDevice/PikaStdDevice_common.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ void _PikaStdDevice_setCallback(PikaObj* self,
77
Arg* eventCallback,
88
uintptr_t eventId);
99

10-
void _PikaStdDevice_event_handler(pika_dev* dev, int signal);
10+
void _PikaStdDevice_GPIO_event_handler(pika_dev* dev,
11+
PIKA_HAL_GPIO_EVENT_SIGNAL signal);
12+
void _PikaStdDevice_TIM_event_handler(pika_dev* dev,
13+
PIKA_HAL_TIM_EVENT_SIGNAL signal);
14+
void _PikaStdDevice_UART_event_handler(pika_dev* dev,
15+
PIKA_HAL_UART_EVENT_SIGNAL signal);
1116

1217
#endif

‎package/PikaStdDevice/pika_hal.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,6 @@ int pika_hal_ioctl(pika_dev* dev, PIKA_HAL_IOCTL_CMD cmd, ...) {
153153
pika_debug("pika_hal_ioctl, dev[0x%p], type[%d], cmd[%d]", dev, dev->type,
154154
cmd);
155155
cmd = _pika_hal_get_arg_cnt(cmd_origin);
156-
if (cmd < 0) {
157-
pika_platform_printf("Error: cmd invalied.\r\n");
158-
return -1;
159-
}
160156
pika_dev_impl* impl = _pika_dev_get_impl(dev->type);
161157
if (impl->ioctl == NULL) {
162158
pika_platform_printf("Error: ioctl not support.\r\n");

‎port/linux/package/pikascript/pikascript-lib/PikaStdDevice/PikaStdDevice_common.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
#include "PikaStdDevice_common.h"
22

33
extern PikaEventListener* g_pika_device_event_listener;
4-
void _PikaStdDevice_GPIO_event_handler(pika_dev* dev, PIKA_HAL_GPIO_EVENT_SIGNAL signal) {
4+
void _PikaStdDevice_GPIO_event_handler(pika_dev* dev,
5+
PIKA_HAL_GPIO_EVENT_SIGNAL signal) {
56
pika_eventListener_sendSignal(g_pika_device_event_listener, (uintptr_t)dev,
67
signal);
78
}
89

9-
void _PikaStdDevice_TIM_event_handler(pika_dev* dev, PIKA_HAL_TIM_EVENT_SIGNAL signal) {
10+
void _PikaStdDevice_TIM_event_handler(pika_dev* dev,
11+
PIKA_HAL_TIM_EVENT_SIGNAL signal) {
1012
pika_eventListener_sendSignal(g_pika_device_event_listener, (uintptr_t)dev,
1113
signal);
1214
}
1315

14-
void _PikaStdDevice_UART_event_handler(pika_dev* dev, PIKA_HAL_UART_EVENT_SIGNAL signal) {
16+
void _PikaStdDevice_UART_event_handler(pika_dev* dev,
17+
PIKA_HAL_UART_EVENT_SIGNAL signal) {
1518
pika_eventListener_sendSignal(g_pika_device_event_listener, (uintptr_t)dev,
1619
signal);
1720
}

‎port/linux/package/pikascript/pikascript-lib/PikaStdDevice/PikaStdDevice_common.h‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ void _PikaStdDevice_setCallback(PikaObj* self,
77
Arg* eventCallback,
88
uintptr_t eventId);
99

10-
void _PikaStdDevice_GPIO_event_handler(pika_dev* dev, PIKA_HAL_GPIO_EVENT_SIGNAL signal);
11-
void _PikaStdDevice_TIM_event_handler(pika_dev* dev, PIKA_HAL_TIM_EVENT_SIGNAL signal);
12-
void _PikaStdDevice_UART_event_handler(pika_dev* dev, PIKA_HAL_UART_EVENT_SIGNAL signal);
10+
void _PikaStdDevice_GPIO_event_handler(pika_dev* dev,
11+
PIKA_HAL_GPIO_EVENT_SIGNAL signal);
12+
void _PikaStdDevice_TIM_event_handler(pika_dev* dev,
13+
PIKA_HAL_TIM_EVENT_SIGNAL signal);
14+
void _PikaStdDevice_UART_event_handler(pika_dev* dev,
15+
PIKA_HAL_UART_EVENT_SIGNAL signal);
1316

1417
#endif

‎src/PikaCompiler.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,8 @@ static int32_t __foreach_handler_libWriteIndex(Arg* argEach,
379379
pika_platform_memcpy(block_buff, module_name,
380380
name_size + 1); /* add '\0' after name */
381381
/* should write the size without align */
382-
pika_platform_memcpy(
383-
block_buff + linker->block_size - sizeof(uint32_t),
384-
&bytecode_size, sizeof(uint32_t));
382+
pika_platform_memcpy(block_buff + linker->block_size - sizeof(uint32_t),
383+
&bytecode_size, sizeof(uint32_t));
385384

386385
/* write the block to file */
387386
linker_fwrite(linker, (uint8_t*)block_buff, linker->block_size);

‎src/PikaVersion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
#define PIKA_VERSION_MINOR 13
33
#define PIKA_VERSION_MICRO 2
44

5-
#define PIKA_EDIT_TIME "2024/02/25 01:45:50"
5+
#define PIKA_EDIT_TIME "2024/03/02 14:19:24"

0 commit comments

Comments
 (0)