Skip to content

Commit ca43609

Browse files
committed
fixes compile error
1 parent 2e06069 commit ca43609

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

ext_mod/lcd_bus/common_src/spi_bus.c

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
return mp_const_none;
2929
}
3030

31-
32-
STATIC MP_DEFINE_CONST_DICT(mp_lcd_spi_bus_locals_dict, mp_lcd_bus_locals_dict_table);
33-
3431
#else
3532
#ifdef MICROPY_PY_NRF
3633
#include "modules/machine/spi.h"
@@ -347,23 +344,27 @@
347344
/* end sending functions */
348345

349346
/* end function definitions */
350-
STATIC const mp_rom_map_elem_t mp_lcd_spi_bus_locals_dict_table[] = {
351-
{ MP_ROM_QSTR(MP_QSTR_get_host), MP_ROM_PTR(&s_spi_bus_get_host_obj) },
352-
{ MP_ROM_QSTR(MP_QSTR_get_lane_count), MP_ROM_PTR(&mp_lcd_bus_get_lane_count_obj) },
353-
{ MP_ROM_QSTR(MP_QSTR_allocate_framebuffer), MP_ROM_PTR(&mp_lcd_bus_allocate_framebuffer_obj) },
354-
{ MP_ROM_QSTR(MP_QSTR_free_framebuffer), MP_ROM_PTR(&mp_lcd_bus_free_framebuffer_obj) },
355-
{ MP_ROM_QSTR(MP_QSTR_register_callback), MP_ROM_PTR(&mp_lcd_bus_register_callback_obj) },
356-
{ MP_ROM_QSTR(MP_QSTR_tx_param), MP_ROM_PTR(&mp_lcd_bus_tx_param_obj) },
357-
{ MP_ROM_QSTR(MP_QSTR_tx_color), MP_ROM_PTR(&mp_lcd_bus_tx_color_obj) },
358-
{ MP_ROM_QSTR(MP_QSTR_rx_param), MP_ROM_PTR(&mp_lcd_bus_rx_param_obj) },
359-
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&mp_lcd_bus_init_obj) },
360-
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&mp_lcd_bus_deinit_obj) },
361-
{ MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_lcd_bus_deinit_obj) },
362-
};
363-
364-
STATIC MP_DEFINE_CONST_DICT(mp_lcd_spi_bus_locals_dict, mp_lcd_spi_bus_locals_dict_table);
365347

348+
349+
#endif
350+
351+
STATIC const mp_rom_map_elem_t mp_lcd_spi_bus_locals_dict_table[] = {
352+
#ifndef MP_PORT_UNIX
353+
{ MP_ROM_QSTR(MP_QSTR_get_host), MP_ROM_PTR(&s_spi_bus_get_host_obj) },
366354
#endif
355+
{ MP_ROM_QSTR(MP_QSTR_get_lane_count), MP_ROM_PTR(&mp_lcd_bus_get_lane_count_obj) },
356+
{ MP_ROM_QSTR(MP_QSTR_allocate_framebuffer), MP_ROM_PTR(&mp_lcd_bus_allocate_framebuffer_obj) },
357+
{ MP_ROM_QSTR(MP_QSTR_free_framebuffer), MP_ROM_PTR(&mp_lcd_bus_free_framebuffer_obj) },
358+
{ MP_ROM_QSTR(MP_QSTR_register_callback), MP_ROM_PTR(&mp_lcd_bus_register_callback_obj) },
359+
{ MP_ROM_QSTR(MP_QSTR_tx_param), MP_ROM_PTR(&mp_lcd_bus_tx_param_obj) },
360+
{ MP_ROM_QSTR(MP_QSTR_tx_color), MP_ROM_PTR(&mp_lcd_bus_tx_color_obj) },
361+
{ MP_ROM_QSTR(MP_QSTR_rx_param), MP_ROM_PTR(&mp_lcd_bus_rx_param_obj) },
362+
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&mp_lcd_bus_init_obj) },
363+
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&mp_lcd_bus_deinit_obj) },
364+
{ MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_lcd_bus_deinit_obj) },
365+
};
366+
367+
STATIC MP_DEFINE_CONST_DICT(mp_lcd_spi_bus_locals_dict, mp_lcd_spi_bus_locals_dict_table);
367368

368369
/* create micropython class */
369370
/* create micropython class */

ext_mod/lcd_bus/modlcd_bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ mp_obj_t mp_lcd_bus_register_callback(size_t n_args, const mp_obj_t *pos_args, m
242242
MP_DEFINE_CONST_FUN_OBJ_KW(mp_lcd_bus_register_callback_obj, 2, mp_lcd_bus_register_callback);
243243

244244

245-
const mp_rom_map_elem_t mp_lcd_bus_locals_dict_table[] = {
245+
STATIC const mp_rom_map_elem_t mp_lcd_bus_locals_dict_table[10] = {
246246
{ MP_ROM_QSTR(MP_QSTR_get_lane_count), MP_ROM_PTR(&mp_lcd_bus_get_lane_count_obj) },
247247
{ MP_ROM_QSTR(MP_QSTR_allocate_framebuffer), MP_ROM_PTR(&mp_lcd_bus_allocate_framebuffer_obj) },
248248
{ MP_ROM_QSTR(MP_QSTR_free_framebuffer), MP_ROM_PTR(&mp_lcd_bus_free_framebuffer_obj) },

ext_mod/lcd_bus/modlcd_bus.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
extern const mp_obj_fun_builtin_var_t mp_lcd_bus_allocate_framebuffer_obj;
2020

2121
extern const mp_obj_dict_t mp_lcd_bus_locals_dict;
22-
extern const mp_rom_map_elem_t *mp_lcd_bus_locals_dict_table;
2322

2423
#endif /* _MODLCD_BUS_H_ */
2524

0 commit comments

Comments
 (0)