Skip to content

Commit 54d4827

Browse files
tannewttannewt
authored
Merge pull request adafruit#9684 from diamant3/adafruitGH-9660
remove 'mp_obj_property_t' usage remains
2 parents 7f14b9c + 2a85894 commit 54d4827

File tree

6 files changed

+30
-72
lines changed

6 files changed

+30
-72
lines changed

‎extmod/vfs_fat.c‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -484,12 +484,9 @@ static mp_obj_t vfs_fat_getreadonly(mp_obj_t self_in) {
484484
return mp_obj_new_bool(!filesystem_is_writable_by_python(self));
485485
}
486486
static MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_getreadonly_obj, vfs_fat_getreadonly);
487-
static const mp_obj_property_t fat_vfs_readonly_obj = {
488-
.base.type = &mp_type_property,
489-
.proxy = {(mp_obj_t)&fat_vfs_getreadonly_obj,
490-
MP_ROM_NONE,
491-
MP_ROM_NONE},
492-
};
487+
488+
static MP_PROPERTY_GETTER(fat_vfs_readonly_obj,
489+
(mp_obj_t)&fat_vfs_getreadonly_obj);
493490

494491
#if MICROPY_FATFS_USE_LABEL
495492
static mp_obj_t vfs_fat_getlabel(mp_obj_t self_in) {
@@ -517,12 +514,10 @@ static mp_obj_t vfs_fat_setlabel(mp_obj_t self_in, mp_obj_t label_in) {
517514
return mp_const_none;
518515
}
519516
static MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_setlabel_obj, vfs_fat_setlabel);
520-
static const mp_obj_property_t fat_vfs_label_obj = {
521-
.base.type = &mp_type_property,
522-
.proxy = {(mp_obj_t)&fat_vfs_getlabel_obj,
523-
(mp_obj_t)&fat_vfs_setlabel_obj,
524-
MP_ROM_NONE},
525-
};
517+
518+
static MP_PROPERTY_GETSET(fat_vfs_label_obj,
519+
(mp_obj_t)&fat_vfs_getlabel_obj,
520+
(mp_obj_t)&fat_vfs_setlabel_obj);
526521
#endif
527522

528523
static const mp_rom_map_elem_t fat_vfs_locals_dict_table[] = {

‎ports/raspberrypi/bindings/rp2pio/StateMachine.c‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -610,13 +610,8 @@ static mp_obj_t rp2pio_statemachine_obj_get_writing(mp_obj_t self_in) {
610610
}
611611
MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_writing_obj, rp2pio_statemachine_obj_get_writing);
612612

613-
const mp_obj_property_t rp2pio_statemachine_writing_obj = {
614-
.base.type = &mp_type_property,
615-
.proxy = {(mp_obj_t)&rp2pio_statemachine_get_writing_obj,
616-
MP_ROM_NONE,
617-
MP_ROM_NONE},
618-
};
619-
613+
MP_PROPERTY_GETTER(rp2pio_statemachine_writing_obj,
614+
(mp_obj_t)&rp2pio_statemachine_get_writing_obj);
620615

621616
//| pending: int
622617
//| """Returns the number of pending buffers for background writing.
@@ -628,12 +623,8 @@ static mp_obj_t rp2pio_statemachine_obj_get_pending(mp_obj_t self_in) {
628623
}
629624
MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_pending_obj, rp2pio_statemachine_obj_get_pending);
630625

631-
const mp_obj_property_t rp2pio_statemachine_pending_obj = {
632-
.base.type = &mp_type_property,
633-
.proxy = {(mp_obj_t)&rp2pio_statemachine_get_pending_obj,
634-
MP_ROM_NONE,
635-
MP_ROM_NONE},
636-
};
626+
MP_PROPERTY_GETTER(rp2pio_statemachine_pending_obj,
627+
(mp_obj_t)&rp2pio_statemachine_get_pending_obj);
637628

638629
//| def readinto(
639630
//| self,
@@ -847,13 +838,8 @@ static mp_obj_t rp2pio_statemachine_obj_get_txstall(mp_obj_t self_in) {
847838
}
848839
MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_txstall_obj, rp2pio_statemachine_obj_get_txstall);
849840

850-
const mp_obj_property_t rp2pio_statemachine_txstall_obj = {
851-
.base.type = &mp_type_property,
852-
.proxy = {(mp_obj_t)&rp2pio_statemachine_get_txstall_obj,
853-
MP_ROM_NONE,
854-
MP_ROM_NONE},
855-
};
856-
841+
MP_PROPERTY_GETTER(rp2pio_statemachine_txstall_obj,
842+
(mp_obj_t)&rp2pio_statemachine_get_txstall_obj);
857843

858844
//| rxstall: bool
859845
//| """True when the state machine has stalled due to a full RX FIFO since the last

