Skip to content

Commit 9ad6199

Browse files
committed
fix warnnings on ac5
1 parent abbcbb9 commit 9ad6199

File tree

8 files changed

+27
-14
lines changed

8 files changed

+27
-14
lines changed

port/linux/package/pikascript/pikascript-lib/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);

port/linux/package/pikascript/pikascript-lib/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);

port/linux/package/pikascript/pikascript-lib/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);

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
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, PIKA_HAL_GPIO_EVENT_SIGNAL signal) {
5+
pika_eventListener_sendSignal(g_pika_device_event_listener, (uintptr_t)dev,
6+
signal);
7+
}
8+
9+
void _PikaStdDevice_TIM_event_handler(pika_dev* dev, PIKA_HAL_TIM_EVENT_SIGNAL signal) {
10+
pika_eventListener_sendSignal(g_pika_device_event_listener, (uintptr_t)dev,
11+
signal);
12+
}
13+
14+
void _PikaStdDevice_UART_event_handler(pika_dev* dev, PIKA_HAL_UART_EVENT_SIGNAL signal) {
515
pika_eventListener_sendSignal(g_pika_device_event_listener, (uintptr_t)dev,
616
signal);
717
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ 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, 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);
1113

1214
#endif

port/linux/package/pikascript/pikascript-lib/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");

src/PikaCompiler.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ static int32_t __foreach_handler_libWriteIndex(Arg* argEach,
365365
if (arg_isObject(argEach)) {
366366
PikaObj* module_obj = arg_getPtr(argEach);
367367
uint32_t bytecode_size = obj_getInt(module_obj, "bytesize");
368-
uint32_t bytecode_size_align = align_by(bytecode_size, 4);
369368
char* module_name = obj_getStr(module_obj, "name");
370369
module_name = strsReplace(&buffs, module_name, "|", ".");
371370
uint32_t name_size = strGetSize(module_name);
@@ -381,8 +380,8 @@ static int32_t __foreach_handler_libWriteIndex(Arg* argEach,
381380
name_size + 1); /* add '\0' after name */
382381
/* should write the size without align */
383382
pika_platform_memcpy(
384-
block_buff + linker->block_size - sizeof(bytecode_size_align),
385-
&bytecode_size, sizeof(bytecode_size_align));
383+
block_buff + linker->block_size - sizeof(uint32_t),
384+
&bytecode_size, sizeof(uint32_t));
386385

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

src/PikaPlatform.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,13 @@ extern "C" {
104104
#pragma warning(disable : 4113)
105105
#endif
106106

107+
#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 5000000)
108+
#pragma diag_suppress 66
109+
#pragma diag_suppress 188
110+
#pragma diag_suppress 546
111+
#pragma diag_suppress 177
112+
#endif
113+
107114
/* OS */
108115
#if defined(__RTTHREAD__) && PIKA_RTTHREAD_ENABLE
109116
#include <rtthread.h>

0 commit comments

Comments
 (0)