Index: boot/genarch/include/division.h =================================================================== --- boot/genarch/include/division.h (revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b) +++ (revision ) @@ -1,57 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * 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. - */ - -/** @file - */ - -#ifndef BOOT_DIVISION_H_ -#define BOOT_DIVISION_H_ - -extern int __divsi3(int, int); -extern long long __divdi3(long long, long long); - -extern unsigned int __udivsi3(unsigned int, unsigned int); -extern unsigned long long __udivdi3(unsigned long long, unsigned long long); - -extern int __modsi3(int, int); -extern long long __moddi3(long long, long long); - -extern unsigned int __umodsi3(unsigned int, unsigned int); -extern unsigned long long __umoddi3(unsigned long long, unsigned long long); - -extern int __divmodsi3(int, int, int *); -extern unsigned int __udivmodsi3(unsigned int, unsigned int, unsigned int *); - -extern long long __divmoddi3(long long, long long, long long *); -extern unsigned long long __udivmoddi3(unsigned long long, unsigned long long, - unsigned long long *); - -#endif - -/** @} - */ Index: boot/genarch/include/efi.h =================================================================== --- boot/genarch/include/efi.h (revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b) +++ (revision ) @@ -1,108 +1,0 @@ -/* - * Copyright (c) 2011 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. - */ - -#ifndef BOOT_EFI_H_ -#define BOOT_EFI_H_ - -#include - -typedef struct { - uint64_t signature; - uint32_t revision; - uint32_t header_size; - uint32_t crc32; - uint32_t reserved; -} efi_table_header_t; - -#define SAL_SYSTEM_TABLE_GUID \ - { \ - { \ - 0x32, 0x2d, 0x9d, 0xeb, 0x88, 0x2d, 0xd3, 0x11, \ - 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \ - } \ - } - -typedef union { - uint8_t bytes[16]; - struct { - uint64_t low; - uint64_t high; - }; -} efi_guid_t; - -typedef struct { - efi_guid_t guid; - void *table; -} efi_configuration_table_t; - -typedef struct { - efi_table_header_t hdr; - char *fw_vendor; - uint32_t fw_revision; - void *cons_in_handle; - void *cons_in; - void *cons_out_handle; - void *cons_out; - void *cons_err_handle; - void *cons_err; - void *runtime_services; - void *boot_services; - sysarg_t conf_table_entries; - efi_configuration_table_t *conf_table; -} efi_system_table_t; - -typedef enum { - EFI_RESERVED, - EFI_LOADER_CODE, - EFI_LOADER_DATA, - EFI_BOOT_SERVICES_CODE, - EFI_BOOT_SERVICES_DATA, - EFI_RUNTIME_SERVICES_CODE, - EFI_RUNTIME_SERVICES_DATA, - EFI_CONVENTIONAL_MEMORY, - EFI_UNUSABLE_MEMORY, - EFI_ACPI_RECLAIM_MEMORY, - EFI_ACPI_MEMORY_NVS, - EFI_MEMORY_MAPPED_IO, - EFI_MEMORY_MAPPED_IO_PORT_SPACE, - EFI_PAL_CODE -} efi_memory_type_t; - -typedef struct { - uint32_t type; - uint64_t phys_start; - uint64_t virt_start; - uint64_t pages; - uint64_t attribute; -} efi_v1_memdesc_t; - -#define EFI_PAGE_SIZE 4096 - -extern void *efi_vendor_table_find(efi_system_table_t *, efi_guid_t); - -#endif Index: boot/genarch/include/genarch/division.h =================================================================== --- boot/genarch/include/genarch/division.h (revision eca820c68a88b21d4b9fef3a00447516bc3f7684) +++ boot/genarch/include/genarch/division.h (revision eca820c68a88b21d4b9fef3a00447516bc3f7684) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2006 Josef Cejka + * 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. + */ + +/** @file + */ + +#ifndef BOOT_DIVISION_H_ +#define BOOT_DIVISION_H_ + +extern int __divsi3(int, int); +extern long long __divdi3(long long, long long); + +extern unsigned int __udivsi3(unsigned int, unsigned int); +extern unsigned long long __udivdi3(unsigned long long, unsigned long long); + +extern int __modsi3(int, int); +extern long long __moddi3(long long, long long); + +extern unsigned int __umodsi3(unsigned int, unsigned int); +extern unsigned long long __umoddi3(unsigned long long, unsigned long long); + +extern int __divmodsi3(int, int, int *); +extern unsigned int __udivmodsi3(unsigned int, unsigned int, unsigned int *); + +extern long long __divmoddi3(long long, long long, long long *); +extern unsigned long long __udivmoddi3(unsigned long long, unsigned long long, + unsigned long long *); + +#endif + +/** @} + */ Index: boot/genarch/include/genarch/efi.h =================================================================== --- boot/genarch/include/genarch/efi.h (revision eca820c68a88b21d4b9fef3a00447516bc3f7684) +++ boot/genarch/include/genarch/efi.h (revision eca820c68a88b21d4b9fef3a00447516bc3f7684) @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2011 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. + */ + +#ifndef BOOT_EFI_H_ +#define BOOT_EFI_H_ + +#include + +typedef struct { + uint64_t signature; + uint32_t revision; + uint32_t header_size; + uint32_t crc32; + uint32_t reserved; +} efi_table_header_t; + +#define SAL_SYSTEM_TABLE_GUID \ + { \ + { \ + 0x32, 0x2d, 0x9d, 0xeb, 0x88, 0x2d, 0xd3, 0x11, \ + 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \ + } \ + } + +typedef union { + uint8_t bytes[16]; + struct { + uint64_t low; + uint64_t high; + }; +} efi_guid_t; + +typedef struct { + efi_guid_t guid; + void *table; +} efi_configuration_table_t; + +typedef struct { + efi_table_header_t hdr; + char *fw_vendor; + uint32_t fw_revision; + void *cons_in_handle; + void *cons_in; + void *cons_out_handle; + void *cons_out; + void *cons_err_handle; + void *cons_err; + void *runtime_services; + void *boot_services; + sysarg_t conf_table_entries; + efi_configuration_table_t *conf_table; +} efi_system_table_t; + +typedef enum { + EFI_RESERVED, + EFI_LOADER_CODE, + EFI_LOADER_DATA, + EFI_BOOT_SERVICES_CODE, + EFI_BOOT_SERVICES_DATA, + EFI_RUNTIME_SERVICES_CODE, + EFI_RUNTIME_SERVICES_DATA, + EFI_CONVENTIONAL_MEMORY, + EFI_UNUSABLE_MEMORY, + EFI_ACPI_RECLAIM_MEMORY, + EFI_ACPI_MEMORY_NVS, + EFI_MEMORY_MAPPED_IO, + EFI_MEMORY_MAPPED_IO_PORT_SPACE, + EFI_PAL_CODE +} efi_memory_type_t; + +typedef struct { + uint32_t type; + uint64_t phys_start; + uint64_t virt_start; + uint64_t pages; + uint64_t attribute; +} efi_v1_memdesc_t; + +#define EFI_PAGE_SIZE 4096 + +extern void *efi_vendor_table_find(efi_system_table_t *, efi_guid_t); + +#endif Index: boot/genarch/include/genarch/multiplication.h =================================================================== --- boot/genarch/include/genarch/multiplication.h (revision eca820c68a88b21d4b9fef3a00447516bc3f7684) +++ boot/genarch/include/genarch/multiplication.h (revision eca820c68a88b21d4b9fef3a00447516bc3f7684) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2009 Josef Cejka + * 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. + */ + +/** + * @file + */ + +#ifndef BOOT_MULTIPLICATION_H__ +#define BOOT_MULTIPLICATION_H__ + +/* 64 bit multiplication */ +extern long long __muldi3(long long, long long); + +#endif + +/** @} + */ + + Index: boot/genarch/include/genarch/ofw.h =================================================================== --- boot/genarch/include/genarch/ofw.h (revision eca820c68a88b21d4b9fef3a00447516bc3f7684) +++ boot/genarch/include/genarch/ofw.h (revision eca820c68a88b21d4b9fef3a00447516bc3f7684) @@ -0,0 +1,128 @@ +/* + * 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. + */ + +#ifndef BOOT_OFW_H_ +#define BOOT_OFW_H_ + +#include +#include + +#define MEMMAP_MAX_RECORDS 32 +#define MAX_OFW_ARGS 12 + +#define OFW_TREE_PATH_MAX_LEN 256 +#define OFW_TREE_PROPERTY_MAX_NAMELEN 32 +#define OFW_TREE_PROPERTY_MAX_VALUELEN 64 + +typedef sysarg_t ofw_arg_t; +typedef native_t ofw_ret_t; +typedef uint32_t ofw_prop_t; +typedef uint32_t ihandle; +typedef uint32_t phandle; + +/** OpenFirmware command structure + * + */ +typedef struct { + ofw_arg_t service; /**< Command name. */ + ofw_arg_t nargs; /**< Number of in arguments. */ + ofw_arg_t nret; /**< Number of out arguments. */ + ofw_arg_t args[MAX_OFW_ARGS]; /**< List of arguments. */ +} ofw_args_t; + +typedef struct { + void *start; + size_t size; +} memzone_t; + +typedef struct { + uint64_t total; + size_t cnt; + memzone_t zones[MEMMAP_MAX_RECORDS]; +} memmap_t; + +typedef struct { + uint32_t info; + uint32_t addr_hi; + uint32_t addr_lo; +} pci_addr_t; + +typedef struct { + pci_addr_t addr; + uint32_t size_hi; + uint32_t size_lo; +} pci_reg_t; + +extern uintptr_t ofw_cif; + +extern phandle ofw_chosen; +extern ihandle ofw_stdout; +extern phandle ofw_root; +extern ihandle ofw_mmu; +extern phandle ofw_memory; + +extern void ofw_init(void); + +extern void ofw_putchar(const char); + +extern ofw_arg_t ofw_get_property(const phandle, const char *, void *, + const size_t); +extern ofw_arg_t ofw_get_proplen(const phandle, const char *); +extern ofw_arg_t ofw_next_property(const phandle, char *, char *); + +extern phandle ofw_get_child_node(const phandle); +extern phandle ofw_get_peer_node(const phandle); +extern phandle ofw_find_device(const char *); + +extern ofw_arg_t ofw_package_to_path(const phandle, char *, const size_t); + +extern ofw_arg_t ofw(ofw_args_t *); +extern ofw_arg_t ofw_call(const char *, const size_t, const size_t, ofw_arg_t *, + ...); + +extern size_t ofw_get_address_cells(const phandle); +extern size_t ofw_get_size_cells(const phandle); + +extern void *ofw_translate(const void *); + +extern void ofw_claim_virt(const void *, const size_t); +extern void *ofw_claim_virt_any(const size_t, const size_t); + +extern void ofw_claim_phys(const void *, const size_t); +extern void *ofw_claim_phys_any(const size_t, const size_t); + +extern void ofw_map(const void *, const void *, const size_t, + const ofw_arg_t); + +extern void ofw_alloc(const char *, void **, void **, const size_t, void *); + +extern void ofw_memmap(memmap_t *); +extern void ofw_setup_screens(void); +extern void ofw_quiesce(void); + +#endif Index: boot/genarch/include/genarch/ofw_tree.h =================================================================== --- boot/genarch/include/genarch/ofw_tree.h (revision eca820c68a88b21d4b9fef3a00447516bc3f7684) +++ boot/genarch/include/genarch/ofw_tree.h (revision eca820c68a88b21d4b9fef3a00447516bc3f7684) @@ -0,0 +1,60 @@ +/* + * 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. + */ + +#ifndef BOOT_OFW_TREE_H_ +#define BOOT_OFW_TREE_H_ + +#include +#include + +/** Memory representation of OpenFirmware device tree node property. */ +typedef struct { + char name[OFW_TREE_PROPERTY_MAX_NAMELEN]; + size_t size; + void *value; +} ofw_tree_property_t; + +/** Memory representation of OpenFirmware device tree node. */ +typedef struct ofw_tree_node { + struct ofw_tree_node *parent; + struct ofw_tree_node *peer; + struct ofw_tree_node *child; + + phandle node_handle; /**< Old OpenFirmware node handle. */ + + char *da_name; /**< Disambigued name. */ + + size_t properties; /**< Number of properties. */ + ofw_tree_property_t *property; + + void *device; /**< Member used solely by the kernel. */ +} ofw_tree_node_t; + +extern ofw_tree_node_t *ofw_tree_build(void); + +#endif Index: boot/genarch/include/multiplication.h =================================================================== --- boot/genarch/include/multiplication.h (revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2009 Josef Cejka - * 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. - */ - -/** - * @file - */ - -#ifndef BOOT_MULTIPLICATION_H__ -#define BOOT_MULTIPLICATION_H__ - -/* 64 bit multiplication */ -extern long long __muldi3(long long, long long); - -#endif - -/** @} - */ - - Index: boot/genarch/include/ofw.h =================================================================== --- boot/genarch/include/ofw.h (revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b) +++ (revision ) @@ -1,128 +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. - */ - -#ifndef BOOT_OFW_H_ -#define BOOT_OFW_H_ - -#include -#include - -#define MEMMAP_MAX_RECORDS 32 -#define MAX_OFW_ARGS 12 - -#define OFW_TREE_PATH_MAX_LEN 256 -#define OFW_TREE_PROPERTY_MAX_NAMELEN 32 -#define OFW_TREE_PROPERTY_MAX_VALUELEN 64 - -typedef sysarg_t ofw_arg_t; -typedef native_t ofw_ret_t; -typedef uint32_t ofw_prop_t; -typedef uint32_t ihandle; -typedef uint32_t phandle; - -/** OpenFirmware command structure - * - */ -typedef struct { - ofw_arg_t service; /**< Command name. */ - ofw_arg_t nargs; /**< Number of in arguments. */ - ofw_arg_t nret; /**< Number of out arguments. */ - ofw_arg_t args[MAX_OFW_ARGS]; /**< List of arguments. */ -} ofw_args_t; - -typedef struct { - void *start; - size_t size; -} memzone_t; - -typedef struct { - uint64_t total; - size_t cnt; - memzone_t zones[MEMMAP_MAX_RECORDS]; -} memmap_t; - -typedef struct { - uint32_t info; - uint32_t addr_hi; - uint32_t addr_lo; -} pci_addr_t; - -typedef struct { - pci_addr_t addr; - uint32_t size_hi; - uint32_t size_lo; -} pci_reg_t; - -extern uintptr_t ofw_cif; - -extern phandle ofw_chosen; -extern ihandle ofw_stdout; -extern phandle ofw_root; -extern ihandle ofw_mmu; -extern phandle ofw_memory; - -extern void ofw_init(void); - -extern void ofw_putchar(const char); - -extern ofw_arg_t ofw_get_property(const phandle, const char *, void *, - const size_t); -extern ofw_arg_t ofw_get_proplen(const phandle, const char *); -extern ofw_arg_t ofw_next_property(const phandle, char *, char *); - -extern phandle ofw_get_child_node(const phandle); -extern phandle ofw_get_peer_node(const phandle); -extern phandle ofw_find_device(const char *); - -extern ofw_arg_t ofw_package_to_path(const phandle, char *, const size_t); - -extern ofw_arg_t ofw(ofw_args_t *); -extern ofw_arg_t ofw_call(const char *, const size_t, const size_t, ofw_arg_t *, - ...); - -extern size_t ofw_get_address_cells(const phandle); -extern size_t ofw_get_size_cells(const phandle); - -extern void *ofw_translate(const void *); - -extern void ofw_claim_virt(const void *, const size_t); -extern void *ofw_claim_virt_any(const size_t, const size_t); - -extern void ofw_claim_phys(const void *, const size_t); -extern void *ofw_claim_phys_any(const size_t, const size_t); - -extern void ofw_map(const void *, const void *, const size_t, - const ofw_arg_t); - -extern void ofw_alloc(const char *, void **, void **, const size_t, void *); - -extern void ofw_memmap(memmap_t *); -extern void ofw_setup_screens(void); -extern void ofw_quiesce(void); - -#endif Index: boot/genarch/include/ofw_tree.h =================================================================== --- boot/genarch/include/ofw_tree.h (revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b) +++ (revision ) @@ -1,60 +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. - */ - -#ifndef BOOT_OFW_TREE_H_ -#define BOOT_OFW_TREE_H_ - -#include -#include - -/** Memory representation of OpenFirmware device tree node property. */ -typedef struct { - char name[OFW_TREE_PROPERTY_MAX_NAMELEN]; - size_t size; - void *value; -} ofw_tree_property_t; - -/** Memory representation of OpenFirmware device tree node. */ -typedef struct ofw_tree_node { - struct ofw_tree_node *parent; - struct ofw_tree_node *peer; - struct ofw_tree_node *child; - - phandle node_handle; /**< Old OpenFirmware node handle. */ - - char *da_name; /**< Disambigued name. */ - - size_t properties; /**< Number of properties. */ - ofw_tree_property_t *property; - - void *device; /**< Member used solely by the kernel. */ -} ofw_tree_node_t; - -extern ofw_tree_node_t *ofw_tree_build(void); - -#endif