FreeCalypso > hg > freecalypso-sw
diff nuc-fw/bsp/clkm.h @ 109:91460c8957f0
nuc-fw/bsp: beginning of reconciliation with the Leonardo semi-src version
| author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
|---|---|
| date | Sat, 19 Oct 2013 18:59:34 +0000 |
| parents | 45911ad957fd |
| children | 1e41550feec5 |
line wrap: on
line diff
--- a/nuc-fw/bsp/clkm.h Fri Sep 13 17:00:09 2013 +0000 +++ b/nuc-fw/bsp/clkm.h Sat Oct 19 18:59:34 2013 +0000 @@ -26,6 +26,8 @@ Sccs Id (SID) : '@(#) clkm.h 1.10 10/23/01 14:34:54 ' + * FreeCalypso note: this version of clkm.h originates + * from the MV100-0.1.rar find. *****************************************************************************/ @@ -255,6 +257,11 @@ #define CLKM_INITCNTL(value) (* (volatile SYS_UWORD16 *) CLKM_CNTL_CLK = value) +/* + * NOTE: the version of the CLKM_INITCNTL() macro in the Sotomodem source + * does |= instead of =. It remains to be investigated which is more correct. + */ + #if ((CHIPSET != 4) && (CHIPSET != 7) && (CHIPSET != 8) && (CHIPSET != 10) && (CHIPSET != 11) && (CHIPSET != 12)) /*---------------------------------------------------------------/ @@ -363,11 +370,11 @@ /* ----- Prototypes ----- */ #if ((CHIPSET == 4) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 10) || (CHIPSET == 11) || (CHIPSET == 12)) - 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); #else - inline void CLKM_InitARMClock(SYS_UWORD16 clk_src, SYS_UWORD16 clk_div); + void CLKM_InitARMClock(SYS_UWORD16 clk_src, SYS_UWORD16 clk_div); #endif void wait_ARM_cycles(SYS_UWORD32 cpt_loop); void initialize_wait_loop(void); -inline SYS_UWORD32 convert_nanosec_to_cycles(SYS_UWORD32 time); +SYS_UWORD32 convert_nanosec_to_cycles(SYS_UWORD32 time);