From c595663b78062d7bf857eec6378238c92d0dabb6 Mon Sep 17 00:00:00 2001 From: kuwoyuki Date: Mon, 9 Dec 2024 06:34:04 +0600 Subject: [PATCH] fix: ifdef --- include/system_rtl8710bx.h | 13 +++++++++++-- src/main.c | 2 +- src/system_rtl8710bx.c | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/system_rtl8710bx.h b/include/system_rtl8710bx.h index 906b6c2..9915480 100644 --- a/include/system_rtl8710bx.h +++ b/include/system_rtl8710bx.h @@ -3,9 +3,14 @@ #include +// #define USE_ROM_TABLES + #ifdef USE_ROM_TABLES -#define CPU_CLK_TABLE 0x00046E68 -#define XTAL_TABLE_ROM 0x00046E10 +#define CPU_CLK_TABLE_ADDR 0x00046E68 +#define XTAL_TABLE_ADDR 0x00046E10 +/* for init inline asm */ +#define CPU_CLK_TABLE ((const uint32_t*)CPU_CLK_TABLE_ADDR) +#define XTAL_TABLE ((const uint32_t*)XTAL_TABLE_ADDR) #else /* CPU clock frequency table (Hz) */ @@ -32,6 +37,10 @@ static const uint32_t XTAL_TABLE[] = { 14318000, /* 14.318 MHz */ 12000000, /* 12 MHz */ }; +/* for init inline asm */ +#define CPU_CLK_TABLE_ADDR ((uint32_t)CPU_CLK_TABLE) +#define XTAL_TABLE_ADDR ((uint32_t)XTAL_TABLE) + #endif /* System Clock Frequency (Core Clock)*/ diff --git a/src/main.c b/src/main.c index 45540a4..3d9985f 100644 --- a/src/main.c +++ b/src/main.c @@ -17,7 +17,7 @@ int main(void) { SystemCoreClockUpdate(); printf("SystemCoreClock afer update: %d Hz\n", SystemCoreClock); - SysTick_Config(100); // tick / 100 cycles + SysTick_Config(SystemCoreClock / 1000); PERI_ON->SOC_PERI_FUNC1_EN |= BIT_PERI_GPIO_EN; PERI_ON->PESOC_CLK_CTRL |= APBPeriph_GPIO_CLOCK; diff --git a/src/system_rtl8710bx.c b/src/system_rtl8710bx.c index 97ae717..f773ae0 100644 --- a/src/system_rtl8710bx.c +++ b/src/system_rtl8710bx.c @@ -37,7 +37,7 @@ __attribute__((naked)) void SystemInit(void) { "bl main\n" "b 1b\n" /* if main ever returns */ : - : "i"(&SYSTEM_CTRL->CLK_CTRL1), "i"(&CPU_CLK_TABLE), + : "i"(&SYSTEM_CTRL->CLK_CTRL1), "i"(CPU_CLK_TABLE_ADDR), "i"(&SystemCoreClock), "i"(CPU_CLK_POS) : "r0", "r1", "r2", "r3", "memory"); }