bsps: Move clock drivers to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

bsps/arm/csb336/clock/clockdrv.c

@@ -17,7 +17,7 @@
 #include <mc9328mxl.h>
 #include <rtems/bspIo.h>  /* for printk */
 
-/* this is defined in ../../../shared/clockdrv_shell.h */
+/* this is defined in ../../../shared/dev/clock/clockimpl.h */
 void Clock_isr(rtems_irq_hdl_param arg);
 static void clock_isr_on(const rtems_irq_connect_data *unused);
 static void clock_isr_off(const rtems_irq_connect_data *unused);
@@ -131,4 +131,4 @@ static int clock_isr_is_on(const rtems_irq_connect_data *irq)
 
 /* Make sure to include this, and only at the end of the file */
 
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/arm/csb337/clock/clock.c

@@ -110,4 +110,4 @@ static void Clock_driver_support_initialize_hardware(void)
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/arm/edb7312/clock/clockdrv.c

@@ -69,4 +69,4 @@ void Clock_isr(void * arg);
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/arm/gumstix/clock/clock.c

@@ -115,4 +115,4 @@ static void Clock_driver_support_initialize_hardware(void)
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/arm/raspberrypi/clock/clockdrv.c

@@ -26,7 +26,7 @@
 #include <bsp/raspberrypi.h>
 #include <rtems/timecounter.h>
 
-/* This is defined in ../../../shared/clockdrv_shell.h */
+/* This is defined in ../../../shared/dev/clock/clockimpl.h */
 void Clock_isr(rtems_irq_hdl_param arg);
 
 static struct timecounter raspberrypi_tc;
@@ -111,4 +111,4 @@ static void raspberrypi_clock_cleanup(void)
 
 #define CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR 1
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/arm/rtl22xx/clock/clockdrv.c

@@ -77,7 +77,7 @@ rtems_irq_connect_data clock_isr_data = {
   .isOn   = clock_isr_is_on,
 };
 
-/* use the /shared/clockdrv_shell.h code template */
+/* use the /shared/dev/clock/clockimpl.h code template */
 
 /**
  * Installs the clock ISR. You shouldn't need to change this.
@@ -173,5 +173,5 @@ static int clock_isr_is_on(const rtems_irq_connect_data *irq)
 #define Clock_driver_timecounter_tick() lpc22xx_tc_tick()
 
 /* Make sure to include this, and only at the end of the file */
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
 

bsps/arm/shared/clock/clock-armv7m.c

@@ -20,7 +20,7 @@
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-/* This is defined in clockdrv_shell.h */
+/* This is defined in dev/clock/clockimpl.h */
 static void Clock_isr(void *arg);
 
 typedef struct {
@@ -154,6 +154,6 @@ static void _ARMV7M_Systick_cleanup(void)
   _ARMV7M_Systick_cleanup()
 
 /* Include shared source clock driver code */
-#include "../../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
 
 #endif /* ARM_MULTILIB_ARCH_V7M */

bsps/arm/shared/clock/clock-nxp-lpc.c

@@ -28,7 +28,7 @@
 
 #ifdef ARM_MULTILIB_ARCH_V4
 
-/* This is defined in ../../../shared/clockdrv_shell.h */
+/* This is defined in ../../../shared/dev/clock/clockimpl.h */
 void Clock_isr(rtems_irq_hdl_param arg);
 
 static volatile lpc_timer *const lpc_clock =
@@ -131,6 +131,6 @@ static void lpc_clock_cleanup(void)
 #define Clock_driver_support_shutdown_hardware() lpc_clock_cleanup()
 
 /* Include shared source clock driver code */
-#include "../../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
 
 #endif /* ARM_MULTILIB_ARCH_V4 */

bsps/arm/smdk2410/clock/clockdrv.c

@@ -120,4 +120,4 @@ static int clock_isr_is_on(const rtems_irq_connect_data *irq)
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
 /* Make sure to include this, and only at the end of the file */
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/arm/tms570/clock/clock.c

@@ -187,4 +187,4 @@ static void tms570_clock_driver_support_shutdown_hardware( void )
 
 void Clock_isr(void *arg); /* to supress warning */
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/i386/pc386/clock/ckinit.c

@@ -259,4 +259,4 @@ void Clock_driver_support_initialize_hardware(void)
     assert(status == RTEMS_SUCCESSFUL); \
   } while (0)
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/lm32/shared/clock/ckinit.c

@@ -74,5 +74,5 @@ static void Clock_driver_support_initialize_hardware(void)
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
 

bsps/m68k/av5282/clock/clock.c

@@ -58,4 +58,4 @@
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/m68k/gen68360/clock/clock.c

@@ -98,4 +98,4 @@ extern int m360_clock_rate;
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/m68k/genmcf548x/clock/clock.c

@@ -98,5 +98,5 @@
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
 

bsps/m68k/mcf52235/clock/clock.c

@@ -103,4 +103,4 @@ static void Clock_driver_support_initialize_hardware(void)
 
 #define Clock_driver_timecounter_tick() mcf52235_tc_tick()
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/m68k/mcf5225x/clock/clock.c

@@ -103,4 +103,4 @@ static void Clock_driver_support_initialize_hardware(void)
 
 #define Clock_driver_timecounter_tick() mcf5225x_tc_tick()
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/m68k/mcf5235/clock/clock.c

@@ -58,4 +58,4 @@
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/m68k/mcf5329/clock/clock.c

@@ -102,4 +102,4 @@ static void Clock_driver_support_initialize_hardware(void)
 
 #define Clock_driver_timecounter_tick() mcf5329_tc_tick()
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/m68k/uC5282/clock/clock.c

@@ -158,4 +158,4 @@ int bsp_cpu_load_percentage(void)
 
 #define Clock_driver_timecounter_tick() uC5282_tc_tick()
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/mips/csb350/clock/clockdrv.c

@@ -87,4 +87,4 @@ void au1x00_clock_init(void)
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/mips/jmr3904/clock/clockdrv.c

@@ -47,4 +47,4 @@
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/mips/rbtx4925/clock/clockdrv.c

@@ -117,4 +117,4 @@
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/mips/rbtx4938/clock/clockdrv.c

@@ -116,4 +116,4 @@ void new_brk_esr(void)
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/mips/shared/clock/clockdrv.c

@@ -46,4 +46,4 @@ static uint32_t mips_timer_rate = 0;
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/nios2/nios2_iss/clock/clock.c

@@ -51,5 +51,5 @@ static void Clock_driver_support_initialize_hardware(void)
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
 

bsps/no_cpu/no_bsp/clock/ckinit.c

@@ -1,7 +1,7 @@
 /*
  *  This file provides a template for the clock device driver initialization.
  *
- *  If possible, please use the clockdrv_shell.h method for instantiating
+ *  If possible, please use the dev/clock/clockimpl.h method for instantiating
  *  a clock driver.
  */
 

bsps/or1k/generic_or1k/clock/clockdrv.c

