5 files changed, 29 insertions, 27 deletions

diff --git a/firmware/target/arm/imx31/ata-imx31.c b/firmware/target/arm/imx31/ata-imx31.c
index d539282e70..8a40c924ff 100644
--- a/firmware/target/arm/imx31/ata-imx31.c
+++ b/firmware/target/arm/imx31/ata-imx31.c
@@ -246,7 +246,7 @@ static const struct ata_udma_timings
 
 /** Threading **/
 /* Signal to tell thread when DMA is done */
-static struct wakeup ata_dma_wakeup;
+static struct semaphore ata_dma_complete;
 
 /** SDMA **/
 /* Array of buffer descriptors for large transfers and alignnment */
@@ -445,7 +445,7 @@ static void ata_dma_callback(void)
     ATA_INTERRUPT_CLEAR = ATA_INTERRUPT_PENDING;
 
     ata_set_intrq(false);           /* Return INTRQ to MCU */
-    wakeup_signal(&ata_dma_wakeup); /* Signal waiting thread */
+    semaphore_release(&ata_dma_complete); /* Signal waiting thread */
 }
 
 bool ata_dma_setup(void *addr, unsigned long bytes, bool write)
@@ -580,7 +580,8 @@ bool ata_dma_finish(void)
     {
         int oldirq;
 
-        if (LIKELY(wakeup_wait(&ata_dma_wakeup, HZ/2) == OBJ_WAIT_SUCCEEDED))
+        if (LIKELY(semaphore_wait(&ata_dma_complete, HZ/2)
+               == OBJ_WAIT_SUCCEEDED))
             break;
 
         ata_keep_active();
@@ -594,7 +595,8 @@ bool ata_dma_finish(void)
         sdma_channel_stop(channel); /* Stop DMA */
         restore_irq(oldirq);
 
-        if (wakeup_wait(&ata_dma_wakeup, TIMEOUT_NOBLOCK) == OBJ_WAIT_SUCCEEDED)
+        if (semaphore_wait(&ata_dma_complete, TIMEOUT_NOBLOCK)
+                == OBJ_WAIT_SUCCEEDED)
             break; /* DMA really did finish after timeout */
 
         sdma_channel_reset(channel); /* Reset everything + clear error */
@@ -716,7 +718,7 @@ void ata_device_init(void)
     ata_dma_selected = ATA_DMA_PIO;
 
     /* Called for first time at startup */
-    wakeup_init(&ata_dma_wakeup);
+    semaphore_init(&ata_dma_complete, 1, 0);
 
     if (!sdma_channel_init(ATA_DMA_CH_NUM_RD, &ata_cd_rd, ata_bda) ||
         !sdma_channel_init(ATA_DMA_CH_NUM_WR, &ata_cd_wr, ata_bda))
diff --git a/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c
index f7bc0ed37c..eb30919077 100644
--- a/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/adc-gigabeat-s.c
@@ -35,7 +35,7 @@ static const unsigned char reg_array[4] =
 };
 
 static uint32_t channels[2][4];
-static struct wakeup adc_wake;
+static struct semaphore adc_done_signal;
 static struct mutex adc_mtx;
 static long last_adc_read[2]; /* One for each input group */
 
@@ -67,7 +67,7 @@ unsigned short adc_read(int channel)
         mc13783_write(MC13783_ADC1, adc1);
 
         /* Wait for done signal */
-        wakeup_wait(&adc_wake, TIMEOUT_BLOCK);
+        semaphore_wait(&adc_done_signal, TIMEOUT_BLOCK);
 
         /* Read all 8 channels that are converted - two channels in each
          * word. */
