From 90013f59bd9abad8220e0f91c5807daa06f14971 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 13 Apr 2018 08:57:30 +0200 Subject: bsps: Move tod.c to bsps and rename 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/lpc176x/Makefile.am | 2 +- c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 2 +- c/src/lib/libbsp/arm/lpc32xx/Makefile.am | 2 +- c/src/lib/libbsp/i386/pc386/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/beatnik/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 2 +- .../libbsp/powerpc/motorola_powerpc/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/mvme3100/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/qoriq/Makefile.am | 2 +- c/src/lib/libbsp/shared/tod.c | 287 --------------------- 15 files changed, 14 insertions(+), 301 deletions(-) delete mode 100644 c/src/lib/libbsp/shared/tod.c (limited to 'c/src/lib/libbsp') 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 8da303a4f3..de805346ea 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am @@ -118,7 +118,7 @@ librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-clock-config.c librtemsbsp_a_SOURCES += i2c/i2cdrv.c librtemsbsp_a_SOURCES += i2c/i2cdrv-config.c # RTC -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c librtemsbsp_a_SOURCES += rtc/rtc.c # Cache diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am index 71a6853f6f..930aa7b8c7 100644 --- a/c/src/lib/libbsp/arm/atsam/Makefile.am +++ b/c/src/lib/libbsp/arm/atsam/Makefile.am @@ -143,7 +143,7 @@ librtemsbsp_a_SOURCES += spi/atsam_spi_init.c librtemsbsp_a_SOURCES += spi/sc16is752.c # RTC -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c librtemsbsp_a_SOURCES += rtc/rtc-config.c # Helper functions diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am index 4e14448864..b906b41813 100644 --- a/c/src/lib/libbsp/arm/beagle/Makefile.am +++ b/c/src/lib/libbsp/arm/beagle/Makefile.am @@ -79,7 +79,7 @@ librtemsbsp_a_SOURCES += pwm/pwm.c #RTC librtemsbsp_a_SOURCES += rtc.c -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c # Clock librtemsbsp_a_SOURCES += clock.c diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am index db565ed077..61d788a3fa 100644 --- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am @@ -69,7 +69,7 @@ librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c # RTC -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c librtemsbsp_a_SOURCES += rtc/rtc-config.c # GPIO diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index ccc503e490..81e2b0ddfb 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -84,7 +84,7 @@ librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c # RTC -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c librtemsbsp_a_SOURCES += rtc/rtc-config.c # Misc diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am index 00af135b9c..388df7a0a1 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am @@ -69,7 +69,7 @@ librtemsbsp_a_SOURCES += console/hsu.c librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c # RTC -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c librtemsbsp_a_SOURCES += rtc/rtc-config.c # Misc diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index af05dd1378..aca8ba6fde 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -50,7 +50,7 @@ librtemsbsp_a_SOURCES = # clock librtemsbsp_a_SOURCES += clock/ckinit.c librtemsbsp_a_SOURCES += clock/todcfg.c -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c if RTEMS_VGA librtemsbsp_a_SOURCES += console/inch.c diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index a80cd85627..c364a87990 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -41,7 +41,7 @@ librtemsbsp_a_SOURCES += i2c/i2cdrv.c # tod librtemsbsp_a_SOURCES += tod/ds1307.c librtemsbsp_a_SOURCES += tod/todcfg.c -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c # nvram librtemsbsp_a_SOURCES += nvram/nvram.c diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am index 25647c0ff6..c9eec22263 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am +++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am @@ -96,7 +96,7 @@ librtemsbsp_a_SOURCES += network/support/early_link_status.c endif # tod -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c librtemsbsp_a_SOURCES += tod/todcfg.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am index 1beb67ccff..24e58ed9af 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am @@ -84,7 +84,7 @@ librtemsbsp_a_SOURCES += slicetimer/slicetimer.c # tod librtemsbsp_a_SOURCES += tod/todcfg.c librtemsbsp_a_SOURCES += tod/pcf8563.c -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c # startup librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index acdd53f092..a1de84e290 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -49,7 +49,7 @@ librtemsbsp_a_SOURCES += startup/bspreset.c # tod -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c librtemsbsp_a_SOURCES += ../shared/tod/todcfg.c # pclock librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am index ed47138c1a..e579f170c3 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am @@ -47,7 +47,7 @@ librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c librtemsbsp_a_SOURCES += ../../shared/bspclean.c librtemsbsp_a_SOURCES += ../../shared/bspreset.c # tod -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c librtemsbsp_a_SOURCES += tod/todcfg.c # pclock librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am index 72972a8d9e..122122defa 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am @@ -44,7 +44,7 @@ librtemsbsp_a_SOURCES += irq/irq_init.c librtemsbsp_a_SOURCES += irq/BSP_irq.c # tod -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c librtemsbsp_a_SOURCES += tod/todcfg.c # vectors diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am index 6a0aa116a6..0b190659a7 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am @@ -73,7 +73,7 @@ librtemsbsp_a_SOURCES += console/uart-bridge-slave.c librtemsbsp_a_SOURCES += console/console-config.c # RTC -librtemsbsp_a_SOURCES += ../../shared/tod.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c librtemsbsp_a_SOURCES += rtc/rtc-config.c # MPCI diff --git a/c/src/lib/libbsp/shared/tod.c b/c/src/lib/libbsp/shared/tod.c deleted file mode 100644 index 560d2ea33f..0000000000 --- a/c/src/lib/libbsp/shared/tod.c +++ /dev/null @@ -1,287 +0,0 @@ -/* - * Real Time Clock Driver Wrapper for Libchip - */ - -/* - * 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 -#include -#include - -#include - -/* - * Configuration Information - */ -static rtems_device_minor_number RTC_Minor = UINT32_MAX; - -static bool RTC_Is_present(void) -{ - return RTC_Minor != UINT32_MAX; -} - -/* - * rtc_initialize - * - * Initialize the RTC driver - */ -rtems_device_driver rtc_initialize( - rtems_device_major_number major, - rtems_device_minor_number minor_arg, - void *arg -) -{ - rtems_device_minor_number minor; - rtems_status_code status; - - for (minor=0; minor < RTC_Count ; minor++) { - /* - * First perform the configuration dependent probe, then the - * device dependent probe - */ - - if (RTC_Table[minor].deviceProbe && RTC_Table[minor].deviceProbe(minor)) { - /* - * Use this device as the primary RTC - */ - RTC_Minor = minor; - break; - } - } - - if ( !RTC_Is_present() ) { - /* - * Failed to find an RTC -- this is not a fatal error. - */ - - return RTEMS_INVALID_NUMBER; - } - - /* - * Register and initialize the primary RTC's - */ - status = rtems_io_register_name( RTC_DEVICE_NAME, major, RTC_Minor ); - if (status != RTEMS_SUCCESSFUL) { - rtems_fatal_error_occurred(status); - } - - RTC_Table[minor].pDeviceFns->deviceInitialize( RTC_Minor ); - - /* - * Now initialize any secondary RTC's - */ - for ( minor++ ; minordeviceInitialize(minor); - - } - } - - setRealTimeToRTEMS(); - return RTEMS_SUCCESSFUL; -} - -rtems_device_driver rtc_read( - rtems_device_major_number major, - rtems_device_minor_number minor, - void *arg -) -{ - int rv = 0; - rtems_libio_rw_args_t *rw = arg; - rtems_time_of_day *tod = (rtems_time_of_day *) rw->buffer; - - rw->offset = 0; - rw->bytes_moved = 0; - - if (!RTC_Is_present()) { - return RTEMS_NOT_CONFIGURED; - } - - if (rw->count != sizeof( rtems_time_of_day)) { - return RTEMS_INVALID_SIZE; - } - - rv = RTC_Table [RTC_Minor].pDeviceFns->deviceGetTime( - RTC_Minor, - tod - ); - if (rv != 0) { - return RTEMS_IO_ERROR; - } - - rw->bytes_moved = rw->count; - - return RTEMS_SUCCESSFUL; -} - -rtems_device_driver rtc_write( - rtems_device_major_number major, - rtems_device_minor_number minor, - void *arg -) -{ - int rv = 0; - rtems_libio_rw_args_t *rw = arg; - const rtems_time_of_day *tod = (const rtems_time_of_day *) rw->buffer; - - rw->offset = 0; - rw->bytes_moved = 0; - - if (!RTC_Is_present()) { - return RTEMS_NOT_CONFIGURED; - } - - if (rw->count != sizeof( rtems_time_of_day)) { - return RTEMS_INVALID_SIZE; - } - - rv = RTC_Table [RTC_Minor].pDeviceFns->deviceSetTime( - RTC_Minor, - tod - ); - if (rv != 0) { - return RTEMS_IO_ERROR; - } - - rw->bytes_moved = rw->count; - - return RTEMS_SUCCESSFUL; -} - -rtems_device_driver rtc_open( - rtems_device_major_number major, - rtems_device_minor_number minor, - void *arg -) -{ - return RTEMS_SUCCESSFUL; -} - -rtems_device_driver rtc_close( - rtems_device_major_number major, - rtems_device_minor_number minor, - void *arg -) -{ - return RTEMS_SUCCESSFUL; -} - -rtems_device_driver rtc_control( - rtems_device_major_number major, - rtems_device_minor_number minor, - void *arg -) -{ - return RTEMS_NOT_IMPLEMENTED; -} - -/* - * This routine copies the time from the real time clock to RTEMS - */ -void setRealTimeToRTEMS() -{ - rtems_time_of_day rtc_tod; - - if (!RTC_Is_present()) - return; - - RTC_Table[RTC_Minor].pDeviceFns->deviceGetTime(RTC_Minor, &rtc_tod); - rtems_clock_set( &rtc_tod ); -} - -/* - * setRealTimeFromRTEMS - * - * This routine copies the time from RTEMS to the real time clock - */ -void setRealTimeFromRTEMS(void) -{ - rtems_time_of_day rtems_tod; - - if (!RTC_Is_present()) - return; - - rtems_clock_get_tod( &rtems_tod ); - RTC_Table[RTC_Minor].pDeviceFns->deviceSetTime(RTC_Minor, &rtems_tod); -} - -/* - * getRealTime - * - * This routine reads the current time from the RTC. - */ -void getRealTime( - rtems_time_of_day *tod -) -{ - if (!RTC_Is_present()) - return; - - RTC_Table[RTC_Minor].pDeviceFns->deviceGetTime(RTC_Minor, tod); -} - -/* - * setRealTime - * - * This routine sets the RTC. - */ -int setRealTime( - const rtems_time_of_day *tod -) -{ - if (!RTC_Is_present()) - return -1; - - if ( !_TOD_Validate(tod) ) - return -1; - - RTC_Table[RTC_Minor].pDeviceFns->deviceSetTime(RTC_Minor, tod); - return 0; -} - -/* - * checkRealTime - * - * This routine reads the returns the variance betweent the real time and - * RTEMS time. - */ -int checkRealTime(void) -{ - rtems_time_of_day rtems_tod; - rtems_time_of_day rtc_tod; - uint32_t rtems_time; - uint32_t rtc_time; - - if (!RTC_Is_present()) - return -1; - - rtems_clock_get_tod( &rtems_tod ); - RTC_Table[RTC_Minor].pDeviceFns->deviceGetTime(RTC_Minor, &rtc_tod); - - rtems_time = _TOD_To_seconds( &rtems_tod ); - rtc_time = _TOD_To_seconds( &rtc_tod ); - - return rtems_time - rtc_time; -} -- cgit v1.2.3