summaryrefslogtreecommitdiff
path: root/ports/unix
diff options
context:
space:
mode:
Diffstat (limited to 'ports/unix')
-rw-r--r--ports/unix/coverage.c26
-rw-r--r--ports/unix/modffi.c69
-rw-r--r--ports/unix/modjni.c58
-rw-r--r--ports/unix/moduselect.c16
-rw-r--r--ports/unix/modusocket.c21
5 files changed, 107 insertions, 83 deletions
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index cf425ac43..b4567417a 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -106,11 +106,14 @@ STATIC const mp_stream_p_t fileio_stream_p = {
.ioctl = stest_ioctl,
};
-STATIC const mp_obj_type_t mp_type_stest_fileio = {
- { &mp_type_type },
- .protocol = &fileio_stream_p,
- .locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+ mp_type_stest_fileio,
+ MP_QSTR_stest_fileio,
+ MP_TYPE_FLAG_NONE,
+ MP_TYPE_NULL_MAKE_NEW,
+ protocol, &fileio_stream_p,
+ locals_dict, (mp_obj_dict_t *)&rawfile_locals_dict
+ );
// stream read returns non-blocking error
STATIC mp_uint_t stest_read2(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
@@ -133,11 +136,14 @@ STATIC const mp_stream_p_t textio_stream_p2 = {
.is_text = true,
};
-STATIC const mp_obj_type_t mp_type_stest_textio2 = {
- { &mp_type_type },
- .protocol = &textio_stream_p2,
- .locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict2,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+ mp_type_stest_textio2,
+ MP_QSTR_stest_textio2,
+ MP_TYPE_FLAG_NONE,
+ MP_TYPE_NULL_MAKE_NEW,
+ protocol, &textio_stream_p2,
+ locals_dict, (mp_obj_dict_t *)&rawfile_locals_dict2
+ );
// str/bytes objects without a valid hash
STATIC const mp_obj_str_t str_no_hash_obj = {{&mp_type_str}, 0, 10, (const byte *)"0123456789"};
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 6417b5d3b..98f0a1aa0 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -421,13 +421,14 @@ STATIC const mp_rom_map_elem_t ffimod_locals_dict_table[] = {
STATIC MP_DEFINE_CONST_DICT(ffimod_locals_dict, ffimod_locals_dict_table);
-STATIC const mp_obj_type_t ffimod_type = {
- { &mp_type_type },
- .name = MP_QSTR_ffimod,
- .print = ffimod_print,
- .make_new = ffimod_make_new,
- .locals_dict = (mp_obj_dict_t *)&ffimod_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+ ffimod_type,
+ MP_QSTR_ffimod,
+ MP_TYPE_FLAG_NONE,
+ ffimod_make_new,
+ print, ffimod_print,
+ locals_dict, (mp_obj_dict_t *)&ffimod_locals_dict
+ );
// FFI function
@@ -530,12 +531,14 @@ error:
mp_raise_TypeError(MP_ERROR_TEXT("don't know how to pass object to native function"));
}
-STATIC const mp_obj_type_t ffifunc_type = {
- { &mp_type_type },
- .name = MP_QSTR_ffifunc,
- .print = ffifunc_print,
- .call = ffifunc_call,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+ ffifunc_type,
+ MP_QSTR_ffifunc,
+ MP_TYPE_FLAG_NONE,
+ MP_TYPE_NULL_MAKE_NEW,
+ print, ffifunc_print,
+ call, ffifunc_call
+ );
// FFI callback for Python function
@@ -556,12 +559,14 @@ STATIC const mp_rom_map_elem_t fficallback_locals_dict_table[] = {
};
STATIC MP_DEFINE_CONST_DICT(fficallback_locals_dict, fficallback_locals_dict_table);
-STATIC const mp_obj_type_t fficallback_type = {
- { &mp_type_type },
- .name = MP_QSTR_fficallback,
- .print = fficallback_print,
- .locals_dict = (mp_obj_dict_t *)&fficallback_locals_dict
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+ fficallback_type,
+ MP_QSTR_fficallback,
+ MP_TYPE_FLAG_NONE,
+ MP_TYPE_NULL_MAKE_NEW,
+ print, fficallback_print,
+ locals_dict, (mp_obj_dict_t *)&fficallback_locals_dict
+ );
// FFI variable
@@ -592,21 +597,25 @@ STATIC const mp_rom_map_elem_t ffivar_locals_dict_table[] = {
STATIC MP_DEFINE_CONST_DICT(ffivar_locals_dict, ffivar_locals_dict_table);
-STATIC const mp_obj_type_t ffivar_type = {
- { &mp_type_type },
- .name = MP_QSTR_ffivar,
- .print = ffivar_print,
- .locals_dict = (mp_obj_dict_t *)&ffivar_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+ ffivar_type,
+ MP_QSTR_ffivar,
+ MP_TYPE_FLAG_NONE,
+ MP_TYPE_NULL_MAKE_NEW,
+ print, ffivar_print,
+ locals_dict, (mp_obj_dict_t *)&ffivar_locals_dict
+ );
// Generic opaque storage object (unused)
/*
-STATIC const mp_obj_type_t opaque_type = {
- { &mp_type_type },
- .name = MP_QSTR_opaqueval,
-// .print = opaque_print,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+ opaque_type,
+ MP_QSTR_opaqueval,
+ MP_TYPE_FLAG_NONE,
+ MP_TYPE_NULL_MAKE_NEW,
+ // .print = opaque_print,
+ );
*/
STATIC mp_obj_t mod_ffi_open(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 6fa00731f..72f95b645 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -174,14 +174,16 @@ STATIC const mp_rom_map_elem_t jclass_locals_dict_table[] = {
STATIC MP_DEFINE_CONST_DICT(jclass_locals_dict, jclass_locals_dict_table);
-STATIC const mp_obj_type_t jclass_type = {
- { &mp_type_type },
- .name = MP_QSTR_jclass,
- .print = jclass_print,
- .attr = jclass_attr,
- .call = jclass_call,
- .locals_dict = (mp_obj_dict_t *)&jclass_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+ jclass_type,
+ MP_QSTR_jclass,
+ MP_TYPE_FLAG_NONE,
+ MP_TYPE_NULL_MAKE_NEW,
+ print, jclass_print,
+ attr, jclass_attr,
+ call, jclass_call,
+ locals_dict, (mp_obj_dict_t *)&jclass_locals_dict
+ );
STATIC mp_obj_t new_jclass(jclass jc) {
mp_obj_jclass_t *o = mp_obj_malloc(mp_obj_jclass_t, &jclass_type);
@@ -320,16 +322,18 @@ STATIC mp_obj_t subscr_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
return mp_obj_new_getitem_iter(dest, iter_buf);
}
-STATIC const mp_obj_type_t jobject_type = {
- { &mp_type_type },
- .name = MP_QSTR_jobject,
- .print = jobject_print,
- .unary_op = jobject_unary_op,
- .attr = jobject_attr,
- .subscr = jobject_subscr,
- .getiter = subscr_getiter,
-// .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+ jobject_type,
+ MP_QSTR_jobject,
+ MP_TYPE_FLAG_NONE,
+ MP_TYPE_NULL_MAKE_NEW,
+ print, jobject_print,
+ unary_op, jobject_unary_op,
+ attr, jobject_attr,
+ subscr, jobject_subscr,
+ getiter, subscr_getiter,
+ // .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
+ );
STATIC mp_obj_t new_jobject(jobject jo) {
if (jo == NULL) {
@@ -567,14 +571,16 @@ STATIC mp_obj_t jmethod_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
return call_method(self->obj, name, methods, false, n_args, args);
}
-STATIC const mp_obj_type_t jmethod_type = {
- { &mp_type_type },
- .name = MP_QSTR_jmethod,
- .print = jmethod_print,
- .call = jmethod_call,
-// .attr = jobject_attr,
-// .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+ jmethod_type,
+ MP_QSTR_jmethod,
+ MP_TYPE_FLAG_NONE,
+ MP_TYPE_NULL_MAKE_NEW,
+ print, jmethod_print,
+ call, jmethod_call,
+ // .attr = jobject_attr,
+ // .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
+ );
#ifdef __ANDROID__
#define LIBJVM_SO "libdvm.so"
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index 2de4a316e..d8a8d1d8c 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -311,13 +311,15 @@ STATIC const mp_rom_map_elem_t poll_locals_dict_table[] = {
};
STATIC MP_DEFINE_CONST_DICT(poll_locals_dict, poll_locals_dict_table);
-STATIC const mp_obj_type_t mp_type_poll = {
- { &mp_type_type },
- .name = MP_QSTR_poll,
- .getiter = mp_identity_getiter,
- .iternext = poll_iternext,
- .locals_dict = (void *)&poll_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+ mp_type_poll,
+ MP_QSTR_poll,
+ MP_TYPE_FLAG_NONE,
+ MP_TYPE_NULL_MAKE_NEW,
+ getiter, mp_identity_getiter,
+ iternext, poll_iternext,
+ locals_dict, (void *)&poll_locals_dict
+ );
STATIC mp_obj_t select_poll(size_t n_args, const mp_obj_t *args) {
int alloc = 4;
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 72c70d175..7e4476cbd 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -516,16 +516,17 @@ STATIC const mp_stream_p_t usocket_stream_p = {
.ioctl = socket_ioctl,
};
-const mp_obj_type_t mp_type_socket = {
- { &mp_type_type },
- .name = MP_QSTR_socket,
- .print = socket_print,
- .make_new = socket_make_new,
- .getiter = NULL,
- .iternext = NULL,
- .protocol = &usocket_stream_p,
- .locals_dict = (mp_obj_dict_t *)&usocket_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+ mp_type_socket,
+ MP_QSTR_socket,
+ MP_TYPE_FLAG_NONE,
+ socket_make_new,
+ print, socket_print,
+ getiter, NULL,
+ iternext, NULL,
+ protocol, &usocket_stream_p,
+ locals_dict, (mp_obj_dict_t *)&usocket_locals_dict
+ );
#define BINADDR_MAX_LEN sizeof(struct in6_addr)
STATIC mp_obj_t mod_socket_inet_pton(mp_obj_t family_in, mp_obj_t addr_in) {
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-09 16:35:30 +0000