@@ -113,12 +113,12 @@ bool adc_enable_channel(int channel, bool enable)
 /* Called by mc13783 interrupt thread when conversion is complete */
 void adc_done(void)
 {
-    wakeup_signal(&adc_wake);
+    semaphore_release(&adc_done_signal);
 }
 
 void adc_init(void) 
 {
-    wakeup_init(&adc_wake);
+    semaphore_init(&adc_done_signal, 1, 0);
     mutex_init(&adc_mtx);
 
     /* Init so first reads get data */
diff --git a/firmware/target/arm/imx31/gigabeat-s/headphone-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/headphone-gigabeat-s.c
index 0f8cb67a9d..6e76615308 100644
--- a/firmware/target/arm/imx31/gigabeat-s/headphone-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/headphone-gigabeat-s.c
@@ -29,7 +29,7 @@
 #include "adc.h"
 #include "button.h"
 
-static struct wakeup headphone_wakeup;
+static struct semaphore headphone_wakeup;
 static unsigned int headphone_thread_id;
 static int headphone_stack[200/sizeof(int)]; /* Not much stack needed */
 static const char * const headphone_thread_name = "headphone";
@@ -115,7 +115,7 @@ static void headphone_thread(void)
 
     while (1)
     {
-        int rc = wakeup_wait(&headphone_wakeup, headphone_wait_timeout);
+        int rc = semaphore_wait(&headphone_wakeup, headphone_wait_timeout);
         unsigned int data = adc_read(ADC_HPREMOTE);
 
         if (rc == OBJ_WAIT_TIMEDOUT)
@@ -175,7 +175,7 @@ static void headphone_thread(void)
 void headphone_detect_event(void)
 {
     /* Trigger the thread immediately. */
-    wakeup_signal(&headphone_wakeup);
+    semaphore_release(&headphone_wakeup);
 }
 
 /* Tell if anything is in the jack. */
@@ -187,7 +187,7 @@ bool headphones_inserted(void)
 void INIT_ATTR headphone_init(void)
 {
     /* A thread is required to monitor the remote ADC and jack state. */
-    wakeup_init(&headphone_wakeup);
+    semaphore_init(&headphone_wakeup, 1, 0);
     headphone_thread_id = create_thread(headphone_thread, 
                                         headphone_stack,
                                         sizeof(headphone_stack),
diff --git a/firmware/target/arm/imx31/i2c-imx31.c b/firmware/target/arm/imx31/i2c-imx31.c
index 4e810c588f..975f951fdc 100644
--- a/firmware/target/arm/imx31/i2c-imx31.c
+++ b/firmware/target/arm/imx31/i2c-imx31.c
@@ -48,7 +48,7 @@ static struct i2c_module_descriptor
     volatile unsigned short * const base; /* Module base address */
     void (* const handler)(void);         /* Module interrupt handler */
     struct mutex m;                       /* Node mutual-exclusion */
-    struct wakeup w;                      /* I2C done signal */
+    struct semaphore complete;            /* I2C completion signal */
     unsigned char *addr_data;             /* Additional addressing data */
     int addr_count;                       /* Addressing byte count */
     unsigned char *data;                  /* TX/RX buffer (actual data) */
@@ -164,7 +164,7 @@ i2c_stop:
     base[I2CR] &= ~(I2C_I2CR_MSTA | I2C_I2CR_IIEN);
 i2c_done:
     /* Signal thread we're done */
-    wakeup_signal(&desc->w);
+    semaphore_release(&desc->complete);
 }
 
 #if (I2C_MODULE_MASK & USE_I2C1_MODULE)
@@ -221,7 +221,7 @@ static int i2c_transfer(struct i2c_node * const node,
     base[I2DR] = desc->addr;
 
     /* Wait for transfer to complete */
-    if (wakeup_wait(&desc->w, HZ) == OBJ_WAIT_SUCCEEDED)
+    if (semaphore_wait(&desc->complete, HZ) == OBJ_WAIT_SUCCEEDED)
     {
         count -= desc->data_count;
     }
@@ -294,7 +294,7 @@ void i2c_init(void)
         struct i2c_module_descriptor *const desc = &i2c_descs[i];
         ccm_module_clock_gating(desc->cg, CGM_ON_RUN_WAIT);
         mutex_init(&desc->m);
-        wakeup_init(&desc->w);
+        semaphore_init(&desc->complete, 1, 0);
         desc->base[I2CR] = 0;
         ccm_module_clock_gating(desc->cg, CGM_OFF);
     }
diff --git a/firmware/target/arm/imx31/mc13783-imx31.c b/firmware/target/arm/imx31/mc13783-imx31.c
index d5d22e2c75..006b065ea5 100644
--- a/firmware/target/arm/imx31/mc13783-imx31.c
+++ b/firmware/target/arm/imx31/mc13783-imx31.c
@@ -32,11 +32,11 @@ extern struct spi_node mc13783_spi;
 /* PMIC event service data */
 static int mc13783_thread_stack[DEFAULT_STACK_SIZE/sizeof(int)];
 static const char *mc13783_thread_name = "pmic";
-static struct wakeup mc13783_svc_wake;
+static struct semaphore mc13783_svc_wake;
 
 /* Synchronous thread communication objects */
 static struct mutex mc13783_spi_mutex;
-static struct wakeup mc13783_spi_wake;
+static struct semaphore mc13783_spi_complete;
 
 /* Tracking for which interrupts are enabled */
 static uint32_t pmic_int_enabled[2] =
@@ -69,13 +69,13 @@ static void mc13783_xfer_complete_cb(struct spi_transfer_desc *xfer)
     if (xfer->count != 0)
         return;
 
-    wakeup_signal(&mc13783_spi_wake);
+    semaphore_release(&mc13783_spi_complete);
 }
 
 static inline bool wait_for_transfer_complete(void)
 {
-    return wakeup_wait(&mc13783_spi_wake, HZ*2) == OBJ_WAIT_SUCCEEDED &&
-           mc13783_transfer.count == 0;
+    return semaphore_wait(&mc13783_spi_complete, HZ*2)
+            == OBJ_WAIT_SUCCEEDED && mc13783_transfer.count == 0;
 }
 
 static void mc13783_interrupt_thread(void)
@@ -89,7 +89,7 @@ static void mc13783_interrupt_thread(void)
     {
         const struct mc13783_event *event, *event_last;
 
-        wakeup_wait(&mc13783_svc_wake, TIMEOUT_BLOCK);
+        semaphore_wait(&mc13783_svc_wake, TIMEOUT_BLOCK);
 
         if (mc13783_thread_id == 0)
             break;
@@ -140,16 +140,16 @@ void mc13783_event(void)
     /* Mask the interrupt (unmasked when PMIC thread services it). */
     bitclr32(&MC13783_GPIO_IMR, 1ul << MC13783_GPIO_LINE);
     MC13783_GPIO_ISR = (1ul << MC13783_GPIO_LINE);
-    wakeup_signal(&mc13783_svc_wake);
+    semaphore_release(&mc13783_svc_wake);
 }
 
 void INIT_ATTR mc13783_init(void)
 {
     /* Serial interface must have been initialized first! */
-    wakeup_init(&mc13783_svc_wake);
+    semaphore_init(&mc13783_svc_wake, 1, 0);
     mutex_init(&mc13783_spi_mutex);
 
-    wakeup_init(&mc13783_spi_wake);
+    semaphore_init(&mc13783_spi_complete, 1, 0);
 
     /* Enable the PMIC SPI module */
     spi_enable_module(&mc13783_spi);
@@ -175,7 +175,7 @@ void mc13783_close(void)
         return;
 
     mc13783_thread_id = 0;
-    wakeup_signal(&mc13783_svc_wake);
+    semaphore_release(&mc13783_svc_wake);
     thread_wait(thread_id);
     spi_disable_module(&mc13783_spi);
 }