FreeCalypso > hg > freecalypso-sw
diff nuc-fw/bsp/clkm.c @ 111:5b7403f6ae93
nuc-fw/bsp: more reconciliation
author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
---|---|
date | Sun, 20 Oct 2013 07:58:00 +0000 |
parents | 45911ad957fd |
children |
line wrap: on
line diff
--- a/nuc-fw/bsp/clkm.c Sun Oct 20 07:04:15 2013 +0000 +++ b/nuc-fw/bsp/clkm.c Sun Oct 20 07:58:00 2013 +0000 @@ -67,8 +67,8 @@ /* Return : none */ /* Functionality :Initialize the ARM Clock frequency */ /*--------------------------------------------------------------*/ - - inline void CLKM_InitARMClock(SYS_UWORD16 clk_src, SYS_UWORD16 clk_div, SYS_UWORD16 clk_xp5) + + void CLKM_InitARMClock(SYS_UWORD16 clk_src, SYS_UWORD16 clk_div, SYS_UWORD16 clk_xp5) { SYS_UWORD16 cntl = * (volatile SYS_UWORD16 *) CLKM_ARM_CLK; @@ -90,7 +90,7 @@ /* Functionality :Initialize the ARM Clock frequency */ /*--------------------------------------------------------------*/ - inline void CLKM_InitARMClock(SYS_UWORD16 clk_src, SYS_UWORD16 clk_div) + void CLKM_InitARMClock(SYS_UWORD16 clk_src, SYS_UWORD16 clk_div) { SYS_UWORD16 cntl = * (volatile SYS_UWORD16 *) CLKM_ARM_CLK; @@ -118,7 +118,7 @@ /* initialize_wait_loop() function */ /* Called when the HardWare needs time to wait */ /*-------------------------------------------------------*/ -inline SYS_UWORD32 convert_nanosec_to_cycles(SYS_UWORD32 time) +SYS_UWORD32 convert_nanosec_to_cycles(SYS_UWORD32 time) { return( time / ratio_wait_loop); } @@ -313,5 +313,3 @@ asm("END_FUNCTION: "); } - -