diff options
| author | w4kpm <kelly@fammcdonald.net> | 2016-11-22 08:30:52 -0500 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2016-12-02 17:26:37 +1100 |
| commit | bd476acd41bcdd3718e73ec67ffc6a850d6aa453 (patch) | |
| tree | 5d96ddf58026adda004492228aedd0b0bec5aa8b /extmod/vfs_fat_file.c | |
| parent | e50cb73b7a35a09757dc9d583167f7dcfe18f038 (diff) | |
| download | micropython-bd476acd41bcdd3718e73ec67ffc6a850d6aa453.tar.gz micropython-bd476acd41bcdd3718e73ec67ffc6a850d6aa453.zip | |
extmod/vfs_fat_file: Allow file obj to respond to ioctl flush request.
Diffstat (limited to 'extmod/vfs_fat_file.c')
| -rw-r--r-- | extmod/vfs_fat_file.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c index f2144434e4..77848b5a53 100644 --- a/extmod/vfs_fat_file.c +++ b/extmod/vfs_fat_file.c @@ -108,15 +108,6 @@ STATIC mp_uint_t file_obj_write(mp_obj_t self_in, const void *buf, mp_uint_t siz return sz_out; } -STATIC mp_obj_t file_obj_flush(mp_obj_t self_in) { - pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in); - FRESULT res = f_sync(&self->fp); - if (res != FR_OK) { - mp_raise_OSError(fresult_to_errno_table[res]); - } - return mp_const_none; -} -STATIC MP_DEFINE_CONST_FUN_OBJ_1(file_obj_flush_obj, file_obj_flush); STATIC mp_obj_t file_obj_close(mp_obj_t self_in) { pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in); @@ -164,6 +155,14 @@ STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, s->offset = f_tell(&self->fp); return 0; + } else if (request == MP_STREAM_FLUSH) { + FRESULT res = f_sync(&self->fp); + if (res != FR_OK) { + *errcode = fresult_to_errno_table[res]; + return MP_STREAM_ERROR; + } + return 0; + } else { *errcode = MP_EINVAL; return MP_STREAM_ERROR; @@ -243,7 +242,7 @@ STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) }, { MP_ROM_QSTR(MP_QSTR_readlines), MP_ROM_PTR(&mp_stream_unbuffered_readlines_obj) }, { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) }, - { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&file_obj_flush_obj) }, + { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) }, { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&file_obj_close_obj) }, { MP_ROM_QSTR(MP_QSTR_seek), MP_ROM_PTR(&mp_stream_seek_obj) }, { MP_ROM_QSTR(MP_QSTR_tell), MP_ROM_PTR(&mp_stream_tell_obj) }, |