30ee7019ca
Fixes for stmhal USB mass storage, lwIP bindings and VFS regressions This release provides an important fix for the USB mass storage device in the stmhal port by implementing the SCSI SYNCHRONIZE_CACHE command, which is now require by some Operating Systems. There are also fixes for the lwIP bindings to improve non-blocking sockets and error codes. The VFS has some regressions fixed including the ability to statvfs the root. All changes are listed below. py core: - modbuiltins: add core-provided version of input() function - objstr: catch case of negative "maxsplit" arg to str.rsplit() - persistentcode: allow to compile with complex numbers disabled - objstr: allow to compile with obj-repr D, and unicode disabled - modsys: allow to compile with obj-repr D and PY_ATTRTUPLE disabled - provide mp_decode_uint_skip() to help reduce stack usage - makeqstrdefs.py: make script run correctly with Python 2.6 - objstringio: if created from immutable object, follow copy on write policy extmod: - modlwip: connect: for non-blocking mode, return EINPROGRESS - modlwip: fix error codes for duplicate calls to connect() - modlwip: accept: fix error code for non-blocking mode - vfs: allow to statvfs the root directory - vfs: allow "buffering" and "encoding" args to VFS's open() - modframebuf: fix signed/unsigned comparison pendantic warning lib: - libm: use isfinite instead of finitef, for C99 compatibility - utils/interrupt_char: remove support for KBD_EXCEPTION disabled tests: - basics/string_rsplit: add tests for negative "maxsplit" argument - float: convert "sys.exit()" to "raise SystemExit" - float/builtin_float_minmax: PEP8 fixes - basics: convert "sys.exit()" to "raise SystemExit" - convert remaining "sys.exit()" to "raise SystemExit" unix port: - convert to use core-provided version of built-in import() - Makefile: replace references to make with $(MAKE) windows port: - convert to use core-provided version of built-in import() qemu-arm port: - Makefile: adjust object-file lists to get correct dependencies - enable micropython.mem_*() functions to allow more tests stmhal port: - boards: enable DAC for NUCLEO_F767ZI board - add support for NUCLEO_F446RE board - pass USB handler as parameter to allow more than one USB handler - usb: use local USB handler variable in Start-of-Frame handler - usb: make state for USB device private to top-level USB driver - usbdev: for MSC implement SCSI SYNCHRONIZE_CACHE command - convert from using stmhal's input() to core provided version cc3200 port: - convert from using stmhal's input() to core provided version teensy port: - convert from using stmhal's input() to core provided version esp8266 port: - Makefile: replace references to make with $(MAKE) - Makefile: add clean-modules target - convert from using stmhal's input() to core provided version zephyr port: - modusocket: getaddrinfo: Fix mp_obj_len() usage - define MICROPY_PY_SYS_PLATFORM (to "zephyr") - machine_pin: use native Zephyr types for Zephyr API calls docs: - machine.Pin: remove out_value() method - machine.Pin: add on() and off() methods - esp8266: consistently replace Pin.high/low methods with .on/off - esp8266/quickref: polish Pin.on()/off() examples - network: move confusingly-named cc3200 Server class to its reference - uos: deconditionalize, remove minor port-specific details - uos: move cc3200 port legacy VFS mounting functions to its ref doc - machine: sort machine classes in logical order, not alphabetically - network: first step to describe standard network class interface examples: - embedding: use core-provided KeyboardInterrupt object
293 lines
9.9 KiB
C
293 lines
9.9 KiB
C
/*
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "py/mpconfig.h"
|
|
#if MICROPY_VFS && MICROPY_VFS_FAT
|
|
|
|
#include "extmod/vfs_fat_file.h"
|
|
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
|
|
#include "py/nlr.h"
|
|
#include "py/runtime.h"
|
|
#include "py/stream.h"
|
|
#include "py/mperrno.h"
|
|
#include "lib/oofatfs/ff.h"
|
|
#include "extmod/vfs_fat.h"
|
|
|
|
// this table converts from FRESULT to POSIX errno
|
|
const byte fresult_to_errno_table[20] = {
|
|
[FR_OK] = 0,
|
|
[FR_DISK_ERR] = MP_EIO,
|
|
[FR_INT_ERR] = MP_EIO,
|
|
[FR_NOT_READY] = MP_EBUSY,
|
|
[FR_NO_FILE] = MP_ENOENT,
|
|
[FR_NO_PATH] = MP_ENOENT,
|
|
[FR_INVALID_NAME] = MP_EINVAL,
|
|
[FR_DENIED] = MP_EACCES,
|
|
[FR_EXIST] = MP_EEXIST,
|
|
[FR_INVALID_OBJECT] = MP_EINVAL,
|
|
[FR_WRITE_PROTECTED] = MP_EROFS,
|
|
[FR_INVALID_DRIVE] = MP_ENODEV,
|
|
[FR_NOT_ENABLED] = MP_ENODEV,
|
|
[FR_NO_FILESYSTEM] = MP_ENODEV,
|
|
[FR_MKFS_ABORTED] = MP_EIO,
|
|
[FR_TIMEOUT] = MP_EIO,
|
|
[FR_LOCKED] = MP_EIO,
|
|
[FR_NOT_ENOUGH_CORE] = MP_ENOMEM,
|
|
[FR_TOO_MANY_OPEN_FILES] = MP_EMFILE,
|
|
[FR_INVALID_PARAMETER] = MP_EINVAL,
|
|
};
|
|
|
|
STATIC void file_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
|
(void)kind;
|
|
mp_printf(print, "<io.%s %p>", mp_obj_get_type_str(self_in), MP_OBJ_TO_PTR(self_in));
|
|
}
|
|
|
|
STATIC mp_uint_t file_obj_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
|
|
pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
|
|
UINT sz_out;
|
|
FRESULT res = f_read(&self->fp, buf, size, &sz_out);
|
|
if (res != FR_OK) {
|
|
*errcode = fresult_to_errno_table[res];
|
|
return MP_STREAM_ERROR;
|
|
}
|
|
return sz_out;
|
|
}
|
|
|
|
STATIC mp_uint_t file_obj_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
|
|
pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
|
|
UINT sz_out;
|
|
FRESULT res = f_write(&self->fp, buf, size, &sz_out);
|
|
if (res != FR_OK) {
|
|
*errcode = fresult_to_errno_table[res];
|
|
return MP_STREAM_ERROR;
|
|
}
|
|
if (sz_out != size) {
|
|
// The FatFS documentation says that this means disk full.
|
|
*errcode = MP_ENOSPC;
|
|
return MP_STREAM_ERROR;
|
|
}
|
|
return sz_out;
|
|
}
|
|
|
|
|
|
STATIC mp_obj_t file_obj_close(mp_obj_t self_in) {
|
|
pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
|
|
// if fs==NULL then the file is closed and in that case this method is a no-op
|
|
if (self->fp.obj.fs != NULL) {
|
|
FRESULT res = f_close(&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_close_obj, file_obj_close);
|
|
|
|
STATIC mp_obj_t file_obj___exit__(size_t n_args, const mp_obj_t *args) {
|
|
(void)n_args;
|
|
return file_obj_close(args[0]);
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(file_obj___exit___obj, 4, 4, file_obj___exit__);
|
|
|
|
STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
|
|
pyb_file_obj_t *self = MP_OBJ_TO_PTR(o_in);
|
|
|
|
if (request == MP_STREAM_SEEK) {
|
|
struct mp_stream_seek_t *s = (struct mp_stream_seek_t*)(uintptr_t)arg;
|
|
|
|
switch (s->whence) {
|
|
case 0: // SEEK_SET
|
|
f_lseek(&self->fp, s->offset);
|
|
break;
|
|
|
|
case 1: // SEEK_CUR
|
|
if (s->offset != 0) {
|
|
*errcode = MP_EOPNOTSUPP;
|
|
return MP_STREAM_ERROR;
|
|
}
|
|
// no-operation
|
|
break;
|
|
|
|
case 2: // SEEK_END
|
|
f_lseek(&self->fp, f_size(&self->fp) + s->offset);
|
|
break;
|
|
}
|
|
|
|
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;
|
|
}
|
|
}
|
|
|
|
// Note: encoding is ignored for now; it's also not a valid kwarg for CPython's FileIO,
|
|
// but by adding it here we can use one single mp_arg_t array for open() and FileIO's constructor
|
|
STATIC const mp_arg_t file_open_args[] = {
|
|
{ MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
|
|
{ MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)} },
|
|
{ MP_QSTR_encoding, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
|
|
};
|
|
#define FILE_OPEN_NUM_ARGS MP_ARRAY_SIZE(file_open_args)
|
|
|
|
STATIC mp_obj_t file_open(fs_user_mount_t *vfs, const mp_obj_type_t *type, mp_arg_val_t *args) {
|
|
int mode = 0;
|
|
const char *mode_s = mp_obj_str_get_str(args[1].u_obj);
|
|
// TODO make sure only one of r, w, x, a, and b, t are specified
|
|
while (*mode_s) {
|
|
switch (*mode_s++) {
|
|
case 'r':
|
|
mode |= FA_READ;
|
|
break;
|
|
case 'w':
|
|
mode |= FA_WRITE | FA_CREATE_ALWAYS;
|
|
break;
|
|
case 'x':
|
|
mode |= FA_WRITE | FA_CREATE_NEW;
|
|
break;
|
|
case 'a':
|
|
mode |= FA_WRITE | FA_OPEN_ALWAYS;
|
|
break;
|
|
case '+':
|
|
mode |= FA_READ | FA_WRITE;
|
|
break;
|
|
#if MICROPY_PY_IO_FILEIO
|
|
case 'b':
|
|
type = &mp_type_fileio;
|
|
break;
|
|
#endif
|
|
case 't':
|
|
type = &mp_type_textio;
|
|
break;
|
|
}
|
|
}
|
|
|
|
pyb_file_obj_t *o = m_new_obj_with_finaliser(pyb_file_obj_t);
|
|
o->base.type = type;
|
|
|
|
const char *fname = mp_obj_str_get_str(args[0].u_obj);
|
|
assert(vfs != NULL);
|
|
FRESULT res = f_open(&vfs->fatfs, &o->fp, fname, mode);
|
|
if (res != FR_OK) {
|
|
m_del_obj(pyb_file_obj_t, o);
|
|
mp_raise_OSError(fresult_to_errno_table[res]);
|
|
}
|
|
|
|
// for 'a' mode, we must begin at the end of the file
|
|
if ((mode & FA_OPEN_ALWAYS) != 0) {
|
|
f_lseek(&o->fp, f_size(&o->fp));
|
|
}
|
|
|
|
return MP_OBJ_FROM_PTR(o);
|
|
}
|
|
|
|
STATIC mp_obj_t file_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
|
mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
|
|
mp_arg_parse_all_kw_array(n_args, n_kw, args, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
|
|
return file_open(NULL, type, arg_vals);
|
|
}
|
|
|
|
// TODO gc hook to close the file if not already closed
|
|
|
|
STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
|
|
{ MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
|
|
{ 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(&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) },
|
|
{ MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&file_obj_close_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&file_obj___exit___obj) },
|
|
};
|
|
|
|
STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);
|
|
|
|
#if MICROPY_PY_IO_FILEIO
|
|
STATIC const mp_stream_p_t fileio_stream_p = {
|
|
.read = file_obj_read,
|
|
.write = file_obj_write,
|
|
.ioctl = file_obj_ioctl,
|
|
};
|
|
|
|
const mp_obj_type_t mp_type_fileio = {
|
|
{ &mp_type_type },
|
|
.name = MP_QSTR_FileIO,
|
|
.print = file_obj_print,
|
|
.make_new = file_obj_make_new,
|
|
.getiter = mp_identity_getiter,
|
|
.iternext = mp_stream_unbuffered_iter,
|
|
.protocol = &fileio_stream_p,
|
|
.locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
|
|
};
|
|
#endif
|
|
|
|
STATIC const mp_stream_p_t textio_stream_p = {
|
|
.read = file_obj_read,
|
|
.write = file_obj_write,
|
|
.ioctl = file_obj_ioctl,
|
|
.is_text = true,
|
|
};
|
|
|
|
const mp_obj_type_t mp_type_textio = {
|
|
{ &mp_type_type },
|
|
.name = MP_QSTR_TextIOWrapper,
|
|
.print = file_obj_print,
|
|
.make_new = file_obj_make_new,
|
|
.getiter = mp_identity_getiter,
|
|
.iternext = mp_stream_unbuffered_iter,
|
|
.protocol = &textio_stream_p,
|
|
.locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
|
|
};
|
|
|
|
// Factory function for I/O stream classes
|
|
mp_obj_t fatfs_builtin_open_self(mp_obj_t self_in, mp_obj_t path, mp_obj_t mode) {
|
|
// TODO: analyze buffering args and instantiate appropriate type
|
|
fs_user_mount_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
|
|
arg_vals[0].u_obj = path;
|
|
arg_vals[1].u_obj = mode;
|
|
arg_vals[2].u_obj = mp_const_none;
|
|
return file_open(self, &mp_type_textio, arg_vals);
|
|
}
|
|
|
|
#endif // MICROPY_VFS && MICROPY_VFS_FAT
|