forked from len0rd/rockbox
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
This commit is contained in:
parent
a26110c52d
commit
590501cfe4
57 changed files with 4016 additions and 17 deletions
|
|
@ -113,6 +113,8 @@ struct mutex
|
|||
/* We don't enable interrupts in the iPod bootloader, so we need to fake
|
||||
the current_tick variable */
|
||||
#define current_tick (signed)(USEC_TIMER/10000)
|
||||
#elif (CONFIG_CPU == IMX31L) && defined(BOOTLOADER)
|
||||
#define current_tick (signed)((0xFFFFFFFF - EPITCNT1)/10000)
|
||||
#else
|
||||
extern volatile long current_tick;
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue