Index: boot/arch/ppc32/Makefile.inc =================================================================== --- boot/arch/ppc32/Makefile.inc (revision 1850bafea904f0a1d9e87f16097f325f5c380931) +++ boot/arch/ppc32/Makefile.inc (revision 73d288cb69683e8a6c2dbf25164bb31d6f7edab8) @@ -46,4 +46,7 @@ $(USPACE_PATH)/srv/hid/adb_mouse/adb_ms +RD_DRVS += \ + rootmac + SOURCES = \ arch/$(BARCH)/src/asm.S \ Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 1850bafea904f0a1d9e87f16097f325f5c380931) +++ uspace/Makefile (revision 73d288cb69683e8a6c2dbf25164bb31d6f7edab8) @@ -148,5 +148,7 @@ ifeq ($(UARCH),ppc32) - DIRS += srv/hw/bus/cuda_adb + DIRS += \ + drv/rootmac \ + srv/hw/bus/cuda_adb endif Index: uspace/drv/rootmac/Makefile =================================================================== --- uspace/drv/rootmac/Makefile (revision 73d288cb69683e8a6c2dbf25164bb31d6f7edab8) +++ uspace/drv/rootmac/Makefile (revision 73d288cb69683e8a6c2dbf25164bb31d6f7edab8) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2010 Lenka Trochtova +# 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 = rootmac + +SOURCES = \ + rootmac.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/rootmac/rootmac.c =================================================================== --- uspace/drv/rootmac/rootmac.c (revision 73d288cb69683e8a6c2dbf25164bb31d6f7edab8) +++ uspace/drv/rootmac/rootmac.c (revision 73d288cb69683e8a6c2dbf25164bb31d6f7edab8) @@ -0,0 +1,177 @@ +/* + * Copyright (c) 2011 Martin Decky + * 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 root_mac Mac platform driver. + * @brief HelenOS Mac platform driver. + * @{ + */ + +/** @file + */ + +#include +#include +#include +#include +#include + +#define NAME "rootmac" + +/** Obtain function soft-state from DDF function node */ +#define ROOTMAC_FUN(fnode) \ + ((rootmac_fun_t *) (fnode)->driver_data) + +typedef struct { + hw_resource_list_t hw_resources; +} rootmac_fun_t; + +static hw_resource_t pci_conf_regs = { + .type = IO_RANGE, + .res.io_range = { + .address = 0xCF8, + .size = 8, + .endianness = LITTLE_ENDIAN + } +}; + +static rootmac_fun_t pci_data = { + .hw_resources = { + 1, + &pci_conf_regs + } +}; + +static ddf_dev_ops_t rootmac_fun_ops; + +static bool rootmac_add_fun(ddf_dev_t *dev, const char *name, + const char *str_match_id, rootmac_fun_t *fun) +{ + ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name); + + ddf_fun_t *fnode = NULL; + match_id_t *match_id = NULL; + + /* Create new device. */ + fnode = ddf_fun_create(dev, fun_inner, name); + if (fnode == NULL) + goto failure; + + fnode->driver_data = fun; + + /* Initialize match id list */ + match_id = create_match_id(); + if (match_id == NULL) + goto failure; + + match_id->id = str_match_id; + match_id->score = 100; + add_match_id(&fnode->match_ids, match_id); + + /* Set provided operations to the device. */ + fnode->ops = &rootmac_fun_ops; + + /* Register function. */ + if (ddf_fun_bind(fnode) != EOK) { + ddf_msg(LVL_ERROR, "Failed binding function %s.", name); + goto failure; + } + + return true; + +failure: + if (match_id != NULL) + match_id->id = NULL; + + if (fnode != NULL) + ddf_fun_destroy(fnode); + + ddf_msg(LVL_ERROR, "Failed adding function '%s'.", name); + + return false; +} + +/** Get the root device. + * + * @param dev Device which is root of the whole device tree + * (both of HW and pseudo devices). + * + * @return Zero on success, negative error number otherwise. + * + */ +static int rootmac_add_device(ddf_dev_t *dev) +{ + /* Register functions */ + if (!rootmac_add_fun(dev, "pci0", "pangea_pci", &pci_data)) + ddf_msg(LVL_ERROR, "Failed to add functions for Mac platform."); + + return EOK; +} + +/** The root device driver's standard operations. */ +static driver_ops_t rootmac_ops = { + .add_device = &rootmac_add_device +}; + +/** The root device driver structure. */ +static driver_t rootmac_driver = { + .name = NAME, + .driver_ops = &rootmac_ops +}; + +static hw_resource_list_t *rootmac_get_resources(ddf_fun_t *fnode) +{ + rootmac_fun_t *fun = ROOTMAC_FUN(fnode); + assert(fun != NULL); + + return &fun->hw_resources; +} + +static bool rootmac_enable_interrupt(ddf_fun_t *fun) +{ + /* TODO */ + + return false; +} + +static hw_res_ops_t fun_hw_res_ops = { + &rootmac_get_resources, + &rootmac_enable_interrupt +}; + +int main(int argc, char *argv[]) +{ + printf("%s: HelenOS Mac platform driver\n", NAME); + ddf_log_init(NAME, LVL_ERROR); + rootmac_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops; + return ddf_driver_main(&rootmac_driver); +} + +/** + * @} + */ Index: uspace/drv/rootmac/rootmac.ma =================================================================== --- uspace/drv/rootmac/rootmac.ma (revision 73d288cb69683e8a6c2dbf25164bb31d6f7edab8) +++ uspace/drv/rootmac/rootmac.ma (revision 73d288cb69683e8a6c2dbf25164bb31d6f7edab8) @@ -0,0 +1,1 @@ +10 platform/mac