Index: uspace/drv/platform/icp/Makefile =================================================================== --- uspace/drv/platform/icp/Makefile (revision 312e5ff64a7e4151a05801b65b38da2bbe914da0) +++ uspace/drv/platform/icp/Makefile (revision 312e5ff64a7e4151a05801b65b38da2bbe914da0) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2014 Jiri Svoboda +# 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 = icp + +SOURCES = \ + icp.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/platform/icp/icp.c =================================================================== --- uspace/drv/platform/icp/icp.c (revision 312e5ff64a7e4151a05801b65b38da2bbe914da0) +++ uspace/drv/platform/icp/icp.c (revision 312e5ff64a7e4151a05801b65b38da2bbe914da0) @@ -0,0 +1,224 @@ +/* + * Copyright (c) 2014 Jiri Svoboda + * 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 icp IntegratorCP platform driver. + * @brief HelenOS IntegratorCP platform driver. + * @{ + */ + +/** @file + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#define NAME "icp" + +enum { + icp_kbd_base = 0x18000000, + icp_kbd_irq = 3 +}; + +typedef struct icp_fun { + hw_resource_list_t hw_resources; +} icp_fun_t; + +static int icp_dev_add(ddf_dev_t *dev); + +static driver_ops_t icp_ops = { + .dev_add = &icp_dev_add +}; + +static driver_t icp_driver = { + .name = NAME, + .driver_ops = &icp_ops +}; + +static hw_resource_t icp_pl050_res[] = { + { + .type = MEM_RANGE, + .res.mem_range = { + .address = icp_kbd_base, + .size = 9, + .relative = false, + .endianness = LITTLE_ENDIAN + } + }, + { + .type = INTERRUPT, + .res.interrupt = { + .irq = icp_kbd_irq + } + } +}; + +static pio_window_t icp_pio_window = { + .mem = { + .base = 0, + .size = -1 + } +}; + +static icp_fun_t icp_pl050_fun_proto = { + .hw_resources = { + sizeof(icp_pl050_res) / sizeof(icp_pl050_res[0]), + icp_pl050_res + }, +}; + +/** Obtain function soft-state from DDF function node */ +static icp_fun_t *icp_fun(ddf_fun_t *fnode) +{ + return ddf_fun_data_get(fnode); +} + +static hw_resource_list_t *icp_get_resources(ddf_fun_t *fnode) +{ + icp_fun_t *fun = icp_fun(fnode); + + assert(fun != NULL); + return &fun->hw_resources; +} + +static bool icp_enable_interrupt(ddf_fun_t *fun) +{ + /* TODO */ + return false; +} + +static pio_window_t *icp_get_pio_window(ddf_fun_t *fnode) +{ + return &icp_pio_window; +} + +static hw_res_ops_t icp_hw_res_ops = { + .get_resource_list = &icp_get_resources, + .enable_interrupt = &icp_enable_interrupt, +}; + +static pio_window_ops_t icp_pio_window_ops = { + .get_pio_window = &icp_get_pio_window +}; + +static ddf_dev_ops_t icp_fun_ops = { + .interfaces = { + [HW_RES_DEV_IFACE] = &icp_hw_res_ops, + [PIO_WINDOW_DEV_IFACE] = &icp_pio_window_ops + } +}; + +static int icp_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id, + icp_fun_t *fun_proto) +{ + ddf_msg(LVL_NOTE, "Adding function '%s'.", name); + + ddf_fun_t *fnode = NULL; + int rc; + + /* Create new device. */ + fnode = ddf_fun_create(dev, fun_inner, name); + if (fnode == NULL) { + ddf_msg(LVL_ERROR, "Error creating function '%s'", name); + rc = ENOMEM; + goto error; + } + + icp_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(icp_fun_t)); + *fun = *fun_proto; + + /* Add match ID */ + rc = ddf_fun_add_match_id(fnode, str_match_id, 100); + if (rc != EOK) { + ddf_msg(LVL_ERROR, "Error adding match ID"); + goto error; + } + + /* Set provided operations to the device. */ + ddf_fun_set_ops(fnode, &icp_fun_ops); + + /* Register function. */ + if (ddf_fun_bind(fnode) != EOK) { + ddf_msg(LVL_ERROR, "Failed binding function %s.", name); + goto error; + } + + return EOK; + +error: + if (fnode != NULL) + ddf_fun_destroy(fnode); + + return rc; +} + +static int icp_add_functions(ddf_dev_t *dev) +{ + return icp_add_fun(dev, "pl050", "arm/pl050", &icp_pl050_fun_proto); +} + +/** Add device. */ +static int icp_dev_add(ddf_dev_t *dev) +{ + ddf_msg(LVL_NOTE, "icp_dev_add, device handle = %d", + (int)ddf_dev_get_handle(dev)); + + /* Register functions. */ + if (icp_add_functions(dev)) { + ddf_msg(LVL_ERROR, "Failed to add functions for ICP platform."); + } + + return EOK; +} + +int main(int argc, char *argv[]) +{ + int rc; + + printf(NAME ": HelenOS IntegratorCP platform driver\n"); + + rc = ddf_log_init(NAME); + if (rc != EOK) { + printf(NAME ": Failed initializing logging service"); + return 1; + } + + return ddf_driver_main(&icp_driver); +} + +/** + * @} + */ Index: uspace/drv/platform/icp/icp.ma =================================================================== --- uspace/drv/platform/icp/icp.ma (revision 312e5ff64a7e4151a05801b65b38da2bbe914da0) +++ uspace/drv/platform/icp/icp.ma (revision 312e5ff64a7e4151a05801b65b38da2bbe914da0) @@ -0,0 +1,1 @@ +10 platform/integratorcp