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

1 files changed, 4 insertions, 4 deletions

diff --git a/firmware/target/arm/s5l8700/adc-s5l8700.c b/firmware/target/arm/s5l8700/adc-s5l8700.c
index f979a9d54f..270c133e94 100644
--- a/firmware/target/arm/s5l8700/adc-s5l8700.c
+++ b/firmware/target/arm/s5l8700/adc-s5l8700.c
@@ -42,11 +42,11 @@
 
 
 static struct mutex adc_mtx;
-static struct wakeup adc_wakeup;
+static struct semaphore adc_wakeup;
 
 void INT_ADC(void)
 {
-    wakeup_signal(&adc_wakeup);
+    semaphore_release(&adc_wakeup);
 }
 
 unsigned short adc_read(int channel)
@@ -61,7 +61,7 @@ unsigned short adc_read(int channel)
              (1 << 0);          /* enable start */
     
     /* wait for conversion */
-    wakeup_wait(&adc_wakeup, TIMEOUT_BLOCK);
+    semaphore_wait(&adc_wakeup, TIMEOUT_BLOCK);
     
     /* get the converted data */
     data = ADCDAT0 & 0x3FF;
@@ -77,7 +77,7 @@ unsigned short adc_read(int channel)
 void adc_init(void)
 {
     mutex_init(&adc_mtx);
-    wakeup_init(&adc_wakeup);
+    semaphore_init(&adc_wakeup, 1, 0);
 
     /* enable clock to ADC */
     PWRCON &= ~(1 << 10);