diff options
| author | Uros Majstorovic <majstor@majstor.org> | 2020-02-19 06:47:43 +0100 |
|---|---|---|
| committer | Uros Majstorovic <majstor@majstor.org> | 2020-02-19 06:47:43 +0100 |
| commit | 6666a131ab36b1d96a854da80524d860f9a3884b (patch) | |
| tree | 5039423cb8c5592c20f8dd3aec417158ac058484 /code/fe310/eos/i2s.c | |
| parent | 15bddabc5cbe0e751fadcaaa7f7c7c36bca61331 (diff) | |
eve long press/double tap/inertial scroll
spi flush bugfix
resolved dependecies: spi -> net; event -> net
renamed various handlers
Diffstat (limited to 'code/fe310/eos/i2s.c')
| -rw-r--r-- | code/fe310/eos/i2s.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/code/fe310/eos/i2s.c b/code/fe310/eos/i2s.c index 5b8d2cb..83fd148 100644 --- a/code/fe310/eos/i2s.c +++ b/code/fe310/eos/i2s.c @@ -8,7 +8,6 @@ #include "eos.h" #include "interrupt.h" #include "event.h" -#include "net.h" #include "i2s.h" #include "i2s_def.h" @@ -31,8 +30,8 @@ uint32_t _eos_i2s_spk_wm = 0; uint32_t _eos_i2s_mic_evt_enable = 0; uint32_t _eos_i2s_spk_evt_enable = 0; -static eos_i2s_fptr_t i2s_spk_handler = NULL; -static eos_i2s_fptr_t i2s_mic_handler = NULL; +static eos_i2s_handler_t i2s_spk_handler = NULL; +static eos_i2s_handler_t i2s_mic_handler = NULL; static uint32_t i2s_clk_period; static uint8_t i2s_mic_volume = 0; /* 0 - 8 */ static uint8_t i2s_spk_volume = 16; /* 0 - 16 */ @@ -92,7 +91,7 @@ static uint16_t _abuf_len(EOSABuf *buf) { return buf->idx_w - buf->idx_r; } -static void i2s_handler_evt(unsigned char type, unsigned char *buffer, uint16_t len) { +static void i2s_handle_evt(unsigned char type, unsigned char *buffer, uint16_t len) { switch(type & ~EOS_EVT_MASK) { case I2S_ETYPE_MIC: if (i2s_mic_handler) i2s_mic_handler(type); @@ -136,7 +135,7 @@ static void _spk_vol_set(uint8_t vol) { extern void _eos_i2s_start_pwm(void); void eos_i2s_init(void) { - eos_evtq_set_handler(EOS_EVT_AUDIO, i2s_handler_evt, 0); + eos_evtq_set_handler(EOS_EVT_AUDIO, i2s_handle_evt); GPIO_REG(GPIO_INPUT_EN) &= ~(1 << I2S_PIN_CK); GPIO_REG(GPIO_OUTPUT_EN) |= (1 << I2S_PIN_CK); @@ -267,12 +266,10 @@ void eos_i2s_mic_init(uint8_t *mic_arr, uint16_t mic_arr_size) { set_csr(mstatus, MSTATUS_MIE); } -void eos_i2s_mic_set_handler(eos_i2s_fptr_t wm_handler, uint8_t flags) { +void eos_i2s_mic_set_handler(eos_i2s_handler_t wm_handler) { clear_csr(mstatus, MSTATUS_MIE); i2s_mic_handler = wm_handler; set_csr(mstatus, MSTATUS_MIE); - - eos_evtq_set_hflags(EOS_EVT_AUDIO | I2S_ETYPE_MIC, flags); } void eos_i2s_mic_set_wm(uint16_t wm) { @@ -343,12 +340,10 @@ void eos_i2s_spk_init(uint8_t *spk_arr, uint16_t spk_arr_size) { set_csr(mstatus, MSTATUS_MIE); } -void eos_i2s_spk_set_handler(eos_i2s_fptr_t wm_handler, uint8_t flags) { +void eos_i2s_spk_set_handler(eos_i2s_handler_t wm_handler) { clear_csr(mstatus, MSTATUS_MIE); i2s_spk_handler = wm_handler; set_csr(mstatus, MSTATUS_MIE); - - eos_evtq_set_hflags(EOS_EVT_AUDIO | I2S_ETYPE_SPK, flags); } void eos_i2s_spk_set_wm(uint16_t wm) { |