From 021926c96abc148c97349b6c5ab7537f50bf013e Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 13 Oct 2023 12:11:14 -0400 Subject: [PATCH] Fix DotClockFrameBuffer type definition also remove unnecessary `const` with `MP_DEFINE_CONST_TYPE_OBJ` in I2C --- shared-bindings/busio/I2C.c | 2 +- .../dotclockframebuffer/DotClockFramebuffer.c | 20 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c index 1bf92d1329..376969847f 100644 --- a/shared-bindings/busio/I2C.c +++ b/shared-bindings/busio/I2C.c @@ -388,7 +388,7 @@ STATIC const mp_rom_map_elem_t busio_i2c_locals_dict_table[] = { STATIC MP_DEFINE_CONST_DICT(busio_i2c_locals_dict, busio_i2c_locals_dict_table); -const MP_DEFINE_CONST_OBJ_TYPE( +MP_DEFINE_CONST_OBJ_TYPE( busio_i2c_type, MP_QSTR_I2C, MP_TYPE_FLAG_NONE, diff --git a/shared-bindings/dotclockframebuffer/DotClockFramebuffer.c b/shared-bindings/dotclockframebuffer/DotClockFramebuffer.c index 6799618efa..3a55166f8b 100644 --- a/shared-bindings/dotclockframebuffer/DotClockFramebuffer.c +++ b/shared-bindings/dotclockframebuffer/DotClockFramebuffer.c @@ -382,14 +382,12 @@ STATIC const mp_rom_map_elem_t dotclockframebuffer_framebuffer_locals_dict_table }; STATIC MP_DEFINE_CONST_DICT(dotclockframebuffer_framebuffer_locals_dict, dotclockframebuffer_framebuffer_locals_dict_table); -const mp_obj_type_t dotclockframebuffer_framebuffer_type = { - { &mp_type_type }, - .flags = MP_TYPE_FLAG_EXTENDED, - .name = MP_QSTR_DotClockFramebuffer, - .make_new = dotclockframebuffer_framebuffer_make_new, - .locals_dict = (mp_obj_dict_t *)&dotclockframebuffer_framebuffer_locals_dict, - MP_TYPE_EXTENDED_FIELDS( - .buffer_p = { .get_buffer = dotclockframebuffer_framebuffer_get_buffer, }, - .protocol = &dotclockframebuffer_framebuffer_proto, - ), -}; +MP_DEFINE_CONST_OBJ_TYPE( + dotclockframebuffer_framebuffer_type, + MP_QSTR_DotClockFramebuffer, + MP_TYPE_FLAG_NONE, + make_new, dotclockframebuffer_framebuffer_make_new, + locals_dict, &dotclockframebuffer_framebuffer_locals_dict, + buffer, dotclockframebuffer_framebuffer_get_buffer, + protocol, &dotclockframebuffer_framebuffer_proto + );