From cea5503ca006c712c007ad6d38c140c4ac241638 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 10 Jan 2017 15:57:04 -0800 Subject: Fixup warnings from merge about undefined macro values, switch to VM keyboard exception and switch to FATFS reader. --- atmel-samd/main.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'atmel-samd/main.c') diff --git a/atmel-samd/main.c b/atmel-samd/main.c index 092af2bc9..89de725ec 100644 --- a/atmel-samd/main.c +++ b/atmel-samd/main.c @@ -125,8 +125,6 @@ void reset_mp(void) { mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash)); mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash_slash_lib)); mp_obj_list_init(mp_sys_argv, 0); - - MP_STATE_PORT(mp_kbd_exception) = mp_obj_new_exception(&mp_type_KeyboardInterrupt); } #ifdef EXPRESS_BOARD @@ -480,16 +478,6 @@ void gc_collect(void) { gc_collect_end(); } -mp_lexer_t *fat_vfs_lexer_new_from_file(const char *filename); -mp_lexer_t *mp_lexer_new_from_file(const char *filename) { - #if MICROPY_VFS_FAT - return fat_vfs_lexer_new_from_file(filename); - #else - (void)filename; - return NULL; - #endif -} - mp_import_stat_t fat_vfs_import_stat(const char *path); mp_import_stat_t mp_import_stat(const char *path) { #if MICROPY_VFS_FAT @@ -500,10 +488,6 @@ mp_import_stat_t mp_import_stat(const char *path) { #endif } -void mp_keyboard_interrupt(void) { - MP_STATE_VM(mp_pending_exception) = MP_STATE_PORT(mp_kbd_exception); -} - void nlr_jump_fail(void *val) { } -- cgit v1.2.3