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
215 lines
8.9 KiB
C
215 lines
8.9 KiB
C
#include <stdint.h>
|
|
|
|
// options to control how Micro Python is built
|
|
|
|
#define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_C)
|
|
#define MICROPY_ALLOC_PATH_MAX (128)
|
|
#define MICROPY_ALLOC_LEXER_INDENT_INIT (8)
|
|
#define MICROPY_ALLOC_PARSE_RULE_INIT (48)
|
|
#define MICROPY_ALLOC_PARSE_RULE_INC (8)
|
|
#define MICROPY_ALLOC_PARSE_RESULT_INC (8)
|
|
#define MICROPY_ALLOC_PARSE_CHUNK_INIT (64)
|
|
#define MICROPY_PERSISTENT_CODE_LOAD (1)
|
|
#define MICROPY_EMIT_XTENSA (1)
|
|
#define MICROPY_EMIT_INLINE_XTENSA (1)
|
|
#define MICROPY_MEM_STATS (0)
|
|
#define MICROPY_DEBUG_PRINTERS (1)
|
|
#define MICROPY_DEBUG_PRINTER_DEST mp_debug_print
|
|
#define MICROPY_READER_VFS (MICROPY_VFS)
|
|
#define MICROPY_ENABLE_GC (1)
|
|
#define MICROPY_STACK_CHECK (1)
|
|
#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
|
|
#define MICROPY_KBD_EXCEPTION (1)
|
|
#define MICROPY_REPL_EVENT_DRIVEN (0)
|
|
#define MICROPY_REPL_AUTO_INDENT (1)
|
|
#define MICROPY_HELPER_REPL (1)
|
|
#define MICROPY_HELPER_LEXER_UNIX (0)
|
|
#define MICROPY_ENABLE_SOURCE_LINE (1)
|
|
#define MICROPY_MODULE_WEAK_LINKS (1)
|
|
#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
|
|
#define MICROPY_USE_INTERNAL_ERRNO (1)
|
|
#define MICROPY_ENABLE_SCHEDULER (1)
|
|
#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
|
|
#define MICROPY_PY_BUILTINS_COMPLEX (0)
|
|
#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
|
|
#define MICROPY_PY_BUILTINS_BYTEARRAY (1)
|
|
#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
|
|
#define MICROPY_PY_BUILTINS_FROZENSET (1)
|
|
#define MICROPY_PY_BUILTINS_SET (1)
|
|
#define MICROPY_PY_BUILTINS_SLICE (1)
|
|
#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
|
|
#define MICROPY_PY_BUILTINS_PROPERTY (1)
|
|
#define MICROPY_PY_DESCRIPTORS (1)
|
|
#define MICROPY_PY_BUILTINS_INPUT (1)
|
|
#define MICROPY_PY_BUILTINS_HELP (1)
|
|
#define MICROPY_PY_BUILTINS_HELP_TEXT esp_help_text
|
|
#define MICROPY_PY_BUILTINS_HELP_MODULES (1)
|
|
#define MICROPY_PY___FILE__ (0)
|
|
#define MICROPY_PY_GC (1)
|
|
#define MICROPY_PY_ARRAY (1)
|
|
#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
|
|
#define MICROPY_PY_COLLECTIONS (1)
|
|
#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
|
|
#define MICROPY_PY_MATH (1)
|
|
#define MICROPY_PY_CMATH (0)
|
|
#define MICROPY_PY_IO (1)
|
|
#define MICROPY_PY_IO_FILEIO (1)
|
|
#define MICROPY_PY_STRUCT (1)
|
|
#define MICROPY_PY_SYS (1)
|
|
#define MICROPY_PY_SYS_MAXSIZE (1)
|
|
#define MICROPY_PY_SYS_EXIT (1)
|
|
#define MICROPY_PY_SYS_STDFILES (1)
|
|
#define MICROPY_PY_SYS_STDIO_BUFFER (1)
|
|
#define MICROPY_PY_UERRNO (1)
|
|
#define MICROPY_PY_UBINASCII (1)
|
|
#define MICROPY_PY_UCTYPES (1)
|
|
#define MICROPY_PY_UHASHLIB (1)
|
|
#define MICROPY_PY_UHASHLIB_SHA1 (MICROPY_PY_USSL && MICROPY_SSL_AXTLS)
|
|
#define MICROPY_PY_UHEAPQ (1)
|
|
#define MICROPY_PY_UTIMEQ (1)
|
|
#define MICROPY_PY_UJSON (1)
|
|
#define MICROPY_PY_URANDOM (1)
|
|
#define MICROPY_PY_URE (1)
|
|
#define MICROPY_PY_USELECT (1)
|
|
#define MICROPY_PY_UTIME_MP_HAL (1)
|
|
#define MICROPY_PY_UZLIB (1)
|
|
#define MICROPY_PY_LWIP (1)
|
|
#define MICROPY_PY_MACHINE (1)
|
|
#define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
|
|
#define MICROPY_PY_MACHINE_PULSE (1)
|
|
#define MICROPY_PY_MACHINE_I2C (1)
|
|
#define MICROPY_PY_MACHINE_SPI (1)
|
|
#define MICROPY_PY_MACHINE_SPI_MAKE_NEW machine_hspi_make_new
|
|
#define MICROPY_PY_WEBSOCKET (1)
|
|
#define MICROPY_PY_WEBREPL (1)
|
|
#define MICROPY_PY_WEBREPL_DELAY (20)
|
|
#define MICROPY_PY_FRAMEBUF (0)
|
|
#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
|
|
#define MICROPY_PY_OS_DUPTERM (1)
|
|
#define MICROPY_CPYTHON_COMPAT (1)
|
|
#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ)
|
|
#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)
|
|
#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_NORMAL)
|
|
#define MICROPY_WARNINGS (1)
|
|
#define MICROPY_PY_STR_BYTES_CMP_WARN (1)
|
|
#define MICROPY_STREAMS_NON_BLOCK (1)
|
|
#define MICROPY_STREAMS_POSIX_API (1)
|
|
#define MICROPY_MODULE_FROZEN_STR (1)
|
|
#define MICROPY_MODULE_FROZEN_MPY (1)
|
|
#define MICROPY_MODULE_FROZEN_LEXER mp_lexer_new_from_str32
|
|
#define MICROPY_QSTR_EXTRA_POOL mp_qstr_frozen_const_pool
|
|
|
|
#define MICROPY_VFS (1)
|
|
#define MICROPY_FATFS_ENABLE_LFN (1)
|
|
#define MICROPY_FATFS_RPATH (2)
|
|
#define MICROPY_FATFS_MAX_SS (4096)
|
|
#define MICROPY_FATFS_LFN_CODE_PAGE (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
|
|
#define MICROPY_VFS_FAT (1)
|
|
#define MICROPY_ESP8266_APA102 (1)
|
|
#define MICROPY_ESP8266_NEOPIXEL (1)
|
|
|
|
extern void ets_event_poll(void);
|
|
#define MICROPY_EVENT_POLL_HOOK {ets_event_poll();}
|
|
#define MICROPY_VM_HOOK_COUNT (10)
|
|
#define MICROPY_VM_HOOK_INIT static uint vm_hook_divisor = MICROPY_VM_HOOK_COUNT;
|
|
#define MICROPY_VM_HOOK_POLL if (--vm_hook_divisor == 0) { \
|
|
vm_hook_divisor = MICROPY_VM_HOOK_COUNT; \
|
|
extern void ets_loop_iter(void); \
|
|
ets_loop_iter(); \
|
|
}
|
|
#define MICROPY_VM_HOOK_LOOP MICROPY_VM_HOOK_POLL
|
|
#define MICROPY_VM_HOOK_RETURN MICROPY_VM_HOOK_POLL
|
|
|
|
// type definitions for the specific machine
|
|
|
|
#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p)))
|
|
|
|
#define MP_SSIZE_MAX (0x7fffffff)
|
|
|
|
#define UINT_FMT "%u"
|
|
#define INT_FMT "%d"
|
|
|
|
typedef int32_t mp_int_t; // must be pointer size
|
|
typedef uint32_t mp_uint_t; // must be pointer size
|
|
typedef long mp_off_t;
|
|
typedef uint32_t sys_prot_t; // for modlwip
|
|
// ssize_t, off_t as required by POSIX-signatured functions in stream.h
|
|
#include <sys/types.h>
|
|
|
|
#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
|
|
void *esp_native_code_commit(void*, size_t);
|
|
#define MP_PLAT_COMMIT_EXEC(buf, len) esp_native_code_commit(buf, len)
|
|
|
|
#define mp_type_fileio fatfs_type_fileio
|
|
#define mp_type_textio fatfs_type_textio
|
|
|
|
// use vfs's functions for import stat and builtin open
|
|
#define mp_import_stat mp_vfs_import_stat
|
|
#define mp_builtin_open mp_vfs_open
|
|
#define mp_builtin_open_obj mp_vfs_open_obj
|
|
|
|
// extra built in names to add to the global namespace
|
|
#define MICROPY_PORT_BUILTINS \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
|
|
|
|
// extra built in modules to add to the list of known ones
|
|
extern const struct _mp_obj_module_t esp_module;
|
|
extern const struct _mp_obj_module_t network_module;
|
|
extern const struct _mp_obj_module_t utime_module;
|
|
extern const struct _mp_obj_module_t uos_module;
|
|
extern const struct _mp_obj_module_t mp_module_lwip;
|
|
extern const struct _mp_obj_module_t mp_module_machine;
|
|
extern const struct _mp_obj_module_t onewire_module;
|
|
extern const struct _mp_obj_module_t microcontroller_module;
|
|
extern const struct _mp_obj_module_t board_module;
|
|
extern const struct _mp_obj_module_t analogio_module;
|
|
extern const struct _mp_obj_module_t digitalio_module;
|
|
extern const struct _mp_obj_module_t pulseio_module;
|
|
extern const struct _mp_obj_module_t busio_module;
|
|
extern const struct _mp_obj_module_t bitbangio_module;
|
|
extern const struct _mp_obj_module_t time_module;
|
|
|
|
#define MICROPY_PORT_BUILTIN_MODULES \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_esp), (mp_obj_t)&esp_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&mp_module_lwip }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&mp_module_lwip }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_network), (mp_obj_t)&network_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&utime_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&uos_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&onewire_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_microcontroller), (mp_obj_t)µcontroller_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_board), (mp_obj_t)&board_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_analogio), (mp_obj_t)&analogio_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_digitalio), (mp_obj_t)&digitalio_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_pulseio), (mp_obj_t)&pulseio_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_busio), (mp_obj_t)&busio_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_bitbangio), (mp_obj_t)&bitbangio_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&time_module }, \
|
|
|
|
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&uos_module }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_errno), (mp_obj_t)&mp_module_uerrno }, \
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_select), (mp_obj_t)&mp_module_uselect }, \
|
|
|
|
#define MP_STATE_PORT MP_STATE_VM
|
|
|
|
#define MICROPY_PORT_ROOT_POINTERS \
|
|
const char *readline_hist[8]; \
|
|
mp_obj_t pin_irq_handler[16]; \
|
|
|
|
// We need to provide a declaration/definition of alloca()
|
|
#include <alloca.h>
|
|
|
|
// board specifics
|
|
|
|
#define MICROPY_MPHALPORT_H "esp_mphal.h"
|
|
#define MICROPY_HW_BOARD_NAME "ESP module"
|
|
#define MICROPY_HW_MCU_NAME "ESP8266"
|
|
#define MICROPY_PY_SYS_PLATFORM "esp8266"
|
|
|
|
#define MP_FASTCODE(n) __attribute__((section(".iram0.text." #n))) n
|
|
|
|
#define _assert(expr) ((expr) ? (void)0 : __assert_func(__FILE__, __LINE__, __func__, #expr))
|