‎shared-bindings/displayio/OnDiskBitmap.c‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,8 @@ static mp_obj_t displayio_ondiskbitmap_obj_get_pixel_shader(mp_obj_t self_in) {
113113

114114
MP_DEFINE_CONST_FUN_OBJ_1(displayio_ondiskbitmap_get_pixel_shader_obj, displayio_ondiskbitmap_obj_get_pixel_shader);
115115

116-
const mp_obj_property_t displayio_ondiskbitmap_pixel_shader_obj = {
117-
.base.type = &mp_type_property,
118-
.proxy = {(mp_obj_t)&displayio_ondiskbitmap_get_pixel_shader_obj,
119-
(mp_obj_t)MP_ROM_NONE,
120-
(mp_obj_t)MP_ROM_NONE},
121-
};
122-
116+
MP_PROPERTY_GETTER(displayio_ondiskbitmap_pixel_shader_obj,
117+
(mp_obj_t)&displayio_ondiskbitmap_get_pixel_shader_obj);
123118

124119
static const mp_rom_map_elem_t displayio_ondiskbitmap_locals_dict_table[] = {
125120
{ MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_ondiskbitmap_height_obj) },

‎shared-bindings/keypad/__init__.c‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,8 @@ static mp_obj_t keypad_generic_get_key_count(mp_obj_t self_in) {
3737
}
3838
MP_DEFINE_CONST_FUN_OBJ_1(keypad_generic_get_key_count_obj, keypad_generic_get_key_count);
3939

40-
const mp_obj_property_t keypad_generic_key_count_obj = {
41-
.base.type = &mp_type_property,
42-
.proxy = {(mp_obj_t)&keypad_generic_get_key_count_obj,
43-
MP_ROM_NONE,
44-
MP_ROM_NONE},
45-
};
40+
MP_PROPERTY_GETTER(keypad_generic_key_count_obj,
41+
(mp_obj_t)&keypad_generic_get_key_count_obj);
4642

4743
static mp_obj_t keypad_generic_get_events(mp_obj_t self_in) {
4844
keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -52,13 +48,8 @@ static mp_obj_t keypad_generic_get_events(mp_obj_t self_in) {
5248
}
5349
MP_DEFINE_CONST_FUN_OBJ_1(keypad_generic_get_events_obj, keypad_generic_get_events);
5450

55-
const mp_obj_property_t keypad_generic_events_obj = {
56-
.base.type = &mp_type_property,
57-
.proxy = {(mp_obj_t)&keypad_generic_get_events_obj,
58-
MP_ROM_NONE,
59-
MP_ROM_NONE},
60-
};
61-
51+
MP_PROPERTY_GETTER(keypad_generic_events_obj,
52+
(mp_obj_t)&keypad_generic_get_events_obj);
6253

6354
//| """Support for scanning keys and key matrices
6455
//|

‎shared-bindings/keypad/__init__.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ mp_obj_t common_hal_keypad_generic_get_events(void *self);
1717

1818
MP_DECLARE_CONST_FUN_OBJ_1(keypad_generic_reset_obj);
1919

20-
extern const mp_obj_property_t keypad_generic_events_obj;
21-
extern const mp_obj_property_t keypad_generic_key_count_obj;
20+
extern const mp_obj_property_getter_t keypad_generic_events_obj;
21+
extern const mp_obj_property_getter_t keypad_generic_key_count_obj;

‎shared-bindings/vectorio/Rectangle.c‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,9 @@ static mp_obj_t vectorio_rectangle_obj_set_width(mp_obj_t self_in, mp_obj_t widt
8585
}
8686
MP_DEFINE_CONST_FUN_OBJ_2(vectorio_rectangle_set_width_obj, vectorio_rectangle_obj_set_width);
8787

88-
const mp_obj_property_t vectorio_rectangle_width_obj = {
89-
.base.type = &mp_type_property,
90-
.proxy = {(mp_obj_t)&vectorio_rectangle_get_width_obj,
91-
(mp_obj_t)&vectorio_rectangle_set_width_obj,
92-
MP_ROM_NONE},
93-
};
88+
MP_PROPERTY_GETSET(vectorio_rectangle_width_obj,
89+
(mp_obj_t)&vectorio_rectangle_get_width_obj,
90+
(mp_obj_t)&vectorio_rectangle_set_width_obj);
9491

9592
//| height: int
9693
//| """The height of the rectangle in pixels."""
@@ -107,12 +104,9 @@ static mp_obj_t vectorio_rectangle_obj_set_height(mp_obj_t self_in, mp_obj_t hei
107104
}
108105
MP_DEFINE_CONST_FUN_OBJ_2(vectorio_rectangle_set_height_obj, vectorio_rectangle_obj_set_height);
109106

110-
const mp_obj_property_t vectorio_rectangle_height_obj = {
111-
.base.type = &mp_type_property,
112-
.proxy = {(mp_obj_t)&vectorio_rectangle_get_height_obj,
113-
(mp_obj_t)&vectorio_rectangle_set_height_obj,
114-
MP_ROM_NONE},
115-
};
107+
MP_PROPERTY_GETSET(vectorio_rectangle_height_obj,
108+
(mp_obj_t)&vectorio_rectangle_get_height_obj,
109+
(mp_obj_t)&vectorio_rectangle_set_height_obj);
116110

117111
//| color_index: int
118112
//| """The color_index of the rectangle in 1 based index of the palette."""
@@ -129,12 +123,9 @@ static mp_obj_t vectorio_rectangle_obj_set_color_index(mp_obj_t self_in, mp_obj_
129123
}
130124
MP_DEFINE_CONST_FUN_OBJ_2(vectorio_rectangle_set_color_index_obj, vectorio_rectangle_obj_set_color_index);
131125

132-
const mp_obj_property_t vectorio_rectangle_color_index_obj = {
133-
.base.type = &mp_type_property,
134-
.proxy = {(mp_obj_t)&vectorio_rectangle_get_color_index_obj,
135-
(mp_obj_t)&vectorio_rectangle_set_color_index_obj,
136-
MP_ROM_NONE},
137-
};
126+
MP_PROPERTY_GETSET(vectorio_rectangle_color_index_obj,
127+
(mp_obj_t)&vectorio_rectangle_get_color_index_obj,
128+
(mp_obj_t)&vectorio_rectangle_set_color_index_obj);
138129

139130
// Documentation for properties inherited from VectorShape.
140131

0 commit comments

Comments
 (0)