Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision b3db669a7999a4c7352c724f8986ac18c85ea5d6) +++ uspace/Makefile (revision 5ef138471e7f20e66290240c927999dddd3cd786) @@ -126,5 +126,4 @@ drv/nic/e1k \ drv/nic/rtl8139 \ - drv/time ifeq ($(CONFIG_PCC),y) @@ -150,4 +149,5 @@ drv/bus/isa \ drv/char/ns8250 \ + drv/time/cmos-rtc \ srv/hw/irc/apic \ srv/hw/irc/i8259 @@ -160,4 +160,5 @@ drv/bus/isa \ drv/char/ns8250 \ + drv/time/cmos-rtc \ srv/hw/irc/apic \ srv/hw/irc/i8259 Index: uspace/drv/time/cmos-rtc/Makefile =================================================================== --- uspace/drv/time/cmos-rtc/Makefile (revision 5ef138471e7f20e66290240c927999dddd3cd786) +++ uspace/drv/time/cmos-rtc/Makefile (revision 5ef138471e7f20e66290240c927999dddd3cd786) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2012 Maurizio Lombardi +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../../.. +LIBS = $(LIBDRV_PREFIX)/libdrv.a +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +BINARY = cmos-rtc + +SOURCES = \ + cmos-rtc.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/time/cmos-rtc/cmos-rtc.c =================================================================== --- uspace/drv/time/cmos-rtc/cmos-rtc.c (revision 5ef138471e7f20e66290240c927999dddd3cd786) +++ uspace/drv/time/cmos-rtc/cmos-rtc.c (revision 5ef138471e7f20e66290240c927999dddd3cd786) @@ -0,0 +1,208 @@ +/* + * Copyright (c) 2012 Maurizio Lombardi + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @defgroup CMOS RTC driver. + * @brief HelenOS RTC driver. + * @{ + */ + +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define NAME "cmos-rtc" + +typedef struct rtc { + /** DDF device node */ + ddf_dev_t *dev; + /** DDF function node */ + ddf_fun_t *fun; + /** The fibril mutex for synchronizing the access to the device */ + fibril_mutex_t mutex; +} rtc_t; + + +static int +rtc_time_get(ddf_fun_t *fun, time_t *t); + +static int +rtc_time_set(ddf_fun_t *fun, time_t t); + +static int +rtc_dev_add(ddf_dev_t *dev); + +static int +rtc_dev_initialize(rtc_t *rtc); + + +static ddf_dev_ops_t rtc_dev_ops; + +/** The RTC device driver's standard operations */ +static driver_ops_t rtc_ops = { + .dev_add = rtc_dev_add, + .dev_remove = NULL, +}; + +/** The RTC device driver structure */ +static driver_t rtc_driver = { + .name = NAME, + .driver_ops = &rtc_ops, +}; + +/** Clock interface */ +static clock_dev_ops_t rtc_clock_dev_ops = { + .time_get = rtc_time_get, + .time_set = rtc_time_set, +}; + +/** Initialize the RTC driver */ +static void +rtc_init(void) +{ + ddf_log_init(NAME, LVL_ERROR); + + rtc_dev_ops.open = NULL; + rtc_dev_ops.close = NULL; + + rtc_dev_ops.interfaces[CLOCK_DEV_IFACE] = &rtc_clock_dev_ops; + rtc_dev_ops.default_handler = NULL; +} + +/** Initialize the RTC device + * + * @param rtc Pointer to the RTC device + * + * @return EOK on success or a negative error code + */ +static int +rtc_dev_initialize(rtc_t *rtc) +{ + int rc; + + ddf_msg(LVL_DEBUG, "rtc_dev_initialize %s", rtc->dev->name); + + hw_resource_list_t hw_resources; + memset(&hw_resources, 0, sizeof(hw_resource_list_t)); + + /* Connect to the parent's driver */ + + rtc->dev->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE, + rtc->dev->handle, IPC_FLAG_BLOCKING); + if (!rtc->dev->parent_sess) { + ddf_msg(LVL_ERROR, "Failed to connect to parent driver\ + of device %s.", rtc->dev->name); + return ENOENT; + } + + /* Get the HW resources */ + rc = hw_res_get_resource_list(rtc->dev->parent_sess, &hw_resources); + if (rc != EOK) { + ddf_msg(LVL_ERROR, "Failed to get HW resources\ + for device %s", rtc->dev->name); + return rc; + } + + return EOK; +} + +/** Read the current time from the CMOS + * + * @param fun The RTC function + * @param t Pointer to the time variable + * + * @return EOK on success or a negative error code + */ +static int +rtc_time_get(ddf_fun_t *fun, time_t *t) +{ + return EOK; +} + +/** Set the time in the RTC + * + * @param fun The RTC function + * @param t The time value to set + * + * @return EOK or a negative error code + */ +static int +rtc_time_set(ddf_fun_t *fun, time_t t) +{ + return EOK; +} + +/** The dev_add callback of the rtc driver + * + * @param dev The RTC device + * + * @return EOK on success or a negative error code + */ +static int +rtc_dev_add(ddf_dev_t *dev) +{ + rtc_t *rtc; + int rc; + + ddf_msg(LVL_DEBUG, "rtc_dev_add %s (handle = %d)", + dev->name, (int) dev->handle); + + rtc = ddf_dev_data_alloc(dev, sizeof(rtc_t)); + if (!rtc) + return ENOMEM; + + rtc->dev = dev; + fibril_mutex_initialize(&rtc->mutex); + + rc = rtc_dev_initialize(rtc); + if (rc != EOK) + return rc; + + return rc; +} + +int +main(int argc, char **argv) +{ + printf(NAME ": HelenOS RTC driver\n"); + rtc_init(); + return ddf_driver_main(&rtc_driver); +} + +/** + * @} + */ Index: uspace/drv/time/cmos-rtc/cmos-rtc.ma =================================================================== --- uspace/drv/time/cmos-rtc/cmos-rtc.ma (revision 5ef138471e7f20e66290240c927999dddd3cd786) +++ uspace/drv/time/cmos-rtc/cmos-rtc.ma (revision 5ef138471e7f20e66290240c927999dddd3cd786) @@ -0,0 +1,1 @@ +100 isa/cmos-rtc Index: uspace/drv/time/rtc.c =================================================================== --- uspace/drv/time/rtc.c (revision b3db669a7999a4c7352c724f8986ac18c85ea5d6) +++ (revision ) @@ -1,208 +1,0 @@ -/* - * Copyright (c) 2012 Maurizio Lombardi - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @defgroup CMOS RTC driver. - * @brief HelenOS RTC driver. - * @{ - */ - -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define NAME "RTC" - -typedef struct rtc { - /** DDF device node */ - ddf_dev_t *dev; - /** DDF function node */ - ddf_fun_t *fun; - /** The fibril mutex for synchronizing the access to the device */ - fibril_mutex_t mutex; -} rtc_t; - - -static int -rtc_time_get(ddf_fun_t *fun, time_t *t); - -static int -rtc_time_set(ddf_fun_t *fun, time_t t); - -static int -rtc_dev_add(ddf_dev_t *dev); - -static int -rtc_dev_initialize(rtc_t *rtc); - - -static ddf_dev_ops_t rtc_dev_ops; - -/** The RTC device driver's standard operations */ -static driver_ops_t rtc_ops = { - .dev_add = rtc_dev_add, - .dev_remove = NULL, -}; - -/** The RTC device driver structure */ -static driver_t rtc_driver = { - .name = NAME, - .driver_ops = &rtc_ops, -}; - -/** Clock interface */ -static clock_dev_ops_t rtc_clock_dev_ops = { - .time_get = rtc_time_get, - .time_set = rtc_time_set, -}; - -/** Initialize the RTC driver */ -static void -rtc_init(void) -{ - ddf_log_init(NAME, LVL_ERROR); - - rtc_dev_ops.open = NULL; - rtc_dev_ops.close = NULL; - - rtc_dev_ops.interfaces[CLOCK_DEV_IFACE] = &rtc_clock_dev_ops; - rtc_dev_ops.default_handler = NULL; -} - -/** Initialize the RTC device - * - * @param rtc Pointer to the RTC device - * - * @return EOK on success or a negative error code - */ -static int -rtc_dev_initialize(rtc_t *rtc) -{ - int rc; - - ddf_msg(LVL_DEBUG, "rtc_dev_initialize %s", rtc->dev->name); - - hw_resource_list_t hw_resources; - memset(&hw_resources, 0, sizeof(hw_resource_list_t)); - - /* Connect to the parent's driver */ - - rtc->dev->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE, - rtc->dev->handle, IPC_FLAG_BLOCKING); - if (!rtc->dev->parent_sess) { - ddf_msg(LVL_ERROR, "Failed to connect to parent driver\ - of device %s.", rtc->dev->name); - return ENOENT; - } - - /* Get the HW resources */ - rc = hw_res_get_resource_list(rtc->dev->parent_sess, &hw_resources); - if (rc != EOK) { - ddf_msg(LVL_ERROR, "Failed to get HW resources\ - for device %s", rtc->dev->name); - return rc; - } - - return EOK; -} - -/** Read the current time from the CMOS - * - * @param fun The RTC function - * @param t Pointer to the time variable - * - * @return EOK on success or a negative error code - */ -static int -rtc_time_get(ddf_fun_t *fun, time_t *t) -{ - return EOK; -} - -/** Set the time in the RTC - * - * @param fun The RTC function - * @param t The time value to set - * - * @return EOK or a negative error code - */ -static int -rtc_time_set(ddf_fun_t *fun, time_t t) -{ - return EOK; -} - -/** The dev_add callback of the rtc driver - * - * @param dev The RTC device - * - * @return EOK on success or a negative error code - */ -static int -rtc_dev_add(ddf_dev_t *dev) -{ - rtc_t *rtc; - int rc; - - ddf_msg(LVL_DEBUG, "rtc_dev_add %s (handle = %d)", - dev->name, (int) dev->handle); - - rtc = ddf_dev_data_alloc(dev, sizeof(rtc_t)); - if (!rtc) - return ENOMEM; - - rtc->dev = dev; - fibril_mutex_initialize(&rtc->mutex); - - rc = rtc_dev_initialize(rtc); - if (rc != EOK) - return rc; - - return rc; -} - -int -main(int argc, char **argv) -{ - printf(NAME ": HelenOS RTC driver\n"); - rtc_init(); - return ddf_driver_main(&rtc_driver); -} - -/** - * @} - */