Index: boot/arch/amd64/Makefile.inc =================================================================== --- boot/arch/amd64/Makefile.inc (revision 6f9e7feab0fd4bec18b0d862a2383558ef34a61f) +++ boot/arch/amd64/Makefile.inc (revision 178673c97db32d4d4e1c8769b1b5991de3e3640d) @@ -37,5 +37,5 @@ RD_DRVS += \ - rootia32 \ + rootpc \ pciintel \ isa \ Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 6f9e7feab0fd4bec18b0d862a2383558ef34a61f) +++ uspace/Makefile (revision 178673c97db32d4d4e1c8769b1b5991de3e3640d) @@ -110,8 +110,12 @@ ifeq ($(UARCH),amd64) + DIRS += drv/rootpc + DIRS += drv/pciintel + DIRS += drv/isa + DIRS += drv/ns8250 endif ifeq ($(UARCH),ia32) - DIRS += drv/rootia32 + DIRS += drv/rootpc DIRS += drv/pciintel DIRS += drv/isa Index: uspace/drv/ns8250/ns8250.c =================================================================== --- uspace/drv/ns8250/ns8250.c (revision 6f9e7feab0fd4bec18b0d862a2383558ef34a61f) +++ uspace/drv/ns8250/ns8250.c (revision 178673c97db32d4d4e1c8769b1b5991de3e3640d) @@ -274,5 +274,5 @@ /* Gain control over port's registers. */ - if (pio_enable((void *) data->io_addr, REG_COUNT, + if (pio_enable((void *)(uintptr_t) data->io_addr, REG_COUNT, (void **) &data->port)) { printf(NAME ": error - cannot gain the port %lx for device " Index: uspace/drv/pciintel/pci.c =================================================================== --- uspace/drv/pciintel/pci.c (revision 6f9e7feab0fd4bec18b0d862a2383558ef34a61f) +++ uspace/drv/pciintel/pci.c (revision 178673c97db32d4d4e1c8769b1b5991de3e3640d) @@ -489,5 +489,5 @@ (uint32_t) hw_resources.resources[0].res.io_range.address; - if (pio_enable((void *)bus_data->conf_io_addr, 8, + if (pio_enable((void *)(uintptr_t)bus_data->conf_io_addr, 8, &bus_data->conf_addr_port)) { printf(NAME ": failed to enable configuration ports.\n"); Index: pace/drv/rootia32/Makefile =================================================================== --- uspace/drv/rootia32/Makefile (revision 6f9e7feab0fd4bec18b0d862a2383558ef34a61f) +++ (revision ) @@ -1,37 +1,0 @@ -# -# 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 = rootia32 - -SOURCES = \ - rootia32.c - -include $(USPACE_PREFIX)/Makefile.common Index: pace/drv/rootia32/rootia32.c =================================================================== --- uspace/drv/rootia32/rootia32.c (revision 6f9e7feab0fd4bec18b0d862a2383558ef34a61f) +++ (revision ) @@ -1,204 +1,0 @@ -/* - * 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. - */ - -/** - * @defgroup root_ia32 Root HW device driver for ia32 platform. - * @brief HelenOS root HW device driver for ia32 platform. - * @{ - */ - -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#define NAME "rootia32" - -typedef struct rootia32_child_dev_data { - hw_resource_list_t hw_resources; -} rootia32_child_dev_data_t; - -static int rootia32_add_device(device_t *dev); -static void root_ia32_init(void); - -/** The root device driver's standard operations. */ -static driver_ops_t rootia32_ops = { - .add_device = &rootia32_add_device -}; - -/** The root device driver structure. */ -static driver_t rootia32_driver = { - .name = NAME, - .driver_ops = &rootia32_ops -}; - -static hw_resource_t pci_conf_regs = { - .type = IO_RANGE, - .res.io_range = { - .address = 0xCF8, - .size = 8, - .endianness = LITTLE_ENDIAN - } -}; - -static rootia32_child_dev_data_t pci_data = { - .hw_resources = { - 1, - &pci_conf_regs - } -}; - -static hw_resource_list_t *rootia32_get_child_resources(device_t *dev) -{ - rootia32_child_dev_data_t *data; - - data = (rootia32_child_dev_data_t *) dev->driver_data; - if (NULL == data) - return NULL; - - return &data->hw_resources; -} - -static bool rootia32_enable_child_interrupt(device_t *dev) -{ - /* TODO */ - - return false; -} - -static resource_iface_t child_res_iface = { - &rootia32_get_child_resources, - &rootia32_enable_child_interrupt -}; - -/* Initialized in root_ia32_init() function. */ -static device_ops_t rootia32_child_ops; - -static bool -rootia32_add_child(device_t *parent, const char *name, const char *str_match_id, - rootia32_child_dev_data_t *drv_data) -{ - printf(NAME ": adding new child device '%s'.\n", name); - - device_t *child = NULL; - match_id_t *match_id = NULL; - - /* Create new device. */ - child = create_device(); - if (NULL == child) - goto failure; - - child->name = name; - child->driver_data = drv_data; - - /* Initialize match id list */ - match_id = create_match_id(); - if (NULL == match_id) - goto failure; - - match_id->id = str_match_id; - match_id->score = 100; - add_match_id(&child->match_ids, match_id); - - /* Set provided operations to the device. */ - child->ops = &rootia32_child_ops; - - /* Register child device. */ - if (EOK != child_device_register(child, parent)) - goto failure; - - return true; - -failure: - if (NULL != match_id) - match_id->id = NULL; - - if (NULL != child) { - child->name = NULL; - delete_device(child); - } - - printf(NAME ": failed to add child device '%s'.\n", name); - - return false; -} - -static bool rootia32_add_children(device_t *dev) -{ - return rootia32_add_child(dev, "pci0", "intel_pci", &pci_data); -} - -/** Get the root device. - * - * @param dev The 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 rootia32_add_device(device_t *dev) -{ - printf(NAME ": rootia32_add_device, device handle = %d\n", dev->handle); - - /* Register child devices. */ - if (!rootia32_add_children(dev)) { - printf(NAME ": failed to add child devices for platform " - "ia32.\n"); - } - - return EOK; -} - -static void root_ia32_init(void) -{ - rootia32_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_res_iface; -} - -int main(int argc, char *argv[]) -{ - printf(NAME ": HelenOS rootia32 device driver\n"); - root_ia32_init(); - return driver_main(&rootia32_driver); -} - -/** - * @} - */ Index: pace/drv/rootia32/rootia32.ma =================================================================== --- uspace/drv/rootia32/rootia32.ma (revision 6f9e7feab0fd4bec18b0d862a2383558ef34a61f) +++ (revision ) @@ -1,1 +1,0 @@ -10 ia32 Index: uspace/drv/rootpc/Makefile =================================================================== --- uspace/drv/rootpc/Makefile (revision 178673c97db32d4d4e1c8769b1b5991de3e3640d) +++ uspace/drv/rootpc/Makefile (revision 178673c97db32d4d4e1c8769b1b5991de3e3640d) @@ -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 = rootpc + +SOURCES = \ + rootpc.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/rootpc/rootpc.c =================================================================== --- uspace/drv/rootpc/rootpc.c (revision 178673c97db32d4d4e1c8769b1b5991de3e3640d) +++ uspace/drv/rootpc/rootpc.c (revision 178673c97db32d4d4e1c8769b1b5991de3e3640d) @@ -0,0 +1,204 @@ +/* + * 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. + */ + +/** + * @defgroup root_pc Root HW device driver for ia32 and amd64 platform. + * @brief HelenOS root HW device driver for ia32 and amd64 platform. + * @{ + */ + +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#define NAME "rootpc" + +typedef struct rootpc_child_dev_data { + hw_resource_list_t hw_resources; +} rootpc_child_dev_data_t; + +static int rootpc_add_device(device_t *dev); +static void root_pc_init(void); + +/** The root device driver's standard operations. */ +static driver_ops_t rootpc_ops = { + .add_device = &rootpc_add_device +}; + +/** The root device driver structure. */ +static driver_t rootpc_driver = { + .name = NAME, + .driver_ops = &rootpc_ops +}; + +static hw_resource_t pci_conf_regs = { + .type = IO_RANGE, + .res.io_range = { + .address = 0xCF8, + .size = 8, + .endianness = LITTLE_ENDIAN + } +}; + +static rootpc_child_dev_data_t pci_data = { + .hw_resources = { + 1, + &pci_conf_regs + } +}; + +static hw_resource_list_t *rootpc_get_child_resources(device_t *dev) +{ + rootpc_child_dev_data_t *data; + + data = (rootpc_child_dev_data_t *) dev->driver_data; + if (NULL == data) + return NULL; + + return &data->hw_resources; +} + +static bool rootpc_enable_child_interrupt(device_t *dev) +{ + /* TODO */ + + return false; +} + +static resource_iface_t child_res_iface = { + &rootpc_get_child_resources, + &rootpc_enable_child_interrupt +}; + +/* Initialized in root_pc_init() function. */ +static device_ops_t rootpc_child_ops; + +static bool +rootpc_add_child(device_t *parent, const char *name, const char *str_match_id, + rootpc_child_dev_data_t *drv_data) +{ + printf(NAME ": adding new child device '%s'.\n", name); + + device_t *child = NULL; + match_id_t *match_id = NULL; + + /* Create new device. */ + child = create_device(); + if (NULL == child) + goto failure; + + child->name = name; + child->driver_data = drv_data; + + /* Initialize match id list */ + match_id = create_match_id(); + if (NULL == match_id) + goto failure; + + match_id->id = str_match_id; + match_id->score = 100; + add_match_id(&child->match_ids, match_id); + + /* Set provided operations to the device. */ + child->ops = &rootpc_child_ops; + + /* Register child device. */ + if (EOK != child_device_register(child, parent)) + goto failure; + + return true; + +failure: + if (NULL != match_id) + match_id->id = NULL; + + if (NULL != child) { + child->name = NULL; + delete_device(child); + } + + printf(NAME ": failed to add child device '%s'.\n", name); + + return false; +} + +static bool rootpc_add_children(device_t *dev) +{ + return rootpc_add_child(dev, "pci0", "intel_pci", &pci_data); +} + +/** Get the root device. + * + * @param dev The 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 rootpc_add_device(device_t *dev) +{ + printf(NAME ": rootpc_add_device, device handle = %d\n", dev->handle); + + /* Register child devices. */ + if (!rootpc_add_children(dev)) { + printf(NAME ": failed to add child devices for platform " + "ia32.\n"); + } + + return EOK; +} + +static void root_pc_init(void) +{ + rootpc_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_res_iface; +} + +int main(int argc, char *argv[]) +{ + printf(NAME ": HelenOS rootpc device driver\n"); + root_pc_init(); + return driver_main(&rootpc_driver); +} + +/** + * @} + */ Index: uspace/drv/rootpc/rootpc.ma =================================================================== --- uspace/drv/rootpc/rootpc.ma (revision 178673c97db32d4d4e1c8769b1b5991de3e3640d) +++ uspace/drv/rootpc/rootpc.ma (revision 178673c97db32d4d4e1c8769b1b5991de3e3640d) @@ -0,0 +1,2 @@ +10 ia32 +10 amd64