Commit b6a2a86a authored by schneider's avatar schneider
Browse files

fix(interrupt): add disable function, add error code to api

parent b457c4b6
...@@ -4,16 +4,19 @@ ...@@ -4,16 +4,19 @@
static bool enabled[API_INT_MAX + 1]; static bool enabled[API_INT_MAX + 1];
void api_interrupt_trigger(api_int_id_t id) int api_interrupt_trigger(api_int_id_t id)
{ {
if (id <= API_INT_MAX) { if (id > API_INT_MAX) {
if (enabled[id]) { return EINVAL;
while (API_CALL_MEM->int_id)
;
API_CALL_MEM->int_id = id;
TMR_TO_Start(MXC_TMR5, 1, 0);
}
} }
if (enabled[id]) {
while (API_CALL_MEM->int_id)
;
API_CALL_MEM->int_id = id;
TMR_TO_Start(MXC_TMR5, 1, 0);
}
return 0;
} }
void api_interrupt_init(void) void api_interrupt_init(void)
...@@ -26,16 +29,22 @@ void api_interrupt_init(void) ...@@ -26,16 +29,22 @@ void api_interrupt_init(void)
} }
} }
void epic_interrupt_enable(api_int_id_t int_id) int epic_interrupt_enable(api_int_id_t int_id)
{ {
if (int_id <= API_INT_MAX) { if (int_id > API_INT_MAX) {
enabled[int_id] = true; return EINVAL;
} }
enabled[int_id] = true;
return 0;
} }
void epic_interrupt_disable(api_int_id_t int_id) int epic_interrupt_disable(api_int_id_t int_id)
{ {
if (int_id <= API_INT_MAX) { if (int_id > API_INT_MAX) {
enabled[int_id] = false; return EINVAL;
} }
enabled[int_id] = false;
return 0;
} }
#pragma once #pragma once
#include "api/common.h" #include "api/common.h"
void api_interrupt_init(void); void api_interrupt_init(void);
void api_interrupt_trigger(api_int_id_t id); int api_interrupt_trigger(api_int_id_t id);
...@@ -156,13 +156,13 @@ typedef uint32_t api_int_id_t; ...@@ -156,13 +156,13 @@ typedef uint32_t api_int_id_t;
* *
* :param int_id: The interrupt to be enabled * :param int_id: The interrupt to be enabled
*/ */
API(API_INTERRUPT_ENABLE, void epic_interrupt_enable(api_int_id_t int_id)); API(API_INTERRUPT_ENABLE, int epic_interrupt_enable(api_int_id_t int_id));
/** /**
* Disable/mask an API interrupt * Disable/mask an API interrupt
* *
* :param int_id: The interrupt to be disabled * :param int_id: The interrupt to be disabled
*/ */
API(API_INTERRUPT_DISABLE, void epic_interrupt_disable(api_int_id_t int_id)); API(API_INTERRUPT_DISABLE, int epic_interrupt_disable(api_int_id_t int_id));
#endif /* _EPICARDIUM_H */ #endif /* _EPICARDIUM_H */
...@@ -44,17 +44,33 @@ STATIC mp_obj_t mp_interrupt_enable_callback(mp_obj_t id_in) ...@@ -44,17 +44,33 @@ STATIC mp_obj_t mp_interrupt_enable_callback(mp_obj_t id_in)
api_int_id_t id = mp_obj_get_int(id_in); api_int_id_t id = mp_obj_get_int(id_in);
// TODO: throw error if id is out of range or epic_interrupt_enable failed // TODO: throw error if id is out of range or epic_interrupt_enable failed
epic_interrupt_enable(id); if (epic_interrupt_enable(id) < 0) {
}
return mp_const_none; return mp_const_none;
} }
STATIC mp_obj_t mp_interrupt_disable_callback(mp_obj_t id_in)
{
api_int_id_t id = mp_obj_get_int(id_in);
// TODO: throw error if id is out of range or epic_interrupt_enable failed
if (epic_interrupt_disable(id) < 0) {
}
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2( STATIC MP_DEFINE_CONST_FUN_OBJ_2(
interrupt_set_callback_obj, mp_interrupt_set_callback interrupt_set_callback_obj, mp_interrupt_set_callback
); );
STATIC MP_DEFINE_CONST_FUN_OBJ_1( STATIC MP_DEFINE_CONST_FUN_OBJ_1(
interrupt_enable_callback_obj, mp_interrupt_enable_callback interrupt_enable_callback_obj, mp_interrupt_enable_callback
); );
STATIC MP_DEFINE_CONST_FUN_OBJ_1(
interrupt_disable_callback_obj, mp_interrupt_disable_callback
);
STATIC const mp_rom_map_elem_t interrupt_module_globals_table[] = { STATIC const mp_rom_map_elem_t interrupt_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_interrupt) }, { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_interrupt) },
...@@ -62,6 +78,8 @@ STATIC const mp_rom_map_elem_t interrupt_module_globals_table[] = { ...@@ -62,6 +78,8 @@ STATIC const mp_rom_map_elem_t interrupt_module_globals_table[] = {
MP_ROM_PTR(&interrupt_set_callback_obj) }, MP_ROM_PTR(&interrupt_set_callback_obj) },
{ MP_ROM_QSTR(MP_QSTR_enable_callback), { MP_ROM_QSTR(MP_QSTR_enable_callback),
MP_ROM_PTR(&interrupt_enable_callback_obj) }, MP_ROM_PTR(&interrupt_enable_callback_obj) },
{ MP_ROM_QSTR(MP_QSTR_disable_callback),
MP_ROM_PTR(&interrupt_disable_callback_obj) },
{ MP_ROM_QSTR(MP_QSTR_BHI160), MP_OBJ_NEW_SMALL_INT(2) }, { MP_ROM_QSTR(MP_QSTR_BHI160), MP_OBJ_NEW_SMALL_INT(2) },
}; };
STATIC MP_DEFINE_CONST_DICT( STATIC MP_DEFINE_CONST_DICT(
......
...@@ -28,4 +28,5 @@ Q(vibrate) ...@@ -28,4 +28,5 @@ Q(vibrate)
Q(set_callback) Q(set_callback)
Q(enable_callback) Q(enable_callback)
Q(disable_callback)
Q(BHI160) Q(BHI160)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment