Skip to content

Commit dddf541

Browse files
committed
Fix some property declarations that were slightly different
1 parent bf0e1fa commit dddf541

File tree

3 files changed

+9
-21
lines changed

3 files changed

+9
-21
lines changed

extmod/vfs_fat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ STATIC const mp_obj_property_t fat_vfs_label_obj = {
440440
.base.type = &mp_type_property,
441441
.proxy = {(mp_obj_t)&fat_vfs_getlabel_obj,
442442
(mp_obj_t)&fat_vfs_setlabel_obj,
443-
(mp_obj_t)MP_ROM_NONE},
443+
MP_ROM_NONE},
444444
};
445445
#endif
446446

shared-bindings/canio/CAN.c

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ STATIC const mp_obj_property_t canio_can_auto_restart_obj = {
116116
.base.type = &mp_type_property,
117117
.proxy = {(mp_obj_t)&canio_can_auto_restart_get_obj,
118118
(mp_obj_t)&canio_can_auto_restart_set_obj,
119-
(mp_obj_t)mp_const_none},
119+
MP_ROM_NONE},
120120
};
121121

122122

@@ -133,8 +133,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_baudrate_get_obj, canio_can_baudrate_get);
133133
STATIC const mp_obj_property_t canio_can_baudrate_obj = {
134134
.base.type = &mp_type_property,
135135
.proxy = {(mp_obj_t)&canio_can_baudrate_get_obj,
136-
(mp_obj_t)mp_const_none,
137-
(mp_obj_t)mp_const_none},
136+
MP_ROM_NONE, MP_ROM_NONE},
138137
};
139138

140139
//| transmit_error_count: int
@@ -149,9 +148,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_transmit_error_count_get_obj, canio_can_tran
149148

150149
STATIC const mp_obj_property_t canio_can_transmit_error_count_obj = {
151150
.base.type = &mp_type_property,
152-
.proxy = {(mp_obj_t)&canio_can_transmit_error_count_get_obj,
153-
(mp_obj_t)mp_const_none,
154-
(mp_obj_t)mp_const_none},
151+
.proxy = {(mp_obj_t)&canio_can_transmit_error_count_get_obj, MP_ROM_NONE, MP_ROM_NONE},
155152
};
156153

157154
//| receive_error_count: int
@@ -166,9 +163,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_receive_error_count_get_obj, canio_can_recei
166163

167164
STATIC const mp_obj_property_t canio_can_receive_error_count_obj = {
168165
.base.type = &mp_type_property,
169-
.proxy = {(mp_obj_t)&canio_can_receive_error_count_get_obj,
170-
(mp_obj_t)mp_const_none,
171-
(mp_obj_t)mp_const_none},
166+
.proxy = {(mp_obj_t)&canio_can_receive_error_count_get_obj, MP_ROM_NONE, MP_ROM_NONE},
172167
};
173168

174169
//| state: BusState
@@ -183,9 +178,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_state_get_obj, canio_can_state_get);
183178

184179
STATIC const mp_obj_property_t canio_can_state_obj = {
185180
.base.type = &mp_type_property,
186-
.proxy = {(mp_obj_t)&canio_can_state_get_obj,
187-
(mp_obj_t)mp_const_none,
188-
(mp_obj_t)mp_const_none},
181+
.proxy = {(mp_obj_t)&canio_can_state_get_obj, MP_ROM_NONE, MP_ROM_NONE},
189182
};
190183

191184

@@ -285,9 +278,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_loopback_get_obj, canio_can_loopback_get);
285278

286279
STATIC const mp_obj_property_t canio_can_loopback_obj = {
287280
.base.type = &mp_type_property,
288-
.proxy = {(mp_obj_t)&canio_can_loopback_get_obj,
289-
(mp_obj_t)mp_const_none,
290-
(mp_obj_t)mp_const_none},
281+
.proxy = {(mp_obj_t)&canio_can_loopback_get_obj, MP_ROM_NONE, MP_ROM_NONE},
291282
};
292283

293284

@@ -324,9 +315,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_can_silent_get_obj, canio_can_silent_get);
324315

325316
STATIC const mp_obj_property_t canio_can_silent_obj = {
326317
.base.type = &mp_type_property,
327-
.proxy = {(mp_obj_t)&canio_can_silent_get_obj,
328-
(mp_obj_t)mp_const_none,
329-
(mp_obj_t)mp_const_none},
318+
.proxy = {(mp_obj_t)&canio_can_silent_get_obj, MP_ROM_NONE, MP_ROM_NONE},
330319
};
331320

332321

shared-bindings/canio/Listener.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(canio_listener_timeout_set_obj, canio_listener_
153153
STATIC const mp_obj_property_t canio_listener_timeout_obj = {
154154
.base.type = &mp_type_property,
155155
.proxy = {(mp_obj_t)&canio_listener_timeout_get_obj,
156-
(mp_obj_t)&canio_listener_timeout_set_obj,
157-
(mp_obj_t)mp_const_none},
156+
(mp_obj_t)&canio_listener_timeout_set_obj, MP_ROM_NONE},
158157
};
159158

160159

0 commit comments

Comments
 (0)