diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2011-03-02 08:49:38 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2011-03-02 08:49:38 +0000 |
| commit | 12375d1d3aa41f7d277a9af584c7b810b636ec95 (patch) | |
| tree | fc9ce8029a6910a8dac71b3bf60c71155a01eea4 /firmware/target/mips/ingenic_jz47xx/usb-jz4740.c | |
| parent | 05e180a1308a095d51d51d0e047fcd44425ea88f (diff) | |
| download | rockbox-12375d1d3aa41f7d277a9af584c7b810b636ec95.tar.gz rockbox-12375d1d3aa41f7d277a9af584c7b810b636ec95.tar.bz2 rockbox-12375d1d3aa41f7d277a9af584c7b810b636ec95.zip | |
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
Diffstat (limited to 'firmware/target/mips/ingenic_jz47xx/usb-jz4740.c')
| -rw-r--r-- | firmware/target/mips/ingenic_jz47xx/usb-jz4740.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c b/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c index f12f1bed82..a615d3d4da 100644 --- a/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c @@ -69,7 +69,7 @@ struct usb_endpoint unsigned short fifo_size; bool wait; - struct wakeup wakeup; + struct semaphore complete; }; static unsigned char ep0_rx_buf[64]; @@ -171,7 +171,7 @@ static inline void ep_transfer_completed(struct usb_endpoint* ep) ep->buf = NULL; ep->busy = false; if(ep->wait) - wakeup_signal(&ep->wakeup); + semaphore_release(&ep->complete); } static void EP0_send(void) @@ -598,7 +598,7 @@ void usb_init_device(void) system_enable_irq(IRQ_UDC); for(i=0; i<TOTAL_EP(); i++) - wakeup_init(&endpoints[i].wakeup); + semaphore_init(&endpoints[i].complete, 1, 0); } #ifdef USB_GPIO_IRQ @@ -715,7 +715,7 @@ static void usb_drv_send_internal(struct usb_endpoint* ep, void* ptr, int length if(blocking) { - wakeup_wait(&ep->wakeup, TIMEOUT_BLOCK); + semaphore_wait(&ep->complete, TIMEOUT_BLOCK); ep->wait = false; } } |