diff options
| author | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
|---|---|---|
| committer | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
| commit | 590501cfe404b5463adecc70628e5bc7c8f142a2 (patch) | |
| tree | 3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /firmware/export/kernel.h | |
| parent | a26110c52dff9bc15d20146462d52d07f61bd238 (diff) | |
| download | rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.gz rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.zip | |
Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/kernel.h')
| -rw-r--r-- | firmware/export/kernel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h index 9ada8eb59c..50c9bdc0ae 100644 --- a/firmware/export/kernel.h +++ b/firmware/export/kernel.h | |||
| @@ -113,6 +113,8 @@ struct mutex | |||
| 113 | /* We don't enable interrupts in the iPod bootloader, so we need to fake | 113 | /* We don't enable interrupts in the iPod bootloader, so we need to fake |
| 114 | the current_tick variable */ | 114 | the current_tick variable */ |
| 115 | #define current_tick (signed)(USEC_TIMER/10000) | 115 | #define current_tick (signed)(USEC_TIMER/10000) |
| 116 | #elif (CONFIG_CPU == IMX31L) && defined(BOOTLOADER) | ||
| 117 | #define current_tick (signed)((0xFFFFFFFF - EPITCNT1)/10000) | ||
| 116 | #else | 118 | #else |
| 117 | extern volatile long current_tick; | 119 | extern volatile long current_tick; |
| 118 | #endif | 120 | #endif |