Index: kernel/genarch/Makefile.inc =================================================================== --- kernel/genarch/Makefile.inc (revision 1167520724b9b526c27b67f2d4bc447ef626240c) +++ kernel/genarch/Makefile.inc (revision 94d614ef2057652d47a2a1df5f4c4809bbe31b2f) @@ -29,9 +29,4 @@ # -ifeq ($(CONFIG_OFW),y) - GENARCH_SOURCES += \ - genarch/src/ofw/ofw.c \ - genarch/src/ofw/memory_init.c -endif ifeq ($(CONFIG_ACPI),y) GENARCH_SOURCES += \ Index: kernel/genarch/include/ofw/memory_init.h =================================================================== --- kernel/genarch/include/ofw/memory_init.h (revision 1167520724b9b526c27b67f2d4bc447ef626240c) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (C) 2006 Jakub Jermar - * 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. - */ - -/** @addtogroup genarch - * @{ - */ -/** @file - */ - -#ifndef __OFW_MEMORY_INIT_H__ -#define __OFW_MEMORY_INIT_H__ - -#include - -extern void ofw_init_memmap(void); -extern size_t ofw_get_memory_size(void); -extern void ofw_init_zones(void); - -#endif - -/** @} - */ - Index: kernel/genarch/include/ofw/ofw.h =================================================================== --- kernel/genarch/include/ofw/ofw.h (revision 1167520724b9b526c27b67f2d4bc447ef626240c) +++ (revision ) @@ -1,70 +1,0 @@ -/* - * Copyright (C) 2005 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. - */ - -/** @addtogroup genarch - * @{ - */ -/** @file - */ - -#ifndef KERN_OFW_H_ -#define KERN_OFW_H_ - -#include - -#define MAX_OFW_ARGS 12 - -typedef unative_t ofw_arg_t; -typedef unsigned int ihandle; -typedef unsigned int phandle; - -/** OpenFirmware command structure - * - */ -typedef struct { - const char *service; /**< Command name */ - unative_t nargs; /**< Number of in arguments */ - unative_t nret; /**< Number of out arguments */ - ofw_arg_t args[MAX_OFW_ARGS]; /**< Buffer for in and out arguments */ -} ofw_args_t; - -extern int ofw(ofw_args_t *); /**< OpenFirmware Client Interface entry point. */ - -extern void ofw_init(void); -extern void ofw_done(void); -extern ofw_arg_t ofw_call(const char *service, const int nargs, const int nret, ofw_arg_t *rets, ...); -extern void ofw_putchar(const char ch); -extern phandle ofw_find_device(const char *name); -extern int ofw_get_property(const phandle device, const char *name, const void *buf, const int buflen); -extern void *ofw_translate(const void *addr); -extern void *ofw_claim(const void *addr, const int size, const int align); - -#endif - -/** @} - */ Index: kernel/genarch/src/fb/fb.c =================================================================== --- kernel/genarch/src/fb/fb.c (revision 1167520724b9b526c27b67f2d4bc447ef626240c) +++ kernel/genarch/src/fb/fb.c (revision 94d614ef2057652d47a2a1df5f4c4809bbe31b2f) @@ -27,5 +27,5 @@ */ - /** @addtogroup genarch +/** @addtogroup genarch * @{ */ @@ -420,5 +420,4 @@ } - /** @} - */ - +/** @} + */ Index: kernel/genarch/src/ofw/memory_init.c =================================================================== --- kernel/genarch/src/ofw/memory_init.c (revision 1167520724b9b526c27b67f2d4bc447ef626240c) +++ (revision ) @@ -1,97 +1,0 @@ -/* - * Copyright (C) 2005 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. - */ - -/** @addtogroup genarch - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include - -#define MEMMAP_MAX_RECORDS 32 - -typedef struct { - uintptr_t start; - size_t size; -} memmap_t; - -static memmap_t memmap[MEMMAP_MAX_RECORDS]; -size_t total_mem = 0; - -void ofw_init_memmap(void) -{ - int i; - int ret; - - phandle handle = ofw_find_device("/memory"); - if (handle == -1) - panic("No RAM\n"); - - ret = ofw_get_property(handle, "reg", &memmap, sizeof(memmap)); - if (ret == -1) - panic("Device /memory has no reg property\n"); - - - for (i = 0; i < MEMMAP_MAX_RECORDS; i++) { - if (memmap[i].size == 0) - break; - total_mem += memmap[i].size; - } -} - -size_t ofw_get_memory_size(void) -{ - return total_mem; -} - -void ofw_init_zones(void) -{ - int i; - pfn_t confdata; - - for (i = 0; i < MEMMAP_MAX_RECORDS; i++) { - if (memmap[i].size == 0) - break; - confdata = ADDR2PFN(memmap[i].start); - if (confdata == 0) - confdata = 2; - zone_create(ADDR2PFN(memmap[i].start), - SIZE2FRAMES(ALIGN_DOWN(memmap[i].size,PAGE_SIZE)), - confdata, 0); - } -} - -/** @} - */ Index: kernel/genarch/src/ofw/ofw.c =================================================================== --- kernel/genarch/src/ofw/ofw.c (revision 1167520724b9b526c27b67f2d4bc447ef626240c) +++ (revision ) @@ -1,154 +1,0 @@ -/* - * Copyright (C) 2005 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. - */ - -/** @addtogroup genarch - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include - -uintptr_t ofw_cif; /**< OpenFirmware Client Interface address. */ - -phandle ofw_chosen; -ihandle ofw_stdout; -ihandle ofw_mmu; - -void ofw_init(void) -{ - ofw_chosen = ofw_find_device("/chosen"); - if (ofw_chosen == -1) - ofw_done(); - - if (ofw_get_property(ofw_chosen, "stdout", &ofw_stdout, sizeof(ofw_stdout)) <= 0) - ofw_stdout = 0; - - if (ofw_get_property(ofw_chosen, "mmu", &ofw_mmu, sizeof(ofw_mmu)) <= 0) - ofw_mmu = 0; -} - -void ofw_done(void) -{ - (void) ofw_call("exit", 0, 1, NULL); - cpu_halt(); -} - -/** Perform a call to OpenFirmware client interface. - * - * @param service String identifying the service requested. - * @param nargs Number of input arguments. - * @param nret Number of output arguments. This includes the return value. - * @param rets Buffer for output arguments or NULL. The buffer must accomodate nret - 1 items. - * - * @return Return value returned by the client interface. - */ -ofw_arg_t ofw_call(const char *service, const int nargs, const int nret, ofw_arg_t *rets, ...) -{ - va_list list; - ofw_args_t args; - int i; - - args.service = service; - args.nargs = nargs; - args.nret = nret; - - va_start(list, rets); - for (i = 0; i < nargs; i++) - args.args[i] = va_arg(list, ofw_arg_t); - va_end(list); - - for (i = 0; i < nret; i++) - args.args[i + nargs] = 0; - - (void) ofw(&args); - - for (i = 1; i < nret; i++) - rets[i - 1] = args.args[i + nargs]; - - return args.args[nargs]; -} - -void ofw_putchar(const char ch) -{ - if (ofw_stdout == 0) - return; - - (void) ofw_call("write", 3, 1, NULL, ofw_stdout, &ch, 1); -} - -phandle ofw_find_device(const char *name) -{ - return (phandle) ofw_call("finddevice", 1, 1, NULL, name); -} - -int ofw_get_property(const phandle device, const char *name, const void *buf, const int buflen) -{ - return (int) ofw_call("getprop", 4, 1, NULL, device, name, buf, buflen); -} - -/** Translate virtual address to physical address using OpenFirmware. - * - * Use this function only when OpenFirmware is in charge. - * - * @param virt Virtual address. - * @return NULL on failure or physical address on success. - */ -void *ofw_translate(const void *virt) -{ - ofw_arg_t result[4]; - int shift; - - if (!ofw_mmu) - return NULL; - - if (ofw_call("call-method", 3, 5, result, "translate", ofw_mmu, virt) != 0) - return NULL; - - if (result[0] != -1) - return NULL; - - if (sizeof(unative_t) == 8) - shift = 32; - else - shift = 0; - - return (void *) ((result[2]<