From 12375d1d3aa41f7d277a9af584c7b810b636ec95 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Wed, 2 Mar 2011 08:49:38 +0000 Subject: Merge functionality of wakeups and semaphores-- fewer APIs and object types. semaphore_wait takes a timeout now so codecs and plugins have to be made incompatible. Don't make semaphores for targets not using them. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29492 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c') diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c index 92cf0d7552..99d73fa3c7 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c @@ -74,7 +74,7 @@ static int datacount = 0; static volatile int cur_touch = 0; static volatile bool pen_down = false; static struct mutex battery_mtx; -static struct wakeup battery_wkup; +static struct semaphore battery_done; const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = { @@ -113,7 +113,7 @@ unsigned int battery_adc_voltage(void) REG_SADC_ENA |= SADC_ENA_PBATEN; - wakeup_wait(&battery_wkup, HZ/4); + semaphore_wait(&battery_done, HZ/4); bat_val = REG_SADC_BATDAT; logf("%d %d", bat_val, (bat_val * BATTERY_SCALE_FACTOR) / 4096); @@ -268,7 +268,7 @@ void SADC(void) if(state & SADC_CTRL_PBATRDYM) { /* Battery AD IRQ */ - wakeup_signal(&battery_wkup); + semaphore_release(&battery_done); } } @@ -290,7 +290,7 @@ void adc_init(void) REG_SADC_ENA = SADC_ENA_TSEN; mutex_init(&battery_mtx); - wakeup_init(&battery_wkup); + semaphore_init(&battery_done, 1, 0); } void adc_close(void) -- cgit v1.2.3