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/arm/s5l8700/ipodnano2g | |
parent | 05e180a1308a095d51d51d0e047fcd44425ea88f (diff) | |
download | rockbox-12375d1d3aa41f7d277a9af584c7b810b636ec95.tar.gz 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/arm/s5l8700/ipodnano2g')
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c index 8a4541a226..9261e5b3a0 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c | |||
@@ -94,9 +94,9 @@ static long nand_last_activity_value = -1; | |||
94 | static long nand_stack[DEFAULT_STACK_SIZE]; | 94 | static long nand_stack[DEFAULT_STACK_SIZE]; |
95 | 95 | ||
96 | static struct mutex nand_mtx; | 96 | static struct mutex nand_mtx; |
97 | static struct wakeup nand_wakeup; | 97 | static struct semaphore nand_complete; |
98 | static struct mutex ecc_mtx; | 98 | static struct mutex ecc_mtx; |
99 | static struct wakeup ecc_wakeup; | 99 | static struct semaphore ecc_complete; |
100 | 100 | ||
101 | static uint8_t nand_data[0x800] STORAGE_ALIGN_ATTR; | 101 | static uint8_t nand_data[0x800] STORAGE_ALIGN_ATTR; |
102 | static uint8_t nand_ctrl[0x200] STORAGE_ALIGN_ATTR; | 102 | static uint8_t nand_ctrl[0x200] STORAGE_ALIGN_ATTR; |
@@ -731,9 +731,9 @@ static void nand_thread(void) | |||
731 | int nand_device_init(void) | 731 | int nand_device_init(void) |
732 | { | 732 | { |
733 | mutex_init(&nand_mtx); | 733 | mutex_init(&nand_mtx); |
734 | wakeup_init(&nand_wakeup); | 734 | semaphore_init(&nand_complete, 1, 0); |
735 | mutex_init(&ecc_mtx); | 735 | mutex_init(&ecc_mtx); |
736 | wakeup_init(&ecc_wakeup); | 736 | semaphore_init(&ecc_complete, 1, 0); |
737 | 737 | ||
738 | uint32_t type; | 738 | uint32_t type; |
739 | uint32_t i, j; | 739 | uint32_t i, j; |