From d6fb37aa9fdb7ee5175a82875f6e16b9acd5f12a Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 19 Apr 2018 06:17:52 +0200 Subject: bsps: Move shared btimer support to bsps This patch is a part of the BSP source reorganization. Update #3285. --- c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am | 2 +- c/src/lib/libbsp/arm/atsam/Makefile.am | 2 +- c/src/lib/libbsp/arm/beagle/Makefile.am | 2 +- c/src/lib/libbsp/arm/gdbarmsim/Makefile.am | 2 +- c/src/lib/libbsp/arm/imx/Makefile.am | 2 +- c/src/lib/libbsp/arm/lm3s69xx/Makefile.am | 2 +- c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am | 2 +- c/src/lib/libbsp/arm/stm32f4/Makefile.am | 2 +- c/src/lib/libbsp/arm/tms570/Makefile.am | 2 +- c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am | 2 +- c/src/lib/libbsp/mips/malta/Makefile.am | 2 +- c/src/lib/libbsp/moxie/moxiesim/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/t32mppc/Makefile.am | 2 +- c/src/lib/libbsp/sh/shsim/Makefile.am | 2 +- c/src/lib/libbsp/shared/timercpucounter.c | 35 ----------------------- c/src/lib/libbsp/shared/timerstub.c | 30 ------------------- c/src/lib/libbsp/sparc64/niagara/Makefile.am | 2 +- c/src/lib/libbsp/sparc64/usiii/Makefile.am | 2 +- c/src/lib/libbsp/v850/gdbv850sim/Makefile.am | 2 +- 19 files changed, 17 insertions(+), 82 deletions(-) delete mode 100644 c/src/lib/libbsp/shared/timercpucounter.c delete mode 100644 c/src/lib/libbsp/shared/timerstub.c (limited to 'c') diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am index b7625af8c9..8afedb85f4 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am @@ -82,7 +82,7 @@ librtemsbsp_a_SOURCES += hwlib/src/hwmgr/alt_reset_manager.c librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c librtemsbsp_a_SOURCES += ../../shared/sbrk.c -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bsp-fdt.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am index a8db8b77a5..ef9809e9fc 100644 --- a/c/src/lib/libbsp/arm/atsam/Makefile.am +++ b/c/src/lib/libbsp/arm/atsam/Makefile.am @@ -122,7 +122,7 @@ librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c librtemsbsp_a_SOURCES += clock/systick-freq.c # Timer -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c # Cache librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-v7m.c diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am index 7d3167f34d..d9923d1248 100644 --- a/c/src/lib/libbsp/arm/beagle/Makefile.am +++ b/c/src/lib/libbsp/arm/beagle/Makefile.am @@ -45,7 +45,7 @@ librtemsbsp_a_SOURCES += ../../shared/sbrk.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c librtemsbsp_a_SOURCES += ../../shared/gpio.c librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c librtemsbsp_a_SOURCES += ../../shared/cpucounterread.c librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am index cb1de3e0d5..faaff8b387 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am +++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am @@ -33,7 +33,7 @@ librtemsbsp_a_SOURCES += console/console-io.c # clock librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c # timer -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c # start hooks librtemsbsp_a_SOURCES += startup/bspstarthooks.c librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am index 6bf4584814..90fe54c062 100644 --- a/c/src/lib/libbsp/arm/imx/Makefile.am +++ b/c/src/lib/libbsp/arm/imx/Makefile.am @@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-defa librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c librtemsbsp_a_SOURCES += ../../shared/sbrk.c -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bsp-fdt.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am index 700ff5f23a..a6bc270fb5 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am @@ -63,7 +63,7 @@ librtemsbsp_a_SOURCES += console/uart.c librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c # Timer -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c # Cache librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am index 7ed5d22555..5a79cefe8e 100644 --- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am +++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am @@ -42,7 +42,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c librtemsbsp_a_SOURCES += ../../shared/sbrk.c -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am index 00950c02b8..cb69f4e640 100644 --- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am +++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am @@ -67,7 +67,7 @@ librtemsbsp_a_SOURCES += i2c/i2c-config.c librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c # Timer -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c # Cache librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am index e188dbf4f2..ff5db2a6c4 100644 --- a/c/src/lib/libbsp/arm/tms570/Makefile.am +++ b/c/src/lib/libbsp/arm/tms570/Makefile.am @@ -75,7 +75,7 @@ librtemsbsp_a_SOURCES += clock/clock.c librtemsbsp_a_SOURCES += pinmux/pinmux.c # Benchmark Timer -librtemsbsp_a_SOURCES += ../../shared/timercpucounter.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-cpucounter.c # Misc librtemsbsp_a_SOURCES += misc/cpucounterread.c diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am index b557a0a35f..5a7c4ab0d7 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am +++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am @@ -40,7 +40,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c librtemsbsp_a_SOURCES += ../../shared/sbrk.c -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am index b53baf3bdb..8eaa876949 100644 --- a/c/src/lib/libbsp/mips/malta/Makefile.am +++ b/c/src/lib/libbsp/mips/malta/Makefile.am @@ -44,7 +44,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console librtemsbsp_a_SOURCES += console/conscfg.c librtemsbsp_a_SOURCES += console/printk_support.c # timer -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am index 950f69da27..28970aae3b 100644 --- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am +++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am @@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES += ../../shared/console-polled.c librtemsbsp_a_SOURCES += console/console-io.c librtemsbsp_a_SOURCES += console/syscalls.S # timer -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c # Cache librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am index 73c627a831..4f4d851b75 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am @@ -40,7 +40,7 @@ librtemsbsp_a_SOURCES += startup/bspreset.c librtemsbsp_a_SOURCES += clock/clock-config.c # Timer -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c # IRQ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index 7f80ca99a9..fc3b9caf7f 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -38,7 +38,7 @@ librtemsbsp_a_SOURCES += console/console-support.S librtemsbsp_a_SOURCES += console/console-debugio.c # timer -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c # Cache librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c diff --git a/c/src/lib/libbsp/shared/timercpucounter.c b/c/src/lib/libbsp/shared/timercpucounter.c deleted file mode 100644 index ade1c02cd1..0000000000 --- a/c/src/lib/libbsp/shared/timercpucounter.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2017 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#include -#include - -static uint32_t benchmark_timer_base; - -void benchmark_timer_initialize(void) -{ - benchmark_timer_base = rtems_counter_read(); -} - -benchmark_timer_t benchmark_timer_read(void) -{ - return rtems_counter_difference(rtems_counter_read(), benchmark_timer_base); -} - -void benchmark_timer_disable_subtracting_average_overhead( - bool find_average_overhead -) -{ - (void) find_average_overhead; -} diff --git a/c/src/lib/libbsp/shared/timerstub.c b/c/src/lib/libbsp/shared/timerstub.c deleted file mode 100644 index d1e3313115..0000000000 --- a/c/src/lib/libbsp/shared/timerstub.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file implements a stub benchmark timer that is sufficient to - * satisfy linking the RTEMS Benchmarks. - * - * COPYRIGHT (c) 1989-2001. - * On-Line Applications Research Corporation (OAR). - */ - -#include -#include - -bool benchmark_timer_find_average_overhead; - -void benchmark_timer_initialize(void) -{ -} - -benchmark_timer_t benchmark_timer_read(void) -{ - if (benchmark_timer_find_average_overhead) - return 1; - return 0; -} - -void benchmark_timer_disable_subtracting_average_overhead( - bool find_flag -) -{ - benchmark_timer_find_average_overhead = find_flag; -} diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am index f90c7ddfcd..20f56003bd 100644 --- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am +++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am @@ -42,7 +42,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am index 3369039a8e..f80a89b77f 100644 --- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am +++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am @@ -53,7 +53,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c diff --git a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am index cd487fec51..0506ed2a27 100644 --- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am +++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am @@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += startup/trap.S librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c librtemsbsp_a_SOURCES += ../../shared/console-polled.c librtemsbsp_a_SOURCES += console/console-io.c -librtemsbsp_a_SOURCES += ../../shared/timerstub.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c # Cache librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c -- cgit v1.2.3