diff options
| author | Sean Cross <sean@xobs.io> | 2020-05-22 17:43:05 +0800 |
|---|---|---|
| committer | Sean Cross <sean@xobs.io> | 2020-05-27 11:28:49 +0800 |
| commit | bd086a102e515765b55b50db9f3e45a23164b840 (patch) | |
| tree | 38cb8848460ae4e77b43f0c781a89dbaae4338da /py | |
| parent | 589cb1af6de04a01e1cfda1082fea4f6fbc4440c (diff) | |
Revert "add WatchDogTimeout exception"
This reverts commit 561e7e619095869f58fc728d428f3ff20e8bfc40.
Diffstat (limited to 'py')
| -rw-r--r-- | py/modbuiltins.c | 3 | ||||
| -rw-r--r-- | py/mpstate.h | 5 | ||||
| -rw-r--r-- | py/obj.h | 3 | ||||
| -rw-r--r-- | py/objexcept.c | 3 | ||||
| -rw-r--r-- | py/runtime.c | 9 |
5 files changed, 0 insertions, 23 deletions
diff --git a/py/modbuiltins.c b/py/modbuiltins.c index b031ce9fe..e764f1987 100644 --- a/py/modbuiltins.c +++ b/py/modbuiltins.c @@ -719,9 +719,6 @@ STATIC const mp_rom_map_elem_t mp_module_builtins_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_IndexError), MP_ROM_PTR(&mp_type_IndexError) }, { MP_ROM_QSTR(MP_QSTR_KeyboardInterrupt), MP_ROM_PTR(&mp_type_KeyboardInterrupt) }, { MP_ROM_QSTR(MP_QSTR_ReloadException), MP_ROM_PTR(&mp_type_ReloadException) }, - #if CIRCUITPY_WATCHDOG - { MP_ROM_QSTR(MP_QSTR_WatchDogTimeout), MP_ROM_PTR(&mp_type_WatchDogTimeout) }, - #endif { MP_ROM_QSTR(MP_QSTR_KeyError), MP_ROM_PTR(&mp_type_KeyError) }, { MP_ROM_QSTR(MP_QSTR_LookupError), MP_ROM_PTR(&mp_type_LookupError) }, { MP_ROM_QSTR(MP_QSTR_MemoryError), MP_ROM_PTR(&mp_type_MemoryError) }, diff --git a/py/mpstate.h b/py/mpstate.h index 5d3b7709b..a5815776a 100644 --- a/py/mpstate.h +++ b/py/mpstate.h @@ -141,11 +141,6 @@ typedef struct _mp_state_vm_t { // exception object of type ReloadException mp_obj_exception_t mp_reload_exception; - #if CIRCUITPY_WATCHDOG - // exception object of type WatchdogTimeout - mp_obj_exception_t mp_watchdog_exception; - #endif - // dictionary with loaded modules (may be exposed as sys.modules) mp_obj_dict_t mp_loaded_modules_dict; @@ -596,9 +596,6 @@ extern const mp_obj_type_t mp_type_IndentationError; extern const mp_obj_type_t mp_type_IndexError; extern const mp_obj_type_t mp_type_KeyboardInterrupt; extern const mp_obj_type_t mp_type_ReloadException; -#if CIRCUITPY_WATCHDOG -extern const mp_obj_type_t mp_type_WatchDogTimeout; -#endif extern const mp_obj_type_t mp_type_KeyError; extern const mp_obj_type_t mp_type_LookupError; extern const mp_obj_type_t mp_type_MemoryError; diff --git a/py/objexcept.c b/py/objexcept.c index db09d5153..b7a536c5e 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -256,9 +256,6 @@ const mp_obj_type_t mp_type_BaseException = { MP_DEFINE_EXCEPTION(SystemExit, BaseException) MP_DEFINE_EXCEPTION(KeyboardInterrupt, BaseException) MP_DEFINE_EXCEPTION(ReloadException, BaseException) -#if CIRCUITPY_WATCHDOG -MP_DEFINE_EXCEPTION(WatchDogTimeout, BaseException) -#endif MP_DEFINE_EXCEPTION(GeneratorExit, BaseException) MP_DEFINE_EXCEPTION(Exception, BaseException) #if MICROPY_PY_ASYNC_AWAIT diff --git a/py/runtime.c b/py/runtime.c index 02352ea6c..59dcbc7a1 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -86,15 +86,6 @@ void mp_init(void) { MP_STATE_VM(mp_kbd_exception).args = (mp_obj_tuple_t*)&mp_const_empty_tuple_obj; #endif - #if CIRCUITPY_WATCHDOG - // initialise the exception object for raising WatchDogTimeout - MP_STATE_VM(mp_kbd_exception).base.type = &mp_type_WatchDogTimeout; - MP_STATE_VM(mp_kbd_exception).traceback_alloc = 0; - MP_STATE_VM(mp_kbd_exception).traceback_len = 0; - MP_STATE_VM(mp_kbd_exception).traceback_data = NULL; - MP_STATE_VM(mp_kbd_exception).args = (mp_obj_tuple_t*)&mp_const_empty_tuple_obj; - #endif - MP_STATE_VM(mp_reload_exception).base.type = &mp_type_ReloadException; MP_STATE_VM(mp_reload_exception).traceback_alloc = 0; MP_STATE_VM(mp_reload_exception).traceback_len = 0; |