len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-10 05:32:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jz4760: fix the new udelay() to use _micro_seconds, not milliseconds

Browse source 
Change-Id: I4877b1c8e4a95259b5ade126e28458b65fbd3c4b
This commit is contained in:
Solomon Peachy 2020-08-26 11:11:12 -04:00
parent f791df1375
commit f4bf27c26e
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
firmware/target/mips/ingenic_jz47xx/system-jz4760.c
View file

@ -338,11 +338,11 @@ void tlb_refill_handler(void)
} }
#ifdef USE_HW_UDELAY #ifdef USE_HW_UDELAY
/* This enables the HW timer, set to EXT_XTAL / 16 (so @ 12MHz, 1 us = 750 ticks) */ /* This enables the HW timer, set to EXT_XTAL / 4 (so @ 12/4 = 3MHz, 1 us = 3 ticks) */
static void init_delaytimer(void) static void init_delaytimer(void)
{ {
__tcu_disable_ost(); __tcu_disable_ost();
REG_OST_OSTCSR = OSTCSR_EXT_EN | OSTCSR_PRESCALE16 | OSTCSR_CNT_MD; REG_OST_OSTCSR = OSTCSR_EXT_EN | OSTCSR_PRESCALE4 | OSTCSR_CNT_MD;
REG_OST_OSTCNT = 0; REG_OST_OSTCNT = 0;
REG_OST_OSTDR = 0; REG_OST_OSTDR = 0;
__tcu_enable_ost(); __tcu_enable_ost();
@ -353,10 +353,12 @@ void udelay(unsigned int usec)
if (!__tcu_ost_enabled()) if (!__tcu_ost_enabled())
init_delaytimer(); init_delaytimer();
/* Figure out how many ticks we need */ unsigned int now = REG_OST_OSTCNT;
usec = (CFG_EXTAL / 16 / 1000) * (usec + 1);
while (usec < REG_OST_OSTCNT) { } /* Figure out how many ticks we need */
usec = (CFG_EXTAL / (4 * 1000 * 1000)) * (usec + 1);
while (REG_OST_OSTCNT - now < usec) { }
} }
#else #else
void udelay(unsigned int usec) void udelay(unsigned int usec)