aboutsummaryrefslogtreecommitdiff
path: root/ports/stm32/sdcard.c
diff options
context:
space:
mode:
authorDamien George2018-07-08 23:25:11 +1000
committerDamien George2018-07-08 23:25:11 +1000
commite1ae9939aca230758951f5b5b45084374e497254 (patch)
tree9b5e424e366e94395cd4976dd9acc6eb906e87ae /ports/stm32/sdcard.c
parentaa735dc6a478f1f99f6e433b89ca047cbf536f33 (diff)
stm32: Support compiling with object representation D.
With this and previous patches the stm32 port can now be compiled using object representation D (nan boxing). Note that native code and frozen mpy files with float constants are currently not supported with this object representation.
Diffstat (limited to 'ports/stm32/sdcard.c')
-rw-r--r--ports/stm32/sdcard.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index 27e7a34b2..c18e54b6d 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -437,7 +437,7 @@ STATIC mp_obj_t pyb_sdcard_make_new(const mp_obj_type_t *type, size_t n_args, si
mp_arg_check_num(n_args, n_kw, 0, 0, false);
// return singleton object
- return (mp_obj_t)&pyb_sdcard_obj;
+ return MP_OBJ_FROM_PTR(&pyb_sdcard_obj);
}
STATIC mp_obj_t sd_present(mp_obj_t self) {
@@ -576,14 +576,14 @@ void sdcard_init_vfs(fs_user_mount_t *vfs, int part) {
vfs->flags |= FSUSER_NATIVE | FSUSER_HAVE_IOCTL;
vfs->fatfs.drv = vfs;
vfs->fatfs.part = part;
- vfs->readblocks[0] = (mp_obj_t)&pyb_sdcard_readblocks_obj;
- vfs->readblocks[1] = (mp_obj_t)&pyb_sdcard_obj;
- vfs->readblocks[2] = (mp_obj_t)sdcard_read_blocks; // native version
- vfs->writeblocks[0] = (mp_obj_t)&pyb_sdcard_writeblocks_obj;
- vfs->writeblocks[1] = (mp_obj_t)&pyb_sdcard_obj;
- vfs->writeblocks[2] = (mp_obj_t)sdcard_write_blocks; // native version
- vfs->u.ioctl[0] = (mp_obj_t)&pyb_sdcard_ioctl_obj;
- vfs->u.ioctl[1] = (mp_obj_t)&pyb_sdcard_obj;
+ vfs->readblocks[0] = MP_OBJ_FROM_PTR(&pyb_sdcard_readblocks_obj);
+ vfs->readblocks[1] = MP_OBJ_FROM_PTR(&pyb_sdcard_obj);
+ vfs->readblocks[2] = MP_OBJ_FROM_PTR(sdcard_read_blocks); // native version
+ vfs->writeblocks[0] = MP_OBJ_FROM_PTR(&pyb_sdcard_writeblocks_obj);
+ vfs->writeblocks[1] = MP_OBJ_FROM_PTR(&pyb_sdcard_obj);
+ vfs->writeblocks[2] = MP_OBJ_FROM_PTR(sdcard_write_blocks); // native version
+ vfs->u.ioctl[0] = MP_OBJ_FROM_PTR(&pyb_sdcard_ioctl_obj);
+ vfs->u.ioctl[1] = MP_OBJ_FROM_PTR(&pyb_sdcard_obj);
}
#endif // MICROPY_HW_HAS_SDCARD