Skip to content

Commit d37f8a1

Browse files
jeplerjepler
committed
milestone: a selection of builds succeed
1 parent 0d75606 commit d37f8a1

32 files changed

Lines changed: 170 additions & 81 deletions

File tree

‎lib/utils/sys_stdio_mphal.c‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,12 @@ STATIC const mp_obj_type_t stdio_obj_type = {
133133
.name = MP_QSTR_FileIO,
134134
// TODO .make_new?
135135
.print = stdio_obj_print,
136-
.getiter = mp_identity_getiter,
137-
.iternext = mp_stream_unbuffered_iter,
138-
.protocol = &stdio_obj_stream_p,
139136
.locals_dict = (mp_obj_dict_t *)&stdio_locals_dict,
137+
EXTENDED_FIELDS(
138+
.getiter = mp_identity_getiter,
139+
.iternext = mp_stream_unbuffered_iter,
140+
.protocol = &stdio_obj_stream_p,
141+
),
140142
};
141143

142144
const sys_stdio_obj_t mp_sys_stdin_obj = {{&stdio_obj_type}, .fd = STDIO_FD_IN};
@@ -167,11 +169,14 @@ STATIC const mp_stream_p_t stdio_buffer_obj_stream_p = {
167169
STATIC const mp_obj_type_t stdio_buffer_obj_type = {
168170
{ &mp_type_type },
169171
.name = MP_QSTR_FileIO,
172+
.flags = MP_TYPE_FLAG_FULL,
170173
.print = stdio_obj_print,
171-
.getiter = mp_identity_getiter,
172-
.iternext = mp_stream_unbuffered_iter,
173-
.protocol = &stdio_buffer_obj_stream_p,
174174
.locals_dict = (mp_obj_dict_t *)&stdio_locals_dict,
175+
EXTENDED_FIELDS(
176+
.getiter = mp_identity_getiter,
177+
.iternext = mp_stream_unbuffered_iter,
178+
.protocol = &stdio_buffer_obj_stream_p,
179+
),
175180
};
176181

177182
STATIC const sys_stdio_obj_t stdio_buffer_obj = {{&stdio_buffer_obj_type}, .fd = 0}; // fd unused

‎shared-bindings/_bleio/Address.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,13 @@ STATIC MP_DEFINE_CONST_DICT(bleio_address_locals_dict, bleio_address_locals_dict
215215

216216
const mp_obj_type_t bleio_address_type = {
217217
{ &mp_type_type },
218+
.flags = MP_TYPE_FLAG_FULL,
218219
.name = MP_QSTR_Address,
219220
.make_new = bleio_address_make_new,
220221
.print = bleio_address_print,
221-
.unary_op = bleio_address_unary_op,
222-
.binary_op = bleio_address_binary_op,
223-
.locals_dict = (mp_obj_dict_t *)&bleio_address_locals_dict
222+
.locals_dict = (mp_obj_dict_t *)&bleio_address_locals_dict,
223+
EXTENDED_FIELDS(
224+
.unary_op = bleio_address_unary_op,
225+
.binary_op = bleio_address_binary_op,
226+
),
224227
};

‎shared-bindings/_bleio/CharacteristicBuffer.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,13 @@ STATIC const mp_stream_p_t characteristic_buffer_stream_p = {
238238

239239
const mp_obj_type_t bleio_characteristic_buffer_type = {
240240
{ &mp_type_type },
241+
.flags = MP_TYPE_FLAG_FULL,
241242
.name = MP_QSTR_CharacteristicBuffer,
242243
.make_new = bleio_characteristic_buffer_make_new,
243-
.getiter = mp_identity_getiter,
244-
.iternext = mp_stream_unbuffered_iter,
245-
.protocol = &characteristic_buffer_stream_p,
246-
.locals_dict = (mp_obj_dict_t *)&bleio_characteristic_buffer_locals_dict
244+
.locals_dict = (mp_obj_dict_t *)&bleio_characteristic_buffer_locals_dict,
245+
EXTENDED_FIELDS(
246+
.getiter = mp_identity_getiter,
247+
.iternext = mp_stream_unbuffered_iter,
248+
.protocol = &characteristic_buffer_stream_p,
249+
),
247250
};

‎shared-bindings/_bleio/Connection.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,10 @@ STATIC MP_DEFINE_CONST_DICT(bleio_connection_locals_dict, bleio_connection_local
266266

267267
const mp_obj_type_t bleio_connection_type = {
268268
{ &mp_type_type },
269+
.flags = MP_TYPE_FLAG_FULL,
269270
.name = MP_QSTR_Connection,
270271
.locals_dict = (mp_obj_dict_t *)&bleio_connection_locals_dict,
271-
.unary_op = mp_generic_unary_op,
272+
EXTENDED_FIELDS(
273+
.unary_op = mp_generic_unary_op,
274+
),
272275
};

‎shared-bindings/_bleio/ScanResults.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ STATIC mp_obj_t scanresults_iternext(mp_obj_t self_in) {
6262

6363
const mp_obj_type_t bleio_scanresults_type = {
6464
{ &mp_type_type },
65+
.flags = MP_TYPE_FLAG_FULL,
6566
.name = MP_QSTR_ScanResults,
66-
.getiter = mp_identity_getiter,
67-
.iternext = scanresults_iternext,
67+
EXTENDED_FIELDS(
68+
.getiter = mp_identity_getiter,
69+
.iternext = scanresults_iternext,
70+
),
6871
};

‎shared-bindings/_bleio/UUID.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,13 @@ void bleio_uuid_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
300300

301301
const mp_obj_type_t bleio_uuid_type = {
302302
{ &mp_type_type },
303+
.flags = MP_TYPE_FLAG_FULL,
303304
.name = MP_QSTR_UUID,
304305
.print = bleio_uuid_print,
305306
.make_new = bleio_uuid_make_new,
306-
.unary_op = bleio_uuid_unary_op,
307-
.binary_op = bleio_uuid_binary_op,
308307
.locals_dict = (mp_obj_dict_t *)&bleio_uuid_locals_dict,
308+
EXTENDED_FIELDS(
309+
.unary_op = bleio_uuid_unary_op,
310+
.binary_op = bleio_uuid_binary_op,
311+
),
309312
};

‎shared-bindings/_pixelbuf/PixelBuf.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -383,10 +383,12 @@ STATIC MP_DEFINE_CONST_DICT(pixelbuf_pixelbuf_locals_dict, pixelbuf_pixelbuf_loc
383383
const mp_obj_type_t pixelbuf_pixelbuf_type = {
384384
{ &mp_type_type },
385385
.name = MP_QSTR_PixelBuf,
386-
.subscr = pixelbuf_pixelbuf_subscr,
387-
.make_new = pixelbuf_pixelbuf_make_new,
388-
.unary_op = pixelbuf_pixelbuf_unary_op,
389-
.getiter = mp_obj_new_generic_iterator,
390-
.print = NULL,
386+
.flags = MP_TYPE_FLAG_FULL,
391387
.locals_dict = (mp_obj_t)&pixelbuf_pixelbuf_locals_dict,
388+
.make_new = pixelbuf_pixelbuf_make_new,
389+
EXTENDED_FIELDS(
390+
.subscr = pixelbuf_pixelbuf_subscr,
391+
.unary_op = pixelbuf_pixelbuf_unary_op,
392+
.getiter = mp_obj_new_generic_iterator,
393+
),
392394
};

‎shared-bindings/alarm/SleepMemory.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,10 @@ STATIC mp_obj_t alarm_sleep_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, m
175175
const mp_obj_type_t alarm_sleep_memory_type = {
176176
{ &mp_type_type },
177177
.name = MP_QSTR_SleepMemory,
178-
.subscr = alarm_sleep_memory_subscr,
179-
.unary_op = alarm_sleep_memory_unary_op,
180-
.print = NULL,
178+
.flags = MP_TYPE_FLAG_FULL,
181179
.locals_dict = (mp_obj_t)&alarm_sleep_memory_locals_dict,
180+
EXTENDED_FIELDS(
181+
.subscr = alarm_sleep_memory_subscr,
182+
.unary_op = alarm_sleep_memory_unary_op,
183+
),
182184
};

‎shared-bindings/audiocore/RawSample.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,10 @@ STATIC const audiosample_p_t audioio_rawsample_proto = {
184184
const mp_obj_type_t audioio_rawsample_type = {
185185
{ &mp_type_type },
186186
.name = MP_QSTR_RawSample,
187+
.flags = MP_TYPE_FLAG_FULL,
187188
.make_new = audioio_rawsample_make_new,
188189
.locals_dict = (mp_obj_dict_t *)&audioio_rawsample_locals_dict,
189-
.protocol = &audioio_rawsample_proto,
190+
EXTENDED_FIELDS(
191+
.protocol = &audioio_rawsample_proto,
192+
),
190193
};

‎shared-bindings/audiocore/WaveFile.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,10 @@ STATIC const audiosample_p_t audioio_wavefile_proto = {
213213
const mp_obj_type_t audioio_wavefile_type = {
214214
{ &mp_type_type },
215215
.name = MP_QSTR_WaveFile,
216+
.flags = MP_TYPE_FLAG_FULL,
216217
.make_new = audioio_wavefile_make_new,
217218
.locals_dict = (mp_obj_dict_t *)&audioio_wavefile_locals_dict,
218-
.protocol = &audioio_wavefile_proto,
219+
EXTENDED_FIELDS(
220+
.protocol = &audioio_wavefile_proto,
221+
),
219222
};

0 commit comments

Comments
 (0)