Mercurial > nand-ecoscentric
changeset 3385:631d86e5d620
io/nand tests/nand_rwbenchmark.c: Cope with CYGNUM_KERNEL_COUNTERS_RTC_PERIOD not being constant.
| author | Ross Younger <wry@ecoscentric.com> |
|---|---|
| date | Fri, 26 Sep 2014 22:27:05 +1200 |
| parents | 1229083b0af1 |
| children | 3ec9445648cd |
| files | packages/io/nand/current/ChangeLog packages/io/nand/current/tests/nand_rwbenchmark.c |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/io/nand/current/ChangeLog +++ b/packages/io/nand/current/ChangeLog @@ -1,3 +1,8 @@ +2014-09-26 Ross Younger <wry@ecoscentric.com> + + * tests/nand_rwbenchmark.c: Cope with CYGNUM_KERNEL_COUNTERS_RTC_PERIOD + not being constant. + 2014-08-11 Ross Younger <wry@ecoscentric.com> * nand.c nand_bbt.c nand_synth.c: Make build with recent gcc
--- a/packages/io/nand/current/tests/nand_rwbenchmark.c +++ b/packages/io/nand/current/tests/nand_rwbenchmark.c @@ -128,7 +128,7 @@ static cyg_int32 us_per_haltick = static cyg_int32 halticks_per_us = 0; static cyg_int64 rtc_resolution[] = CYGNUM_KERNEL_COUNTERS_RTC_RESOLUTION; -static cyg_int64 rtc_period = CYGNUM_KERNEL_COUNTERS_RTC_PERIOD; +static cyg_int64 rtc_period; static void wait_for_tick( void ) { @@ -173,6 +173,7 @@ static void init_timing( void ) cyg_thread_delay(2); // ensure clock running - asserts if not + rtc_period = CYGNUM_KERNEL_COUNTERS_RTC_PERIOD; us_per_haltick = 1000000/(rtc_period * rtc_resolution[1]); halticks_per_us = (rtc_period * rtc_resolution[1])/1000000;