@@ -144,4 +144,4 @@ CPU_Counter_ticks _CPU_Counter_difference(
 
 #define Clock_driver_support_shutdown_hardware() generic_or1k_clock_cleanup()
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/powerpc/mpc55xxevb/clock/clock-config.c

@@ -254,4 +254,4 @@ static void mpc55xx_clock_cleanup(void)
   mpc55xx_clock_cleanup()
 
 /* Include shared source clock driver code */
-#include "../../../../libbsp/shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/powerpc/qoriq/clock/clock-config.c

@@ -28,7 +28,7 @@
 #include <bsp/qoriq.h>
 #include <bsp/irq.h>
 
-/* This is defined in clockdrv_shell.h */
+/* This is defined in dev/clock/clockimpl.h */
 static rtems_isr Clock_isr(void *arg);
 
 static struct timecounter qoriq_clock_tc;
@@ -175,4 +175,4 @@ static void qoriq_clock_cleanup(void)
   qoriq_clock_initialize()
 
 /* Include shared source clock driver code */
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/powerpc/t32mppc/clock/clock-config.c

@@ -19,7 +19,7 @@
 #include <bsp.h>
 #include <bsp/irq.h>
 
-/* This is defined in clockdrv_shell.h */
+/* This is defined in dev/clock/clockimpl.h */
 static rtems_isr Clock_isr(void *arg);
 
 static struct timecounter t32mppc_clock_tc;
@@ -61,4 +61,4 @@ static void t32mppc_clock_initialize(void)
   t32mppc_clock_initialize()
 
 /* Include shared source clock driver code */
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/riscv/riscv_generic/clock/clockdrv.c

@@ -128,4 +128,4 @@ CPU_Counter_ticks _CPU_Counter_difference(
 
 #define Clock_driver_support_shutdown_hardware() riscv_generic_clock_cleanup()
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

bsps/shared/dev/clock/clock-simidle.c

@@ -25,7 +25,7 @@ volatile bool clock_driver_enabled;
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "clockdrv_shell.h"
+#include "clockimpl.h"
 
 /*
  * If this is defined, then the BSP has defined a delay of some sort so

bsps/shared/dev/clock/clockimpl.h

@@ -36,7 +36,7 @@
  *
  */
 #if CLOCK_DRIVER_USE_FAST_IDLE && CLOCK_DRIVER_ISRS_PER_TICK
-#error "clockdrv_shell.h: Fast Idle PLUS n ISRs per tick is not supported"
+#error "Fast Idle PLUS n ISRs per tick is not supported"
 #endif
 
 /**

bsps/sparc/erc32/clock/ckinit.c

@@ -126,6 +126,6 @@ static void erc32_counter_initialize( uint32_t frequency )
     ); \
   } while (0)
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
 
 SPARC_COUNTER_DEFINITION;

bsps/sparc/leon2/clock/ckinit.c

@@ -99,6 +99,6 @@ extern int CLOCK_SPEED;
 
 #define Clock_driver_timecounter_tick() leon2_tc_tick()
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
 
 SPARC_COUNTER_DEFINITION;

bsps/sparc/leon3/clock/ckinit.c

@@ -275,6 +275,6 @@ static void leon3_clock_initialize(void)
 
 #define Clock_driver_timecounter_tick() leon3_tc_do_tick()
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
 
 #endif

bsps/sparc64/shared/clock/ckinit.c

@@ -118,5 +118,5 @@ static void Clock_driver_support_initialize_hardware(void)
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"
 

c/src/lib/libbsp/arm/atsam/Makefile.am

@@ -118,8 +118,8 @@ librtemsbsp_a_SOURCES += console/console.c
 librtemsbsp_a_SOURCES += console/debug-console.c
 
 # Clock
-librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
-librtemsbsp_a_SOURCES += clock/systick-freq.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/atsam/clock/systick-freq.c
 
 # Timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c

c/src/lib/libbsp/arm/beagle/clock.c

@@ -320,4 +320,4 @@ static void beagle_clock_cleanup(void)
 #define Clock_driver_support_shutdown_hardware() beagle_clock_cleanup()
 
 /* Include shared source clock driver code */
-#include "../../shared/clockdrv_shell.h"
+#include "../../shared/dev/clock/clockimpl.h"

c/src/lib/libbsp/arm/csb336/Makefile.am

@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/csb336/clock/clockdrv.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # console
 librtemsbsp_a_SOURCES += console/uart.c

c/src/lib/libbsp/arm/csb337/Makefile.am

@@ -37,7 +37,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 librtemsbsp_a_SOURCES += startup/pmc.c
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/csb337/clock/clock.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c

c/src/lib/libbsp/arm/edb7312/Makefile.am

@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounter
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 
 # clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/edb7312/clock/clockdrv.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c

c/src/lib/libbsp/arm/gdbarmsim/Makefile.am

@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounter
 librtemsbsp_a_SOURCES += ../../shared/console-polled.c
 librtemsbsp_a_SOURCES += console/console-io.c
 # clock
-librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 # timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 # start hooks

c/src/lib/libbsp/arm/gumstix/Makefile.am

@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES += startup/bspreset.c
 librtemsbsp_a_SOURCES += startup/memmap.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/gumstix/clock/clock.c
 librtemsbsp_a_SOURCES += timer/timer.c
 
 #console

c/src/lib/libbsp/arm/lm3s69xx/Makefile.am

@@ -60,7 +60,7 @@ librtemsbsp_a_SOURCES += console/console-config.c
 librtemsbsp_a_SOURCES += console/uart.c
 
 # Clock
-librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
 
 # Timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c

c/src/lib/libbsp/arm/lpc176x/Makefile.am

@@ -64,8 +64,8 @@ librtemsbsp_a_SOURCES += ../../shared/console-termios.c
 librtemsbsp_a_SOURCES += console/console-config.c
 
 # Clock
-librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-nxp-lpc.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
 
 # RTC
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c

c/src/lib/libbsp/arm/lpc24xx/Makefile.am

@@ -79,8 +79,8 @@ librtemsbsp_a_SOURCES += console/uart-probe-2.c
 librtemsbsp_a_SOURCES += console/uart-probe-3.c
 
 # Clock
-librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-nxp-lpc.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
 
 # RTC
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c

c/src/lib/libbsp/arm/lpc32xx/Makefile.am

@@ -65,7 +65,7 @@ librtemsbsp_a_SOURCES += console/console-config.c
 librtemsbsp_a_SOURCES += console/hsu.c
 
 # Clock
-librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-nxp-lpc.c
 
 # RTC
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c

c/src/lib/libbsp/arm/raspberrypi/Makefile.am

@@ -82,7 +82,7 @@ librtemsbsp_a_SOURCES += misc/mailbox.c
 librtemsbsp_a_SOURCES += misc/vc.c
 
 # clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/raspberrypi/clock/clockdrv.c
 
 # Timer
 librtemsbsp_a_SOURCES += misc/timer.c

c/src/lib/libbsp/arm/rtl22xx/Makefile.am

@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 librtemsbsp_a_SOURCES += timer/timer.c
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/rtl22xx/clock/clockdrv.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c

c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c

@@ -25,7 +25,7 @@
 
 static struct timecounter a9mpcore_tc;
 
-/* This is defined in clockdrv_shell.h */
+/* This is defined in dev/clock/clockimpl.h */
 void Clock_isr(rtems_irq_hdl_param arg);
 
 __attribute__ ((weak)) uint32_t a9mpcore_clock_periphclk(void)
@@ -209,4 +209,4 @@ static void a9mpcore_clock_cleanup(void)
   a9mpcore_clock_cleanup()
 
 /* Include shared source clock driver code */
-#include "../../shared/clockdrv_shell.h"
+#include "../../shared/dev/clock/clockimpl.h"

c/src/lib/libbsp/arm/shared/arm-generic-timer-clock-config.c

@@ -42,7 +42,7 @@ typedef struct {
 
 static arm_gt_clock_context arm_gt_clock_instance;
 
-/* This is defined in clockdrv_shell.h */
+/* This is defined in dev/clock/clockimpl.h */
 void Clock_isr(rtems_irq_hdl_param arg);
 
 static inline uint64_t arm_gt_clock_get_compare_value(void)
@@ -199,4 +199,4 @@ RTEMS_SYSINIT_ITEM(
   arm_gt_clock_handler_install()
 
 /* Include shared source clock driver code */
-#include "../../shared/clockdrv_shell.h"
+#include "../../shared/dev/clock/clockimpl.h"

c/src/lib/libbsp/arm/smdk2410/Makefile.am

@@ -28,8 +28,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-defa
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 librtemsbsp_a_SOURCES += timer/timer.c
-librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/smdk2410/clock/clockdrv.c
-librtemsbsp_a_SOURCES += clock/support.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/smdk2410/clock/support.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c

c/src/lib/libbsp/arm/stm32f4/Makefile.am

@@ -64,7 +64,7 @@ librtemsbsp_a_SOURCES += i2c/i2c.c
 librtemsbsp_a_SOURCES += i2c/i2c-config.c
 
 # Clock
-librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
 
 # Timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c

c/src/lib/libbsp/arm/tms570/Makefile.am

@@ -67,7 +67,7 @@ librtemsbsp_a_SOURCES += console/printk-support.c
 librtemsbsp_a_SOURCES += console/tms570-sci.c
 
 # Clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/tms570/clock/clock.c
 
 # RTC
 

c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am

@@ -42,7 +42,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 
 # clock
-librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 
 # Timer
 librtemsbsp_a_SOURCES += timer/timer.c

c/src/lib/libbsp/i386/pc386/Makefile.am

@@ -48,8 +48,8 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/i386/pc386/clock/ckinit.c
-librtemsbsp_a_SOURCES += clock/todcfg.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/i386/pc386/clock/todcfg.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
 
 if RTEMS_VGA

c/src/lib/libbsp/lm32/lm32_evr/Makefile.am

@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../shared/startup/bspreset.c
 # clock
-librtemsbsp_a_SOURCES += ../shared/clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/lm32/shared/clock/ckinit.c
 # console
 librtemsbsp_a_SOURCES += ../shared/console/console.c
 librtemsbsp_a_SOURCES += ../shared/console/uart.c

c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c

@@ -49,4 +49,4 @@ static void Clock_driver_support_initialize_hardware(void)
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
-#include "../../../shared/clockdrv_shell.h"
+#include "../../../shared/dev/clock/clockimpl.h"

c/src/lib/libbsp/m32c/m32cbsp/Makefile.am

@@ -23,7 +23,7 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += startup/crtn.S
-librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 librtemsbsp_a_SOURCES += ../../shared/console-polled.c
 librtemsbsp_a_SOURCES += console/console-io.c
 librtemsbsp_a_SOURCES += console/syscalls.S

c/src/lib/libbsp/m68k/av5282/Makefile.am

@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/av5282/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer

c/src/lib/libbsp/m68k/gen68340/Makefile.am

@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += startup/dumpanic.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/gen68340/clock/ckinit.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 librtemsbsp_a_SOURCES += console/m340uart.c

c/src/lib/libbsp/m68k/gen68360/Makefile.am

@@ -30,7 +30,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/gen68360/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c

c/src/lib/libbsp/m68k/genmcf548x/Makefile.am

@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/genmcf548x/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer

c/src/lib/libbsp/m68k/mcf52235/Makefile.am

@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf52235/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # debugio

c/src/lib/libbsp/m68k/mcf5225x/Makefile.am

@@ -23,7 +23,7 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5225x/clock/clock.c
 librtemsbsp_a_SOURCES += console/console.c
 librtemsbsp_a_SOURCES += console/debugio.c
 librtemsbsp_a_SOURCES += timer/timer.c

c/src/lib/libbsp/m68k/mcf5235/Makefile.am

@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += startup/copyvectors.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5235/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer

c/src/lib/libbsp/m68k/mcf5329/Makefile.am

@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5329/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer

c/src/lib/libbsp/m68k/mrm332/Makefile.am

@@ -27,7 +27,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mrm332/clock/ckinit.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 librtemsbsp_a_SOURCES += console/sci.c

c/src/lib/libbsp/m68k/mvme147/Makefile.am

@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mvme147/clock/ckinit.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c

c/src/lib/libbsp/m68k/mvme147s/Makefile.am

@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
-librtemsbsp_a_SOURCES += ../mvme147/clock/ckinit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147/clock/ckinit.c
 # console
 librtemsbsp_a_SOURCES += ../mvme147/console/console.c
 librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c

c/src/lib/libbsp/m68k/mvme162/Makefile.am

@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
-librtemsbsp_a_SOURCES += clock/ckinit.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mvme162/clock/ckinit.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer