Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/Makefile (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -91,6 +91,6 @@ generic/loader.c \ generic/getopt.c \ - generic/adt/list.o \ - generic/adt/hash_table.o \ + generic/adt/list.c \ + generic/adt/hash_table.c \ generic/adt/dynamic_fifo.c \ generic/adt/measured_strings.c \ Index: uspace/lib/c/Makefile.toolchain =================================================================== --- uspace/lib/c/Makefile.toolchain (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (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. -# - -GCC_CFLAGS = -I$(LIBC_PREFIX)/include -O3 -imacros $(LIBC_PREFIX)/../../../config.h \ - -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ - -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ - -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ - -Werror-implicit-function-declaration -pipe -g -D__$(ENDIANESS)__ - -ICC_CFLAGS = -I$(LIBC_PREFIX)/include -O3 -imacros $(LIBC_PREFIX)/../../../config.h \ - -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ - -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ - -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ - -Werror-implicit-function-declaration -pipe -g -D__$(ENDIANESS)__ - -CLANG_CFLAGS = -I$(LIBC_PREFIX)/include -O3 -imacros $(LIBC_PREFIX)/../../../config.h \ - -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ - -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ - -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ - -Werror-implicit-function-declaration -pipe -g -arch $(CLANG_ARCH) \ - -D__$(ENDIANESS)__ - -LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a -AFLAGS = - -## Cross-toolchain prefix -# - -ifndef CROSS_PREFIX - CROSS_PREFIX = /usr/local -endif - -## Setup platform configuration -# - --include $(LIBC_PREFIX)/../../../Makefile.config --include $(LIBC_PREFIX)/../../../config.defs --include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc - -## Simple detection of the host system -# -HOST = $(shell uname) - -## On Solaris, some utilities have different names -# -ifeq ($(HOST),SunOS) - BINUTILS_PREFIX = "g" -else - BINUTILS_PREFIX = "" -endif - -## Toolchain configuration -# - -JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py - -ifeq ($(COMPILER),gcc_cross) - CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc - GCC = $(CC) - AS = $(TOOLCHAIN_DIR)/$(TARGET)-as - LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld - AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar - OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy - OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump - CFLAGS = $(GCC_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif - -ifeq ($(COMPILER),gcc_native) - CC = gcc - GCC = $(CC) - AS = $(BINUTILS_PREFIX)as - LD = $(BINUTILS_PREFIX)ld - AR = $(BINUTILS_PREFIX)ar - OBJCOPY = $(BINUTILS_PREFIX)objcopy - OBJDUMP = $(BINUTILS_PREFIX)objdump - CFLAGS = $(GCC_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif - -ifeq ($(COMPILER),icc) - CC = icc - GCC = gcc - AS = as - LD = ld - AR = ar - OBJCOPY = objcopy - OBJDUMP = objdump - CFLAGS = $(ICC_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif - -ifeq ($(COMPILER),clang) - CC = clang - GCC = gcc - AS = $(BINUTILS_PREFIX)as - LD = $(BINUTILS_PREFIX)ld - AR = $(BINUTILS_PREFIX)ar - OBJCOPY = $(BINUTILS_PREFIX)objcopy - OBJDUMP = $(BINUTILS_PREFIX)objdump - CFLAGS = $(CLANG_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif Index: uspace/lib/c/arch/abs32le/_link.ld.in =================================================================== --- uspace/lib/c/arch/abs32le/_link.ld.in (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/arch/abs32le/_link.ld.in (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -44,8 +44,4 @@ } :data - . = ALIGN(0x1000); - - _heap = .; - /DISCARD/ : { *(*); Index: uspace/lib/c/arch/amd64/_link.ld.in =================================================================== --- uspace/lib/c/arch/amd64/_link.ld.in (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/arch/amd64/_link.ld.in (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -5,4 +5,5 @@ text PT_LOAD FLAGS(5); data PT_LOAD FLAGS(6); + debug PT_NOTE; } @@ -13,14 +14,16 @@ *(.init); } :text + .text : { *(.text); *(.rodata*); } :text - + . = . + 0x1000; - + .data : { *(.data); } :data + .tdata : { _tdata_start = .; @@ -31,16 +34,27 @@ _tbss_end = .; } :data + _tls_alignment = ALIGNOF(.tdata); + .bss : { *(COMMON); *(.bss); } :data - - . = ALIGN(0x1000); - _heap = .; + +#ifdef CONFIG_LINE_DEBUG + .comment 0 : { *(.comment); } :debug + .debug_abbrev 0 : { *(.debug_abbrev); } :debug + .debug_aranges 0 : { *(.debug_aranges); } :debug + .debug_info 0 : { *(.debug_info); } :debug + .debug_line 0 : { *(.debug_line); } :debug + .debug_loc 0 : { *(.debug_loc); } :debug + .debug_pubnames 0 : { *(.debug_pubnames); } :debug + .debug_pubtypes 0 : { *(.debug_pubtypes); } :debug + .debug_ranges 0 : { *(.debug_ranges); } :debug + .debug_str 0 : { *(.debug_str); } :debug +#endif /DISCARD/ : { *(*); } - } Index: uspace/lib/c/arch/amd64/include/limits.h =================================================================== --- uspace/lib/c/arch/amd64/include/limits.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,46 +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. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_LIMITS_H_ -#define LIBC_amd64_LIMITS_H_ - -# define LONG_MIN MIN_INT64 -# define LONG_MAX MAX_INT64 -# define ULONG_MIN MIN_UINT64 -# define ULONG_MAX MAX_UINT64 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/arm32/_link.ld.in =================================================================== --- uspace/lib/c/arch/arm32/_link.ld.in (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/arch/arm32/_link.ld.in (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -9,15 +9,16 @@ SECTIONS { . = 0x1000 + SIZEOF_HEADERS; - + .init : { *(.init); - } : text + } :text + .text : { *(.text); - *(.rodata*); + *(.rodata*); } :text - + . = . + 0x1000; - + .data : { *(.opd); @@ -25,4 +26,5 @@ *(.sdata); } :data + .tdata : { _tdata_start = .; @@ -33,18 +35,16 @@ _tbss_end = .; } :data + _tls_alignment = ALIGNOF(.tdata); + .bss : { *(.sbss); *(.scommon); - *(COMMON); - *(.bss); + *(COMMON); + *(.bss); } :data - - . = ALIGN(0x1000); - _heap = .; /DISCARD/ : { *(*); } - } Index: uspace/lib/c/arch/arm32/include/limits.h =================================================================== --- uspace/lib/c/arch/arm32/include/limits.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt - * 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 libcarm32 - * @{ - */ -/** @file - * @brief Limits declarations. - */ - -#ifndef LIBC_arm32__LIMITS_H_ -#define LIBC_arm32__LIMITS_H_ - -#define LONG_MIN MIN_INT32 -#define LONG_MAX MAX_INT32 -#define ULONG_MIN MIN_UINT32 -#define ULONG_MAX MAX_UINT32 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/_link.ld.in =================================================================== --- uspace/lib/c/arch/ia32/_link.ld.in (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/arch/ia32/_link.ld.in (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -5,4 +5,5 @@ text PT_LOAD FLAGS(5); data PT_LOAD FLAGS(6); + debug PT_NOTE; } @@ -42,7 +43,16 @@ } :data - . = ALIGN(0x1000); - - _heap = .; +#ifdef CONFIG_LINE_DEBUG + .comment 0 : { *(.comment); } :debug + .debug_abbrev 0 : { *(.debug_abbrev); } :debug + .debug_aranges 0 : { *(.debug_aranges); } :debug + .debug_info 0 : { *(.debug_info); } :debug + .debug_line 0 : { *(.debug_line); } :debug + .debug_loc 0 : { *(.debug_loc); } :debug + .debug_pubnames 0 : { *(.debug_pubnames); } :debug + .debug_pubtypes 0 : { *(.debug_pubtypes); } :debug + .debug_ranges 0 : { *(.debug_ranges); } :debug + .debug_str 0 : { *(.debug_str); } :debug +#endif /DISCARD/ : { Index: uspace/lib/c/arch/ia32/include/limits.h =================================================================== --- uspace/lib/c/arch/ia32/include/limits.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,46 +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. - */ - -/** @addtogroup libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32__LIMITS_H_ -#define LIBC_ia32__LIMITS_H_ - -# define LONG_MIN MIN_INT32 -# define LONG_MAX MAX_INT32 -# define ULONG_MIN MIN_UINT32 -# define ULONG_MAX MAX_UINT32 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/_link.ld.in =================================================================== --- uspace/lib/c/arch/ia64/_link.ld.in (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/arch/ia64/_link.ld.in (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -9,19 +9,21 @@ SECTIONS { . = 0x4000 + SIZEOF_HEADERS; - + .init : { *(.init); - } : text + } :text + .text : { *(.text); *(.rodata*); } :text - + . = . + 0x4000; - + .got : { _gp = .; *(.got*); - } :data + } :data + .data : { *(.opd); @@ -29,4 +31,5 @@ *(.sdata); } :data + .tdata : { _tdata_start = .; @@ -37,5 +40,7 @@ _tbss_end = .; } :data + _tls_alignment = ALIGNOF(.tdata); + .bss : { *(.sbss); @@ -44,10 +49,7 @@ *(.bss); } :data - - . = ALIGN(0x4000); - _heap = .; - + /DISCARD/ : { *(*); - } + } } Index: uspace/lib/c/arch/ia64/include/limits.h =================================================================== --- uspace/lib/c/arch/ia64/include/limits.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,46 +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. - */ - -/** @addtogroup libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_LIMITS_H_ -#define LIBC_ia64_LIMITS_H_ - -# define LONG_MIN MIN_INT64 -# define LONG_MAX MAX_INT64 -# define ULONG_MIN MIN_UINT64 -# define ULONG_MAX MAX_UINT64 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips32/_link.ld.in =================================================================== --- uspace/lib/c/arch/mips32/_link.ld.in (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/arch/mips32/_link.ld.in (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -13,43 +13,46 @@ *(.init); } :text + .text : { - *(.text); + *(.text); *(.rodata*); } :text - + . = . + 0x4000; - + .data : { *(.data); *(.data.rel*); } :data - + .got : { _gp = .; *(.got); } :data - + .tdata : { _tdata_start = .; *(.tdata); _tdata_end = .; + } :data + + .tbss : { _tbss_start = .; *(.tbss); _tbss_end = .; } :data - _tls_alignment = ALIGNOF(.tdata); - + + _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss)); + .sbss : { *(.scommon); *(.sbss); - } + } + .bss : { *(.bss); *(COMMON); } :data - - . = ALIGN(0x4000); - _heap = .; - + /DISCARD/ : { *(*); Index: uspace/lib/c/arch/mips32/include/limits.h =================================================================== --- uspace/lib/c/arch/mips32/include/limits.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,47 +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. - */ - -/** @addtogroup libcmips32 - * @{ - */ -/** @file - * @ingroup libcmips32eb - */ - -#ifndef LIBC_mips32__LIMITS_H_ -#define LIBC_mips32__LIMITS_H_ - -# define LONG_MIN MIN_INT32 -# define LONG_MAX MAX_INT32 -# define ULONG_MIN MIN_UINT32 -# define ULONG_MAX MAX_UINT32 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips32/src/entry.s =================================================================== --- uspace/lib/c/arch/mips32/src/entry.s (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/arch/mips32/src/entry.s (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -29,6 +29,7 @@ .text .section .init, "ax" + .global __entry -.global __entry_driver + .set noreorder .option pic2 @@ -57,6 +58,2 @@ nop .end - -# Alignment of output section data to 0x4000 -.section .data -.align 14 Index: uspace/lib/c/arch/mips32eb/include/limits.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/limits.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/limits.h Index: uspace/lib/c/arch/ppc32/_link.ld.in =================================================================== --- uspace/lib/c/arch/ppc32/_link.ld.in (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/arch/ppc32/_link.ld.in (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -9,19 +9,21 @@ SECTIONS { . = 0x1000 + SIZEOF_HEADERS; - + .init : { *(.init); } :text + .text : { *(.text); *(.rodata*); } :text - + . = . + 0x1000; - + .data : { *(.data); *(.sdata); } :data + .tdata : { _tdata_start = .; @@ -32,5 +34,7 @@ _tbss_end = .; } :data + _tls_alignment = ALIGNOF(.tdata); + .bss : { *(.sbss); @@ -38,11 +42,7 @@ *(.bss); } :data - - . = ALIGN(0x1000); - _heap = .; /DISCARD/ : { *(*); } - } Index: uspace/lib/c/arch/ppc32/include/limits.h =================================================================== --- uspace/lib/c/arch/ppc32/include/limits.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,46 +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. - */ - -/** @addtogroup libcppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ppc32_LIMITS_H_ -#define LIBC_ppc32_LIMITS_H_ - -#define LONG_MIN MIN_INT32 -#define LONG_MAX MAX_INT32 -#define ULONG_MIN MIN_UINT32 -#define ULONG_MAX MAX_UINT32 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/sparc64/_link.ld.in =================================================================== --- uspace/lib/c/arch/sparc64/_link.ld.in (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/arch/sparc64/_link.ld.in (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -9,23 +9,26 @@ SECTIONS { . = 0x4000 + SIZEOF_HEADERS; - + .init : { *(.init); } :text + .text : { *(.text); *(.rodata*); } :text - + . = . + 0x4000; - + .got : { _gp = .; *(.got*); } :data + .data : { *(.data); *(.sdata); } :data + .tdata : { _tdata_start = .; @@ -36,5 +39,7 @@ _tbss_end = .; } :data + _tls_alignment = ALIGNOF(.tdata); + .bss : { *(.sbss); @@ -42,11 +47,7 @@ *(.bss); } :data - - . = ALIGN(0x4000); - _heap = .; /DISCARD/ : { *(*); } - } Index: uspace/lib/c/arch/sparc64/include/limits.h =================================================================== --- uspace/lib/c/arch/sparc64/include/limits.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,46 +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. - */ - -/** @addtogroup libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_LIMITS_H_ -#define LIBC_sparc64_LIMITS_H_ - -#define LONG_MIN MIN_INT64 -#define LONG_MAX MAX_INT64 -#define ULONG_MIN MIN_UINT64 -#define ULONG_MAX MAX_UINT64 - -#endif - -/** @} - */ Index: uspace/lib/c/generic/as.c =================================================================== --- uspace/lib/c/generic/as.c (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/generic/as.c (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -40,7 +40,5 @@ #include #include - -/** Last position allocated by as_get_mappable_page */ -static uintptr_t last_allocated = 0; +#include "private/libc.h" /** Create address space area. @@ -103,27 +101,15 @@ } -/** Return pointer to some unmapped area, where fits new as_area +/** Return pointer to unmapped address space area * * @param size Requested size of the allocation. * - * @return pointer to the beginning + * @return Pointer to the beginning of unmapped address space area. * */ void *as_get_mappable_page(size_t size) { - if (size == 0) - return NULL; - - size_t sz = 1 << (fnzb(size - 1) + 1); - if (last_allocated == 0) - last_allocated = get_max_heap_addr(); - - /* - * Make sure we allocate from naturally aligned address. - */ - uintptr_t res = ALIGN_UP(last_allocated, sz); - last_allocated = res + ALIGN_UP(size, PAGE_SIZE); - - return ((void *) res); + return (void *) __SYSCALL2(SYS_AS_GET_UNMAPPED_AREA, + (sysarg_t) __entry, (sysarg_t) size); } Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/generic/async.c (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -430,4 +430,10 @@ fid_t fid = fibril_create(notification_fibril, msg); + if (fid == 0) { + free(msg); + futex_up(&async_futex); + return false; + } + fibril_add_ready(fid); @@ -681,8 +687,10 @@ conn->wdata.fid = fibril_create(connection_fibril, conn); - if (!conn->wdata.fid) { + if (conn->wdata.fid == 0) { free(conn); + if (callid) ipc_answer_0(callid, ENOMEM); + return (uintptr_t) NULL; } @@ -853,5 +861,6 @@ { fid_t fid = fibril_create(async_manager_fibril, NULL); - fibril_add_manager(fid); + if (fid != 0) + fibril_add_manager(fid); } Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/generic/devman.c (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -123,9 +123,13 @@ } -static int devman_send_match_id(int phone, match_id_t *match_id) \ -{ - ipc_call_t answer; - aid_t req = async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer); - int retval = async_data_write_start(phone, match_id->id, str_size(match_id->id)); +static int devman_send_match_id(int phone, match_id_t *match_id) +{ + ipc_call_t answer; + + aid_t req = async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, + &answer); + int retval = async_data_write_start(phone, match_id->id, + str_size(match_id->id)); + async_wait_for(req, NULL); return retval; @@ -133,26 +137,43 @@ -static int devman_send_match_ids(int phone, match_id_list_t *match_ids) +static int devman_send_match_ids(int phone, match_id_list_t *match_ids) { link_t *link = match_ids->ids.next; match_id_t *match_id = NULL; int ret = EOK; - + while (link != &match_ids->ids) { match_id = list_get_instance(link, match_id_t, link); - if (EOK != (ret = devman_send_match_id(phone, match_id))) - { - printf("Driver failed to send match id, error number = %d\n", ret); - return ret; - } + ret = devman_send_match_id(phone, match_id); + if (ret != EOK) { + printf("Driver failed to send match id, error %d\n", + ret); + return ret; + } + link = link->next; } - return ret; -} - -int devman_child_device_register( - const char *name, match_id_list_t *match_ids, devman_handle_t parent_handle, devman_handle_t *handle) -{ + + return ret; +} + +/** Add function to a device. + * + * Request devman to add a new function to the specified device owned by + * this driver task. + * + * @param name Name of the new function + * @param ftype Function type, fun_inner or fun_exposed + * @param match_ids Match IDs (should be empty for fun_exposed) + * @param devh Devman handle of the device + * @param funh Place to store handle of the new function + * + * @return EOK on success or negative error code. + */ +int devman_add_function(const char *name, fun_type_t ftype, + match_id_list_t *match_ids, devman_handle_t devh, devman_handle_t *funh) +{ int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING); + int fun_handle; if (phone < 0) @@ -161,7 +182,9 @@ async_serialize_start(); - int match_count = list_count(&match_ids->ids); - ipc_call_t answer; - aid_t req = async_send_2(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, match_count, &answer); + int match_count = list_count(&match_ids->ids); + ipc_call_t answer; + + aid_t req = async_send_3(phone, DEVMAN_ADD_FUNCTION, (sysarg_t) ftype, + devh, match_count, &answer); sysarg_t retval = async_data_write_start(phone, name, str_size(name)); @@ -178,18 +201,16 @@ async_serialize_end(); - if (retval != EOK) { - if (handle != NULL) { - *handle = -1; - } - return retval; - } - - if (handle != NULL) - *handle = (int) IPC_GET_ARG1(answer); - - return retval; -} - -int devman_add_device_to_class(devman_handle_t devman_handle, const char *class_name) + if (retval == EOK) + fun_handle = (int) IPC_GET_ARG1(answer); + else + fun_handle = -1; + + *funh = fun_handle; + + return retval; +} + +int devman_add_device_to_class(devman_handle_t devman_handle, + const char *class_name) { int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING); @@ -200,7 +221,9 @@ async_serialize_start(); ipc_call_t answer; - aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, devman_handle, &answer); - - sysarg_t retval = async_data_write_start(phone, class_name, str_size(class_name)); + aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, + devman_handle, &answer); + + sysarg_t retval = async_data_write_start(phone, class_name, + str_size(class_name)); if (retval != EOK) { async_wait_for(req, NULL); @@ -212,5 +235,5 @@ async_serialize_end(); - return retval; + return retval; } @@ -265,5 +288,6 @@ } -int devman_device_get_handle(const char *pathname, devman_handle_t *handle, unsigned int flags) +int devman_device_get_handle(const char *pathname, devman_handle_t *handle, + unsigned int flags) { int phone = devman_get_phone(DEVMAN_CLIENT, flags); @@ -278,5 +302,6 @@ &answer); - sysarg_t retval = async_data_write_start(phone, pathname, str_size(pathname)); + sysarg_t retval = async_data_write_start(phone, pathname, + str_size(pathname)); if (retval != EOK) { async_wait_for(req, NULL); Index: uspace/lib/c/generic/fibril.c =================================================================== --- uspace/lib/c/generic/fibril.c (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/generic/fibril.c (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -115,4 +115,6 @@ fibril->retval = 0; fibril->flags = 0; + + fibril->waits_for = NULL; return fibril; @@ -276,6 +278,4 @@ fibril->arg = arg; - fibril->waits_for = NULL; - context_save(&fibril->ctx); context_set(&fibril->ctx, FADDR(fibril_main), fibril->stack, Index: uspace/lib/c/generic/loader.c =================================================================== --- uspace/lib/c/generic/loader.c (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/generic/loader.c (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -160,4 +160,5 @@ int rc = async_data_write_start(ldr->phone_id, (void *) pa, pa_len); if (rc != EOK) { + free(pa); async_wait_for(req, NULL); return rc; Index: uspace/lib/c/generic/malloc.c =================================================================== --- uspace/lib/c/generic/malloc.c (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/generic/malloc.c (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -47,33 +47,77 @@ #include "private/malloc.h" -/* Magic used in heap headers. */ -#define HEAP_BLOCK_HEAD_MAGIC 0xBEEF0101 - -/* Magic used in heap footers. */ -#define HEAP_BLOCK_FOOT_MAGIC 0xBEEF0202 - -/** Allocation alignment (this also covers the alignment of fields - in the heap header and footer) */ +/** Magic used in heap headers. */ +#define HEAP_BLOCK_HEAD_MAGIC UINT32_C(0xBEEF0101) + +/** Magic used in heap footers. */ +#define HEAP_BLOCK_FOOT_MAGIC UINT32_C(0xBEEF0202) + +/** Magic used in heap descriptor. */ +#define HEAP_AREA_MAGIC UINT32_C(0xBEEFCAFE) + +/** Allocation alignment. + * + * This also covers the alignment of fields + * in the heap header and footer. + * + */ #define BASE_ALIGN 16 -/** - * Either 4 * 256M on 32-bit architecures or 16 * 256M on 64-bit architectures - */ -#define MAX_HEAP_SIZE (sizeof(uintptr_t) << 28) - -/** - * - */ -#define STRUCT_OVERHEAD (sizeof(heap_block_head_t) + sizeof(heap_block_foot_t)) - -/** - * Calculate real size of a heap block (with header and footer) +/** Overhead of each heap block. */ +#define STRUCT_OVERHEAD \ + (sizeof(heap_block_head_t) + sizeof(heap_block_foot_t)) + +/** Calculate real size of a heap block. + * + * Add header and footer size. + * */ #define GROSS_SIZE(size) ((size) + STRUCT_OVERHEAD) -/** - * Calculate net size of a heap block (without header and footer) +/** Calculate net size of a heap block. + * + * Subtract header and footer size. + * */ #define NET_SIZE(size) ((size) - STRUCT_OVERHEAD) + +/** Get first block in heap area. + * + */ +#define AREA_FIRST_BLOCK(area) \ + (ALIGN_UP(((uintptr_t) (area)) + sizeof(heap_area_t), BASE_ALIGN)) + +/** Get footer in heap block. + * + */ +#define BLOCK_FOOT(head) \ + ((heap_block_foot_t *) \ + (((uintptr_t) head) + head->size - sizeof(heap_block_foot_t))) + +/** Heap area. + * + * The memory managed by the heap allocator is divided into + * multiple discontinuous heaps. Each heap is represented + * by a separate address space area which has this structure + * at its very beginning. + * + */ +typedef struct heap_area { + /** Start of the heap area (including this structure) + * + * Aligned on page boundary. + * + */ + void *start; + + /** End of the heap area (aligned on page boundary) */ + void *end; + + /** Next heap area */ + struct heap_area *next; + + /** A magic value */ + uint32_t magic; +} heap_area_t; /** Header of a heap block @@ -87,4 +131,7 @@ bool free; + /** Heap area this block belongs to */ + heap_area_t *area; + /* A magic value to detect overwrite of heap header */ uint32_t magic; @@ -102,25 +149,19 @@ } heap_block_foot_t; -/** Linker heap symbol */ -extern char _heap; +/** First heap area */ +static heap_area_t *first_heap_area = NULL; + +/** Last heap area */ +static heap_area_t *last_heap_area = NULL; + +/** Next heap block to examine (next fit algorithm) */ +static heap_block_head_t *next = NULL; /** Futex for thread-safe heap manipulation */ static futex_t malloc_futex = FUTEX_INITIALIZER; -/** Address of heap start */ -static void *heap_start = 0; - -/** Address of heap end */ -static void *heap_end = 0; - -/** Maximum heap size */ -static size_t max_heap_size = (size_t) -1; - -/** Current number of pages of heap area */ -static size_t heap_pages = 0; - /** Initialize a heap block * - * Fills in the structures related to a heap block. + * Fill in the structures related to a heap block. * Should be called only inside the critical section. * @@ -128,16 +169,18 @@ * @param size Size of the block including the header and the footer. * @param free Indication of a free block. - * - */ -static void block_init(void *addr, size_t size, bool free) + * @param area Heap area the block belongs to. + * + */ +static void block_init(void *addr, size_t size, bool free, heap_area_t *area) { /* Calculate the position of the header and the footer */ heap_block_head_t *head = (heap_block_head_t *) addr; - heap_block_foot_t *foot = - (heap_block_foot_t *) (addr + size - sizeof(heap_block_foot_t)); head->size = size; head->free = free; + head->area = area; head->magic = HEAP_BLOCK_HEAD_MAGIC; + + heap_block_foot_t *foot = BLOCK_FOOT(head); foot->size = size; @@ -160,6 +203,5 @@ assert(head->magic == HEAP_BLOCK_HEAD_MAGIC); - heap_block_foot_t *foot = - (heap_block_foot_t *) (addr + head->size - sizeof(heap_block_foot_t)); + heap_block_foot_t *foot = BLOCK_FOOT(head); assert(foot->magic == HEAP_BLOCK_FOOT_MAGIC); @@ -167,49 +209,130 @@ } -/** Increase the heap area size - * - * Should be called only inside the critical section. - * - * @param size Number of bytes to grow the heap by. - * - */ -static bool grow_heap(size_t size) +/** Check a heap area structure + * + * @param addr Address of the heap area. + * + */ +static void area_check(void *addr) +{ + heap_area_t *area = (heap_area_t *) addr; + + assert(area->magic == HEAP_AREA_MAGIC); + assert(area->start < area->end); + assert(((uintptr_t) area->start % PAGE_SIZE) == 0); + assert(((uintptr_t) area->end % PAGE_SIZE) == 0); +} + +/** Create new heap area + * + * @param start Preffered starting address of the new area. + * @param size Size of the area. + * + */ +static bool area_create(size_t size) +{ + void *start = as_get_mappable_page(size); + if (start == NULL) + return false; + + /* Align the heap area on page boundary */ + void *astart = (void *) ALIGN_UP((uintptr_t) start, PAGE_SIZE); + size_t asize = ALIGN_UP(size, PAGE_SIZE); + + astart = as_area_create(astart, asize, AS_AREA_WRITE | AS_AREA_READ); + if (astart == (void *) -1) + return false; + + heap_area_t *area = (heap_area_t *) astart; + + area->start = astart; + area->end = (void *) + ALIGN_DOWN((uintptr_t) astart + asize, BASE_ALIGN); + area->next = NULL; + area->magic = HEAP_AREA_MAGIC; + + void *block = (void *) AREA_FIRST_BLOCK(area); + size_t bsize = (size_t) (area->end - block); + + block_init(block, bsize, true, area); + + if (last_heap_area == NULL) { + first_heap_area = area; + last_heap_area = area; + } else { + last_heap_area->next = area; + last_heap_area = area; + } + + return true; +} + +/** Try to enlarge a heap area + * + * @param area Heap area to grow. + * @param size Gross size of item to allocate (bytes). + * + */ +static bool area_grow(heap_area_t *area, size_t size) { if (size == 0) + return true; + + area_check(area); + + size_t asize = ALIGN_UP((size_t) (area->end - area->start) + size, + PAGE_SIZE); + + /* New heap area size */ + void *end = (void *) + ALIGN_DOWN((uintptr_t) area->start + asize, BASE_ALIGN); + + /* Check for overflow */ + if (end < area->start) return false; - - if ((heap_start + size < heap_start) || (heap_end + size < heap_end)) + + /* Resize the address space area */ + int ret = as_area_resize(area->start, asize, 0); + if (ret != EOK) return false; - size_t heap_size = (size_t) (heap_end - heap_start); - - if ((max_heap_size != (size_t) -1) && (heap_size + size > max_heap_size)) - return false; - - size_t pages = (size - 1) / PAGE_SIZE + 1; - - if (as_area_resize((void *) &_heap, (heap_pages + pages) * PAGE_SIZE, 0) - == EOK) { - void *end = (void *) ALIGN_DOWN(((uintptr_t) &_heap) + - (heap_pages + pages) * PAGE_SIZE, BASE_ALIGN); - block_init(heap_end, end - heap_end, true); - heap_pages += pages; - heap_end = end; + /* Add new free block */ + block_init(area->end, (size_t) (end - area->end), true, area); + + /* Update heap area parameters */ + area->end = end; + + return true; +} + +/** Try to enlarge any of the heap areas + * + * @param size Gross size of item to allocate (bytes). + * + */ +static bool heap_grow(size_t size) +{ + if (size == 0) return true; - } - - return false; -} - -/** Decrease the heap area - * - * Should be called only inside the critical section. - * - * @param size Number of bytes to shrink the heap by. - * - */ -static void shrink_heap(void) -{ - // TODO + + /* First try to enlarge some existing area */ + heap_area_t *area; + for (area = first_heap_area; area != NULL; area = area->next) { + if (area_grow(area, size)) + return true; + } + + /* Eventually try to create a new area */ + return area_create(AREA_FIRST_BLOCK(size)); +} + +/** Try to shrink heap space + * + * In all cases the next pointer is reset. + * + */ +static void heap_shrink(void) +{ + next = NULL; } @@ -223,33 +346,6 @@ void __malloc_init(void) { - if (!as_area_create((void *) &_heap, PAGE_SIZE, - AS_AREA_WRITE | AS_AREA_READ)) + if (!area_create(PAGE_SIZE)) abort(); - - heap_pages = 1; - heap_start = (void *) ALIGN_UP((uintptr_t) &_heap, BASE_ALIGN); - heap_end = - (void *) ALIGN_DOWN(((uintptr_t) &_heap) + PAGE_SIZE, BASE_ALIGN); - - /* Make the entire area one large block. */ - block_init(heap_start, heap_end - heap_start, true); -} - -/** Get maximum heap address - * - */ -uintptr_t get_max_heap_addr(void) -{ - futex_down(&malloc_futex); - - if (max_heap_size == (size_t) -1) - max_heap_size = - max((size_t) (heap_end - heap_start), MAX_HEAP_SIZE); - - uintptr_t max_heap_addr = (uintptr_t) heap_start + max_heap_size; - - futex_up(&malloc_futex); - - return max_heap_addr; } @@ -273,6 +369,6 @@ /* Block big enough -> split. */ void *next = ((void *) cur) + size; - block_init(next, cur->size - size, true); - block_init(cur, size, false); + block_init(next, cur->size - size, true, cur->area); + block_init(cur, size, false, cur->area); } else { /* Block too small -> use as is. */ @@ -281,43 +377,53 @@ } -/** Allocate a memory block +/** Allocate memory from heap area starting from given block * * Should be called only inside the critical section. - * - * @param size The size of the block to allocate. - * @param align Memory address alignment. - * - * @return the address of the block or NULL when not enough memory. - * - */ -static void *malloc_internal(const size_t size, const size_t align) -{ - if (align == 0) - return NULL; - - size_t falign = lcm(align, BASE_ALIGN); - size_t real_size = GROSS_SIZE(ALIGN_UP(size, falign)); - - bool grown = false; - void *result; - -loop: - result = NULL; - heap_block_head_t *cur = (heap_block_head_t *) heap_start; - - while ((result == NULL) && ((void *) cur < heap_end)) { + * As a side effect this function also sets the current + * pointer on successful allocation. + * + * @param area Heap area where to allocate from. + * @param first_block Starting heap block. + * @param final_block Heap block where to finish the search + * (may be NULL). + * @param real_size Gross number of bytes to allocate. + * @param falign Physical alignment of the block. + * + * @return Address of the allocated block or NULL on not enough memory. + * + */ +static void *malloc_area(heap_area_t *area, heap_block_head_t *first_block, + heap_block_head_t *final_block, size_t real_size, size_t falign) +{ + area_check((void *) area); + assert((void *) first_block >= (void *) AREA_FIRST_BLOCK(area)); + assert((void *) first_block < area->end); + + heap_block_head_t *cur; + for (cur = first_block; (void *) cur < area->end; + cur = (heap_block_head_t *) (((void *) cur) + cur->size)) { block_check(cur); + + /* Finish searching on the final block */ + if ((final_block != NULL) && (cur == final_block)) + break; /* Try to find a block that is free and large enough. */ if ((cur->free) && (cur->size >= real_size)) { - /* We have found a suitable block. - Check for alignment properties. */ - void *addr = ((void *) cur) + sizeof(heap_block_head_t); - void *aligned = (void *) ALIGN_UP(addr, falign); + /* + * We have found a suitable block. + * Check for alignment properties. + */ + void *addr = (void *) + ((uintptr_t) cur + sizeof(heap_block_head_t)); + void *aligned = (void *) + ALIGN_UP((uintptr_t) addr, falign); if (addr == aligned) { /* Exact block start including alignment. */ split_mark(cur, real_size); - result = addr; + + next = cur; + return addr; } else { /* Block start has to be aligned */ @@ -325,15 +431,19 @@ if (cur->size >= real_size + excess) { - /* The current block is large enough to fit - data in including alignment */ - if ((void *) cur > heap_start) { - /* There is a block before the current block. - This previous block can be enlarged to compensate - for the alignment excess */ - heap_block_foot_t *prev_foot = - ((void *) cur) - sizeof(heap_block_foot_t); + /* + * The current block is large enough to fit + * data in (including alignment). + */ + if ((void *) cur > (void *) AREA_FIRST_BLOCK(area)) { + /* + * There is a block before the current block. + * This previous block can be enlarged to + * compensate for the alignment excess. + */ + heap_block_foot_t *prev_foot = (heap_block_foot_t *) + ((void *) cur - sizeof(heap_block_foot_t)); - heap_block_head_t *prev_head = - (heap_block_head_t *) (((void *) cur) - prev_foot->size); + heap_block_head_t *prev_head = (heap_block_head_t *) + ((void *) cur - prev_foot->size); block_check(prev_head); @@ -342,25 +452,38 @@ heap_block_head_t *next_head = ((void *) cur) + excess; - if ((!prev_head->free) && (excess >= STRUCT_OVERHEAD)) { - /* The previous block is not free and there is enough - space to fill in a new free block between the previous - and current block */ - block_init(cur, excess, true); + if ((!prev_head->free) && + (excess >= STRUCT_OVERHEAD)) { + /* + * The previous block is not free and there + * is enough free space left to fill in + * a new free block between the previous + * and current block. + */ + block_init(cur, excess, true, area); } else { - /* The previous block is free (thus there is no need to - induce additional fragmentation to the heap) or the - excess is small, thus just enlarge the previous block */ - block_init(prev_head, prev_head->size + excess, prev_head->free); + /* + * The previous block is free (thus there + * is no need to induce additional + * fragmentation to the heap) or the + * excess is small. Therefore just enlarge + * the previous block. + */ + block_init(prev_head, prev_head->size + excess, + prev_head->free, area); } - block_init(next_head, reduced_size, true); + block_init(next_head, reduced_size, true, area); split_mark(next_head, real_size); - result = aligned; - cur = next_head; + + next = next_head; + return aligned; } else { - /* The current block is the first block on the heap. - We have to make sure that the alignment excess - is large enough to fit a new free block just - before the current block */ + /* + * The current block is the first block + * in the heap area. We have to make sure + * that the alignment excess is large enough + * to fit a new free block just before the + * current block. + */ while (excess < STRUCT_OVERHEAD) { aligned += falign; @@ -371,10 +494,14 @@ if (cur->size >= real_size + excess) { size_t reduced_size = cur->size - excess; - cur = (heap_block_head_t *) (heap_start + excess); + cur = (heap_block_head_t *) + (AREA_FIRST_BLOCK(area) + excess); - block_init(heap_start, excess, true); - block_init(cur, reduced_size, true); + block_init((void *) AREA_FIRST_BLOCK(area), excess, + true, area); + block_init(cur, reduced_size, true, area); split_mark(cur, real_size); - result = aligned; + + next = cur; + return aligned; } } @@ -382,17 +509,67 @@ } } - - /* Advance to the next block. */ - cur = (heap_block_head_t *) (((void *) cur) + cur->size); - } - - if ((result == NULL) && (!grown)) { - if (grow_heap(real_size)) { - grown = true; + } + + return NULL; +} + +/** Allocate a memory block + * + * Should be called only inside the critical section. + * + * @param size The size of the block to allocate. + * @param align Memory address alignment. + * + * @return Address of the allocated block or NULL on not enough memory. + * + */ +static void *malloc_internal(const size_t size, const size_t align) +{ + assert(first_heap_area != NULL); + + if (align == 0) + return NULL; + + size_t falign = lcm(align, BASE_ALIGN); + size_t real_size = GROSS_SIZE(ALIGN_UP(size, falign)); + + bool retry = false; + heap_block_head_t *split; + +loop: + + /* Try the next fit approach */ + split = next; + + if (split != NULL) { + void *addr = malloc_area(split->area, split, NULL, real_size, + falign); + + if (addr != NULL) + return addr; + } + + /* Search the entire heap */ + heap_area_t *area; + for (area = first_heap_area; area != NULL; area = area->next) { + heap_block_head_t *first = (heap_block_head_t *) + AREA_FIRST_BLOCK(area); + + void *addr = malloc_area(area, first, split, real_size, + falign); + + if (addr != NULL) + return addr; + } + + if (!retry) { + /* Try to grow the heap space */ + if (heap_grow(real_size)) { + retry = true; goto loop; } } - return result; + return NULL; } @@ -473,9 +650,12 @@ (heap_block_head_t *) (addr - sizeof(heap_block_head_t)); - assert((void *) head >= heap_start); - assert((void *) head < heap_end); - block_check(head); assert(!head->free); + + heap_area_t *area = head->area; + + area_check(area); + assert((void *) head >= (void *) AREA_FIRST_BLOCK(area)); + assert((void *) head < area->end); void *ptr = NULL; @@ -487,29 +667,34 @@ /* Shrink */ if (orig_size - real_size >= STRUCT_OVERHEAD) { - /* Split the original block to a full block - and a trailing free block */ - block_init((void *) head, real_size, false); + /* + * Split the original block to a full block + * and a trailing free block. + */ + block_init((void *) head, real_size, false, area); block_init((void *) head + real_size, - orig_size - real_size, true); - shrink_heap(); + orig_size - real_size, true, area); + heap_shrink(); } ptr = ((void *) head) + sizeof(heap_block_head_t); } else { - /* Look at the next block. If it is free and the size is - sufficient then merge the two. Otherwise just allocate - a new block, copy the original data into it and - free the original block. */ + /* + * Look at the next block. If it is free and the size is + * sufficient then merge the two. Otherwise just allocate + * a new block, copy the original data into it and + * free the original block. + */ heap_block_head_t *next_head = (heap_block_head_t *) (((void *) head) + head->size); - if (((void *) next_head < heap_end) && + if (((void *) next_head < area->end) && (head->size + next_head->size >= real_size) && (next_head->free)) { block_check(next_head); - block_init(head, head->size + next_head->size, false); + block_init(head, head->size + next_head->size, false, area); split_mark(head, real_size); ptr = ((void *) head) + sizeof(heap_block_head_t); + next = NULL; } else reloc = true; @@ -542,9 +727,12 @@ = (heap_block_head_t *) (addr - sizeof(heap_block_head_t)); - assert((void *) head >= heap_start); - assert((void *) head < heap_end); - block_check(head); assert(!head->free); + + heap_area_t *area = head->area; + + area_check(area); + assert((void *) head >= (void *) AREA_FIRST_BLOCK(area)); + assert((void *) head < area->end); /* Mark the block itself as free. */ @@ -555,12 +743,12 @@ = (heap_block_head_t *) (((void *) head) + head->size); - if ((void *) next_head < heap_end) { + if ((void *) next_head < area->end) { block_check(next_head); if (next_head->free) - block_init(head, head->size + next_head->size, true); + block_init(head, head->size + next_head->size, true, area); } /* Look at the previous block. If it is free, merge the two. */ - if ((void *) head > heap_start) { + if ((void *) head > (void *) AREA_FIRST_BLOCK(area)) { heap_block_foot_t *prev_foot = (heap_block_foot_t *) (((void *) head) - sizeof(heap_block_foot_t)); @@ -572,8 +760,9 @@ if (prev_head->free) - block_init(prev_head, prev_head->size + head->size, true); - } - - shrink_heap(); + block_init(prev_head, prev_head->size + head->size, true, + area); + } + + heap_shrink(); futex_up(&malloc_futex); Index: uspace/lib/c/generic/private/libc.h =================================================================== --- uspace/lib/c/generic/private/libc.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/generic/private/libc.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -36,6 +36,7 @@ #define LIBC_PRIVATE_LIBC_H_ +extern void __entry(void); +extern void __main(void *) __attribute__((noreturn)); extern int main(int, char *[]); -extern void __main(void *) __attribute__((noreturn)); #endif Index: uspace/lib/c/include/as.h =================================================================== --- uspace/lib/c/include/as.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/include/as.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -41,4 +41,17 @@ #include +static inline size_t SIZE2PAGES(size_t size) +{ + if (size == 0) + return 0; + + return (size_t) ((size - 1) >> PAGE_WIDTH) + 1; +} + +static inline size_t PAGES2SIZE(size_t pages) +{ + return (size_t) (pages << PAGE_WIDTH); +} + extern void *as_area_create(void *address, size_t size, int flags); extern int as_area_resize(void *address, size_t size, int flags); Index: uspace/lib/c/include/devman.h =================================================================== --- uspace/lib/c/include/devman.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/include/devman.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -45,5 +45,5 @@ extern int devman_driver_register(const char *, async_client_conn_t); -extern int devman_child_device_register(const char *, match_id_list_t *, +extern int devman_add_function(const char *, fun_type_t, match_id_list_t *, devman_handle_t, devman_handle_t *); Index: uspace/lib/c/include/ipc/devman.h =================================================================== --- uspace/lib/c/include/ipc/devman.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/include/ipc/devman.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -42,4 +42,13 @@ typedef sysarg_t devman_handle_t; + +typedef enum { + /** Invalid value for debugging purposes */ + fun_invalid = 0, + /** Function to which child devices attach */ + fun_inner, + /** Fuction exported to external clients (leaf function) */ + fun_exposed +} fun_type_t; /** Ids of device models used for device-to-driver matching. @@ -127,5 +136,5 @@ typedef enum { DEVMAN_DRIVER_REGISTER = IPC_FIRST_USER_METHOD, - DEVMAN_ADD_CHILD_DEVICE, + DEVMAN_ADD_FUNCTION, DEVMAN_ADD_MATCH_ID, DEVMAN_ADD_DEVICE_TO_CLASS Index: uspace/lib/c/include/limits.h =================================================================== --- uspace/lib/c/include/limits.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,74 +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. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_LIMITS_H_ -#define LIBC_LIMITS_H_ - -#include -#include - -/* char */ -#define SCHAR_MIN MIN_INT8 -#define SCHAR_MAX MAX_INT8 -#define UCHAR_MIN MIN_UINT8 -#define UCHAR_MAX MAX_UINT8 - -#ifdef __CHAR_UNSIGNED__ -# define CHAR_MIN UCHAR_MIN -# define CHAR_MAX UCHAR_MAX -#else -# define CHAR_MIN SCHAR_MIN -# define CHAR_MAX SCHAR_MAX -#endif - -/* short int */ -#define SHRT_MIN MIN_INT16 -#define SHRT_MAX MAX_INT16 -#define USHRT_MIN MIN_UINT16 -#define USHRT_MAX MAX_UINT16 - -#define INT_MIN MIN_INT32 -#define INT_MAX MAX_INT32 -#define UINT_MIN MIN_UINT32 -#define UINT_MAX MAX_UINT32 - -#define LLONG_MIN MIN_INT64 -#define LLONG_MAX MAX_INT64 -#define ULLONG_MIN MIN_UINT64 -#define ULLONG_MAX MAX_UINT64 - -#endif - -/** @} - */ Index: uspace/lib/c/include/malloc.h =================================================================== --- uspace/lib/c/include/malloc.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/include/malloc.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -38,6 +38,4 @@ #include -extern uintptr_t get_max_heap_addr(void); - extern void *malloc(const size_t size) __attribute__((malloc)); Index: uspace/lib/c/include/unistd.h =================================================================== --- uspace/lib/c/include/unistd.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/c/include/unistd.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -44,6 +44,4 @@ #endif -#define getpagesize() (PAGE_SIZE) - #ifndef SEEK_SET #define SEEK_SET 0 @@ -57,4 +55,6 @@ #define SEEK_END 2 #endif + +#define getpagesize() (PAGE_SIZE) extern int dup2(int oldfd, int newfd); Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/drv/generic/driver.c (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -1,4 +1,5 @@ /* * Copyright (c) 2010 Lenka Trochtova + * Copyright (c) 2011 Jiri Svoboda * All rights reserved. * @@ -49,9 +50,11 @@ #include #include +#include #include #include "dev_iface.h" -#include "driver.h" +#include "ddf/driver.h" +#include "ddf/interrupt.h" /** Driver structure */ @@ -59,6 +62,6 @@ /** Devices */ -LIST_INITIALIZE(devices); -FIBRIL_MUTEX_INITIALIZE(devices_mutex); +LIST_INITIALIZE(functions); +FIBRIL_MUTEX_INITIALIZE(functions_mutex); /** Interrupts */ @@ -76,4 +79,8 @@ }; +static ddf_dev_t *create_device(void); +static void delete_device(ddf_dev_t *); +static remote_handler_t *function_get_default_handler(ddf_fun_t *); +static void *function_get_ops(ddf_fun_t *, dev_inferface_idx_t); static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall) @@ -150,5 +157,5 @@ interrupt_context_t * -find_interrupt_context(interrupt_context_list_t *list, device_t *dev, int irq) +find_interrupt_context(interrupt_context_list_t *list, ddf_dev_t *dev, int irq) { fibril_mutex_lock(&list->mutex); @@ -172,5 +179,5 @@ int -register_interrupt_handler(device_t *dev, int irq, interrupt_handler_t *handler, +register_interrupt_handler(ddf_dev_t *dev, int irq, interrupt_handler_t *handler, irq_code_t *pseudocode) { @@ -195,5 +202,5 @@ } -int unregister_interrupt_handler(device_t *dev, int irq) +int unregister_interrupt_handler(ddf_dev_t *dev, int irq) { interrupt_context_t *ctx = find_interrupt_context(&interrupt_contexts, @@ -209,35 +216,36 @@ } -static void add_to_devices_list(device_t *dev) -{ - fibril_mutex_lock(&devices_mutex); - list_append(&dev->link, &devices); - fibril_mutex_unlock(&devices_mutex); -} - -static void remove_from_devices_list(device_t *dev) -{ - fibril_mutex_lock(&devices_mutex); - list_remove(&dev->link); - fibril_mutex_unlock(&devices_mutex); -} - -static device_t *driver_get_device(link_t *devices, devman_handle_t handle) -{ - device_t *dev = NULL; - - fibril_mutex_lock(&devices_mutex); - link_t *link = devices->next; - - while (link != devices) { - dev = list_get_instance(link, device_t, link); - if (dev->handle == handle) { - fibril_mutex_unlock(&devices_mutex); - return dev; +static void add_to_functions_list(ddf_fun_t *fun) +{ + fibril_mutex_lock(&functions_mutex); + list_append(&fun->link, &functions); + fibril_mutex_unlock(&functions_mutex); +} + +static void remove_from_functions_list(ddf_fun_t *fun) +{ + fibril_mutex_lock(&functions_mutex); + list_remove(&fun->link); + fibril_mutex_unlock(&functions_mutex); +} + +static ddf_fun_t *driver_get_function(link_t *functions, devman_handle_t handle) +{ + ddf_fun_t *fun = NULL; + + fibril_mutex_lock(&functions_mutex); + link_t *link = functions->next; + + while (link != functions) { + fun = list_get_instance(link, ddf_fun_t, link); + if (fun->handle == handle) { + fibril_mutex_unlock(&functions_mutex); + return fun; } + link = link->next; } - fibril_mutex_unlock(&devices_mutex); + fibril_mutex_unlock(&functions_mutex); return NULL; @@ -250,14 +258,17 @@ devman_handle_t dev_handle = IPC_GET_ARG1(*icall); - devman_handle_t parent_dev_handle = IPC_GET_ARG2(*icall); - - device_t *dev = create_device(); + devman_handle_t parent_fun_handle = IPC_GET_ARG2(*icall); + + ddf_dev_t *dev = create_device(); dev->handle = dev_handle; - + async_data_write_accept((void **) &dev_name, true, 0, 0, 0, 0); dev->name = dev_name; - - add_to_devices_list(dev); - dev->parent = driver_get_device(&devices, parent_dev_handle); + + /* + * Currently not used, parent fun handle is stored in context + * of the connection to the parent device driver. + */ + (void) parent_fun_handle; res = driver->driver_ops->add_device(dev); @@ -268,5 +279,4 @@ printf("%s: failed to add a new device with handle = %" PRIun ".\n", driver->name, dev_handle); - remove_from_devices_list(dev); delete_device(dev); } @@ -311,8 +321,8 @@ */ devman_handle_t handle = IPC_GET_ARG2(*icall); - device_t *dev = driver_get_device(&devices, handle); - - if (dev == NULL) { - printf("%s: driver_connection_gen error - no device with handle" + ddf_fun_t *fun = driver_get_function(&functions, handle); + + if (fun == NULL) { + printf("%s: driver_connection_gen error - no function with handle" " %" PRIun " was found.\n", driver->name, handle); async_answer_0(iid, ENOENT); @@ -327,7 +337,7 @@ int ret = EOK; - /* open the device */ - if (dev->ops != NULL && dev->ops->open != NULL) - ret = (*dev->ops->open)(dev); + /* Open device function */ + if (fun->ops != NULL && fun->ops->open != NULL) + ret = (*fun->ops->open)(fun); async_answer_0(iid, ret); @@ -344,7 +354,7 @@ switch (method) { case IPC_M_PHONE_HUNGUP: - /* close the device */ - if (dev->ops != NULL && dev->ops->close != NULL) - (*dev->ops->close)(dev); + /* Close device function */ + if (fun->ops != NULL && fun->ops->close != NULL) + (*fun->ops->close)(fun); async_answer_0(callid, EOK); return; @@ -356,11 +366,12 @@ if (!is_valid_iface_idx(iface_idx)) { remote_handler_t *default_handler = - device_get_default_handler(dev); + function_get_default_handler(fun); if (default_handler != NULL) { - (*default_handler)(dev, callid, &call); + (*default_handler)(fun, callid, &call); break; } + /* - * This is not device's interface and the + * Function has no such interface and * default handler is not provided. */ @@ -372,12 +383,12 @@ } - /* calling one of the device's interfaces */ + /* calling one of the function's interfaces */ /* Get the interface ops structure. */ - void *ops = device_get_ops(dev, iface_idx); + void *ops = function_get_ops(fun, iface_idx); if (ops == NULL) { printf("%s: driver_connection_gen error - ", driver->name); - printf("device with handle %" PRIun " has no interface " + printf("Function with handle %" PRIun " has no interface " "with id %d.\n", handle, iface_idx); async_answer_0(callid, ENOTSUP); @@ -408,7 +419,7 @@ * receive parameters from the remote client and it will * pass it to the corresponding local interface method - * associated with the device by its driver. + * associated with the function by its driver. */ - (*iface_method_ptr)(dev, ops, callid, &call); + (*iface_method_ptr)(fun, ops, callid, &call); break; } @@ -425,5 +436,4 @@ driver_connection_gen(iid, icall, false); } - /** Function for handling connections to device driver. */ @@ -454,120 +464,200 @@ * @return The device structure. */ -device_t *create_device(void) -{ - device_t *dev = malloc(sizeof(device_t)); - - if (dev != NULL) { - memset(dev, 0, sizeof(device_t)); - init_match_ids(&dev->match_ids); - } - +static ddf_dev_t *create_device(void) +{ + ddf_dev_t *dev; + + dev = malloc(sizeof(ddf_dev_t)); + if (dev == NULL) + return NULL; + + memset(dev, 0, sizeof(ddf_dev_t)); return dev; } +/** Create new function structure. + * + * @return The device structure. + */ +static ddf_fun_t *create_function(void) +{ + ddf_fun_t *fun; + + fun = calloc(1, sizeof(ddf_fun_t)); + if (fun == NULL) + return NULL; + + init_match_ids(&fun->match_ids); + link_initialize(&fun->link); + + return fun; +} + /** Delete device structure. * * @param dev The device structure. */ -void delete_device(device_t *dev) -{ - clean_match_ids(&dev->match_ids); - if (dev->name != NULL) - free(dev->name); +static void delete_device(ddf_dev_t *dev) +{ free(dev); } -void *device_get_ops(device_t *dev, dev_inferface_idx_t idx) +/** Delete device structure. + * + * @param dev The device structure. + */ +static void delete_function(ddf_fun_t *fun) +{ + clean_match_ids(&fun->match_ids); + if (fun->name != NULL) + free(fun->name); + free(fun); +} + +/** Create a DDF function node. + * + * Create a DDF function (in memory). Both child devices and external clients + * communicate with a device via its functions. + * + * The created function node is fully formed, but only exists in the memory + * of the client task. In order to be visible to the system, the function + * must be bound using ddf_fun_bind(). + * + * This function should only fail if there is not enough free memory. + * Specifically, this function succeeds even if @a dev already has + * a (bound) function with the same name. + * + * Type: A function of type fun_inner indicates that DDF should attempt + * to attach child devices to the function. fun_exposed means that + * the function should be exported to external clients (applications). + * + * @param dev Device to which we are adding function + * @param ftype Type of function (fun_inner or fun_exposed) + * @param name Name of function + * + * @return New function or @c NULL if memory is not available + */ +ddf_fun_t *ddf_fun_create(ddf_dev_t *dev, fun_type_t ftype, const char *name) +{ + ddf_fun_t *fun; + + fun = create_function(); + if (fun == NULL) + return NULL; + + fun->bound = false; + fun->dev = dev; + fun->ftype = ftype; + + fun->name = str_dup(name); + if (fun->name == NULL) { + delete_function(fun); + return NULL; + } + + return fun; +} + +/** Destroy DDF function node. + * + * Destroy a function previously created with ddf_fun_create(). The function + * must not be bound. + * + * @param fun Function to destroy + */ +void ddf_fun_destroy(ddf_fun_t *fun) +{ + assert(fun->bound == false); + delete_function(fun); +} + +static void *function_get_ops(ddf_fun_t *fun, dev_inferface_idx_t idx) { assert(is_valid_iface_idx(idx)); - if (dev->ops == NULL) + if (fun->ops == NULL) return NULL; - return dev->ops->interfaces[idx]; -} - -int child_device_register(device_t *child, device_t *parent) -{ - assert(child->name != NULL); + return fun->ops->interfaces[idx]; +} + +/** Bind a function node. + * + * Bind the specified function to the system. This effectively makes + * the function visible to the system (uploads it to the server). + * + * This function can fail for several reasons. Specifically, + * it will fail if the device already has a bound function of + * the same name. + * + * @param fun Function to bind + * @return EOK on success or negative error code + */ +int ddf_fun_bind(ddf_fun_t *fun) +{ + assert(fun->name != NULL); int res; - add_to_devices_list(child); - res = devman_child_device_register(child->name, &child->match_ids, - parent->handle, &child->handle); + add_to_functions_list(fun); + res = devman_add_function(fun->name, fun->ftype, &fun->match_ids, + fun->dev->handle, &fun->handle); if (res != EOK) { - remove_from_devices_list(child); + remove_from_functions_list(fun); return res; } + fun->bound = true; return res; } -/** Wrapper for child_device_register for devices with single match id. - * - * @param parent Parent device. - * @param child_name Child device name. - * @param child_match_id Child device match id. - * @param child_match_score Child device match score. - * @return Error code. - */ -int child_device_register_wrapper(device_t *parent, const char *child_name, - const char *child_match_id, int child_match_score) -{ - device_t *child = NULL; - match_id_t *match_id = NULL; - int rc; - - child = create_device(); - if (child == NULL) { - rc = ENOMEM; - goto failure; - } - - child->name = child_name; +/** Add single match ID to inner function. + * + * Construct and add a single match ID to the specified function. + * Cannot be called when the function node is bound. + * + * @param fun Function + * @param match_id_str Match string + * @param match_score Match score + * @return EOK on success, ENOMEM if out of memory. + */ +int ddf_fun_add_match_id(ddf_fun_t *fun, const char *match_id_str, + int match_score) +{ + match_id_t *match_id; + + assert(fun->bound == false); + assert(fun->ftype == fun_inner); match_id = create_match_id(); - if (match_id == NULL) { - rc = ENOMEM; - goto failure; - } - - match_id->id = child_match_id; - match_id->score = child_match_score; - add_match_id(&child->match_ids, match_id); - - rc = child_device_register(child, parent); - if (rc != EOK) - goto failure; - + if (match_id == NULL) + return ENOMEM; + + match_id->id = match_id_str; + match_id->score = 90; + + add_match_id(&fun->match_ids, match_id); return EOK; - -failure: - if (match_id != NULL) { - match_id->id = NULL; - delete_match_id(match_id); - } - - if (child != NULL) { - child->name = NULL; - delete_device(child); - } - - return rc; } /** Get default handler for client requests */ -remote_handler_t *device_get_default_handler(device_t *dev) -{ - if (dev->ops == NULL) +static remote_handler_t *function_get_default_handler(ddf_fun_t *fun) +{ + if (fun->ops == NULL) return NULL; - return dev->ops->default_handler; -} - -int add_device_to_class(device_t *dev, const char *class_name) -{ - return devman_add_device_to_class(dev->handle, class_name); -} - -int driver_main(driver_t *drv) + return fun->ops->default_handler; +} + +/** Add exposed function to class. + * + * Must only be called when the function is bound. + */ +int ddf_fun_add_to_class(ddf_fun_t *fun, const char *class_name) +{ + assert(fun->bound == true); + assert(fun->ftype == fun_exposed); + + return devman_add_device_to_class(fun->handle, class_name); +} + +int ddf_driver_main(driver_t *drv) { /* Index: uspace/lib/drv/generic/remote_char_dev.c =================================================================== --- uspace/lib/drv/generic/remote_char_dev.c (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/drv/generic/remote_char_dev.c (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -37,10 +37,10 @@ #include "ops/char_dev.h" -#include "driver.h" +#include "ddf/driver.h" #define MAX_CHAR_RW_COUNT 256 -static void remote_char_read(device_t *, void *, ipc_callid_t, ipc_call_t *); -static void remote_char_write(device_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_char_read(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_char_write(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); /** Remote character interface operations. */ @@ -67,9 +67,9 @@ * local interface to the remote client. * - * @param dev The device from which the data are read. + * @param fun The function from which the data are read. * @param ops The local ops structure. */ static void -remote_char_read(device_t *dev, void *ops, ipc_callid_t callid, +remote_char_read(ddf_fun_t *fun, void *ops, ipc_callid_t callid, ipc_call_t *call) { @@ -94,5 +94,5 @@ char buf[MAX_CHAR_RW_COUNT]; - int ret = (*char_dev_ops->read)(dev, buf, len); + int ret = (*char_dev_ops->read)(fun, buf, len); if (ret < 0) { @@ -114,9 +114,9 @@ * local interface to the remote client. * - * @param dev The device to which the data are written. + * @param fun The function to which the data are written. * @param ops The local ops structure. */ static void -remote_char_write(device_t *dev, void *ops, ipc_callid_t callid, +remote_char_write(ddf_fun_t *fun, void *ops, ipc_callid_t callid, ipc_call_t *call) { @@ -144,5 +144,5 @@ async_data_write_finalize(cid, buf, len); - int ret = (*char_dev_ops->write)(dev, buf, len); + int ret = (*char_dev_ops->write)(fun, buf, len); if (ret < 0) { /* Some error occured. */ Index: uspace/lib/drv/generic/remote_hw_res.c =================================================================== --- uspace/lib/drv/generic/remote_hw_res.c (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/drv/generic/remote_hw_res.c (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -37,9 +37,9 @@ #include "ops/hw_res.h" -#include "driver.h" +#include "ddf/driver.h" -static void remote_hw_res_get_resource_list(device_t *, void *, ipc_callid_t, +static void remote_hw_res_get_resource_list(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); -static void remote_hw_res_enable_interrupt(device_t *, void *, ipc_callid_t, +static void remote_hw_res_enable_interrupt(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); @@ -55,5 +55,5 @@ }; -static void remote_hw_res_enable_interrupt(device_t *dev, void *ops, +static void remote_hw_res_enable_interrupt(ddf_fun_t *fun, void *ops, ipc_callid_t callid, ipc_call_t *call) { @@ -62,5 +62,5 @@ if (hw_res_ops->enable_interrupt == NULL) async_answer_0(callid, ENOTSUP); - else if (hw_res_ops->enable_interrupt(dev)) + else if (hw_res_ops->enable_interrupt(fun)) async_answer_0(callid, EOK); else @@ -68,5 +68,5 @@ } -static void remote_hw_res_get_resource_list(device_t *dev, void *ops, +static void remote_hw_res_get_resource_list(ddf_fun_t *fun, void *ops, ipc_callid_t callid, ipc_call_t *call) { @@ -78,5 +78,5 @@ } - hw_resource_list_t *hw_resources = hw_res_ops->get_resource_list(dev); + hw_resource_list_t *hw_resources = hw_res_ops->get_resource_list(fun); if (hw_resources == NULL){ async_answer_0(callid, ENOENT); Index: uspace/lib/drv/include/ddf/driver.h =================================================================== --- uspace/lib/drv/include/ddf/driver.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) +++ uspace/lib/drv/include/ddf/driver.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -0,0 +1,157 @@ +/* + * Copyright (c) 2010 Lenka Trochtova + * Copyright (c) 2011 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. + */ + +/** @addtogroup libdrv + * @{ + */ +/** @file + */ + +#ifndef DDF_DRIVER_H_ +#define DDF_DRIVER_H_ + +#include +#include + +#include "../dev_iface.h" + +typedef struct ddf_dev ddf_dev_t; +typedef struct ddf_fun ddf_fun_t; + +/* + * Device + */ + +/** Devices operations */ +typedef struct ddf_dev_ops { + /** + * Optional callback function called when a client is connecting to the + * device. + */ + int (*open)(ddf_fun_t *); + + /** + * Optional callback function called when a client is disconnecting from + * the device. + */ + void (*close)(ddf_fun_t *); + + /** The table of standard interfaces implemented by the device. */ + void *interfaces[DEV_IFACE_COUNT]; + + /** + * The default handler of remote client requests. If the client's remote + * request cannot be handled by any of the standard interfaces, the + * default handler is used. + */ + remote_handler_t *default_handler; +} ddf_dev_ops_t; + +/** Device structure */ +struct ddf_dev { + /** + * Globally unique device identifier (assigned to the device by the + * device manager). + */ + devman_handle_t handle; + + /** + * Phone to the parent device driver (if it is different from this + * driver) + */ + int parent_phone; + + /** Device name */ + const char *name; + + /** Driver-specific data associated with this device */ + void *driver_data; + + /** Link in the list of devices handled by the driver */ + link_t link; +}; + +/** Function structure */ +struct ddf_fun { + /** True if bound to the device manager */ + bool bound; + /** Function indentifier (asigned by device manager) */ + devman_handle_t handle; + + /** Device which this function belogs to */ + ddf_dev_t *dev; + + /** Function type */ + fun_type_t ftype; + /** Function name */ + const char *name; + /** List of device ids for driver matching */ + match_id_list_t match_ids; + /** Driver-specific data associated with this function */ + void *driver_data; + /** Implementation of operations provided by this function */ + ddf_dev_ops_t *ops; + + /** Link in the list of functions handled by the driver */ + link_t link; +}; + +/* + * Driver + */ + +/** Generic device driver operations */ +typedef struct driver_ops { + /** Callback method for passing a new device to the device driver */ + int (*add_device)(ddf_dev_t *dev); + /* TODO: add other generic driver operations */ +} driver_ops_t; + +/** Driver structure */ +typedef struct driver { + /** Name of the device driver */ + const char *name; + /** Generic device driver operations */ + driver_ops_t *driver_ops; +} driver_t; + +extern int ddf_driver_main(driver_t *); + +extern ddf_fun_t *ddf_fun_create(ddf_dev_t *, fun_type_t, const char *); +extern void ddf_fun_destroy(ddf_fun_t *); +extern int ddf_fun_bind(ddf_fun_t *); +extern int ddf_fun_add_match_id(ddf_fun_t *, const char *, int); + +extern int ddf_fun_add_to_class(ddf_fun_t *, const char *); + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/ddf/interrupt.h =================================================================== --- uspace/lib/drv/include/ddf/interrupt.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) +++ uspace/lib/drv/include/ddf/interrupt.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -0,0 +1,86 @@ +/* + * 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. + */ + +/** @addtogroup libdrv + * @{ + */ +/** @file + */ + +#ifndef DDF_INTERRUPT_H_ +#define DDF_INTERRUPT_H_ + +#include +#include +#include +#include + +#include "driver.h" +#include "../dev_iface.h" + +/* + * Interrupts + */ + +typedef void interrupt_handler_t(ddf_dev_t *, ipc_callid_t, ipc_call_t *); + +typedef struct interrupt_context { + int id; + ddf_dev_t *dev; + int irq; + interrupt_handler_t *handler; + link_t link; +} interrupt_context_t; + +typedef struct interrupt_context_list { + int curr_id; + link_t contexts; + fibril_mutex_t mutex; +} interrupt_context_list_t; + +extern interrupt_context_t *create_interrupt_context(void); +extern void delete_interrupt_context(interrupt_context_t *); +extern void init_interrupt_context_list(interrupt_context_list_t *); +extern void add_interrupt_context(interrupt_context_list_t *, + interrupt_context_t *); +extern void remove_interrupt_context(interrupt_context_list_t *, + interrupt_context_t *); +extern interrupt_context_t *find_interrupt_context_by_id( + interrupt_context_list_t *, int); +extern interrupt_context_t *find_interrupt_context( + interrupt_context_list_t *, ddf_dev_t *, int); + +extern int register_interrupt_handler(ddf_dev_t *, int, interrupt_handler_t *, + irq_code_t *); +extern int unregister_interrupt_handler(ddf_dev_t *, int); + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/dev_iface.h =================================================================== --- uspace/lib/drv/include/dev_iface.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/drv/include/dev_iface.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -43,5 +43,5 @@ */ -struct device; +struct ddf_fun; /* @@ -49,8 +49,8 @@ * devices driver. */ -typedef void remote_iface_func_t(struct device *, void *, ipc_callid_t, +typedef void remote_iface_func_t(struct ddf_fun *, void *, ipc_callid_t, ipc_call_t *); typedef remote_iface_func_t *remote_iface_func_ptr_t; -typedef void remote_handler_t(struct device *, ipc_callid_t, ipc_call_t *); +typedef void remote_handler_t(struct ddf_fun *, ipc_callid_t, ipc_call_t *); typedef struct { Index: uspace/lib/drv/include/driver.h =================================================================== --- uspace/lib/drv/include/driver.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,193 +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. - */ - -/** @addtogroup libdrv - * @{ - */ -/** @file - */ - -#ifndef LIBDRV_DRIVER_H_ -#define LIBDRV_DRIVER_H_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "dev_iface.h" - -struct device; -typedef struct device device_t; - -/* - * Device class - */ - -/** Devices operations */ -typedef struct device_ops { - /** - * Optional callback function called when a client is connecting to the - * device. - */ - int (*open)(device_t *); - - /** - * Optional callback function called when a client is disconnecting from - * the device. - */ - void (*close)(device_t *); - - /** The table of standard interfaces implemented by the device. */ - void *interfaces[DEV_IFACE_COUNT]; - - /** - * The default handler of remote client requests. If the client's remote - * request cannot be handled by any of the standard interfaces, the - * default handler is used. - */ - remote_handler_t *default_handler; -} device_ops_t; - - -/* - * Device - */ - -/** Device structure */ -struct device { - /** - * Globally unique device identifier (assigned to the device by the - * device manager). - */ - devman_handle_t handle; - - /** - * Phone to the parent device driver (if it is different from this - * driver) - */ - int parent_phone; - - /** Parent device if handled by this driver, NULL otherwise */ - device_t *parent; - /** Device name */ - const char *name; - /** List of device ids for device-to-driver matching */ - match_id_list_t match_ids; - /** Driver-specific data associated with this device */ - void *driver_data; - /** The implementation of operations provided by this device */ - device_ops_t *ops; - - /** Link in the list of devices handled by the driver */ - link_t link; -}; - -/* - * Driver - */ - -/** Generic device driver operations */ -typedef struct driver_ops { - /** Callback method for passing a new device to the device driver */ - int (*add_device)(device_t *dev); - /* TODO: add other generic driver operations */ -} driver_ops_t; - -/** Driver structure */ -typedef struct driver { - /** Name of the device driver */ - const char *name; - /** Generic device driver operations */ - driver_ops_t *driver_ops; -} driver_t; - -int driver_main(driver_t *); - -/** Create new device structure. - * - * @return The device structure. - */ -extern device_t *create_device(void); -extern void delete_device(device_t *); -extern void *device_get_ops(device_t *, dev_inferface_idx_t); - -extern int child_device_register(device_t *, device_t *); -extern int child_device_register_wrapper(device_t *, const char *, const char *, - int); - -/* - * Interrupts - */ - -typedef void interrupt_handler_t(device_t *, ipc_callid_t, ipc_call_t *); - -typedef struct interrupt_context { - int id; - device_t *dev; - int irq; - interrupt_handler_t *handler; - link_t link; -} interrupt_context_t; - -typedef struct interrupt_context_list { - int curr_id; - link_t contexts; - fibril_mutex_t mutex; -} interrupt_context_list_t; - -extern interrupt_context_t *create_interrupt_context(void); -extern void delete_interrupt_context(interrupt_context_t *); -extern void init_interrupt_context_list(interrupt_context_list_t *); -extern void add_interrupt_context(interrupt_context_list_t *, - interrupt_context_t *); -extern void remove_interrupt_context(interrupt_context_list_t *, - interrupt_context_t *); -extern interrupt_context_t *find_interrupt_context_by_id( - interrupt_context_list_t *, int); -extern interrupt_context_t *find_interrupt_context( - interrupt_context_list_t *, device_t *, int); - -extern int register_interrupt_handler(device_t *, int, interrupt_handler_t *, - irq_code_t *); -extern int unregister_interrupt_handler(device_t *, int); - -extern remote_handler_t *device_get_default_handler(device_t *); -extern int add_device_to_class(device_t *, const char *); - -#endif - -/** - * @} - */ Index: uspace/lib/drv/include/ops/char_dev.h =================================================================== --- uspace/lib/drv/include/ops/char_dev.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/drv/include/ops/char_dev.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -36,9 +36,9 @@ #define LIBDRV_OPS_CHAR_DEV_H_ -#include "../driver.h" +#include "../ddf/driver.h" typedef struct { - int (*read)(device_t *, char *, size_t); - int (*write)(device_t *, char *, size_t); + int (*read)(ddf_fun_t *, char *, size_t); + int (*write)(ddf_fun_t *, char *, size_t); } char_dev_ops_t; Index: uspace/lib/drv/include/ops/hw_res.h =================================================================== --- uspace/lib/drv/include/ops/hw_res.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ uspace/lib/drv/include/ops/hw_res.h (revision ed2c8ff4610f93c20b234a94ff648c9cf0d4bd42) @@ -39,9 +39,9 @@ #include -#include "../driver.h" +#include "../ddf/driver.h" typedef struct { - hw_resource_list_t *(*get_resource_list)(device_t *); - bool (*enable_interrupt)(device_t *); + hw_resource_list_t *(*get_resource_list)(ddf_fun_t *); + bool (*enable_interrupt)(ddf_fun_t *); } hw_res_ops_t; Index: uspace/lib/libpci/Makefile.build =================================================================== --- uspace/lib/libpci/Makefile.build (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,64 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 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. -# - -## Setup toolchain -# - -include Makefile.common -include $(LIBC_PREFIX)/Makefile.toolchain - -## Sources -# - -SOURCES = \ - access.c \ - generic.c \ - names.c \ - i386-ports.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all - -all: $(LIBPCI) - --include $(DEPEND) - -$(LIBPCI): $(OBJECTS) - $(AR) rc $@ $(OBJECTS) - -%.o: %.c $(DEPEND) - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ -ifeq ($(PRECHECK),y) - $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) -endif - -$(DEPEND): - makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null - -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/lib/libpci/Makefile.common =================================================================== --- uspace/lib/libpci/Makefile.common (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,37 +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. -# - - -## Common names -# - -LIBC_PREFIX = ../../../../../lib/libc -DEPEND = Makefile.depend -DEPEND_PREV = $(DEPEND).prev -JOB = libpci.job -LIBPCI = libpci.a Index: uspace/lib/packet/include/net_byteorder.h =================================================================== --- uspace/lib/packet/include/net_byteorder.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,71 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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 net - * @{ - */ - -/** @file - * Host - network byte order manipulation functions. - */ - -#ifndef __NET_BYTEORDER_H__ -#define __NET_BYTEORDER_H__ - -#include -#include - - -/** Converts the given short number (16 bit) from the host byte order to the network byte order (big endian). - * @param[in] number The number in the host byte order to be converted. - * @returns The number in the network byte order. - */ -#define htons(number) host2uint16_t_be(number) - -/** Converts the given long number (32 bit) from the host byte order to the network byte order (big endian). - * @param[in] number The number in the host byte order to be converted. - * @returns The number in the network byte order. - */ -#define htonl(number) host2uint32_t_be(number) - -/** Converts the given short number (16 bit) from the network byte order (big endian) to the host byte order. - * @param[in] number The number in the network byte order to be converted. - * @returns The number in the host byte order. - */ -#define ntohs(number) uint16_t_be2host(number) - -/** Converts the given long number (32 bit) from the network byte order (big endian) to the host byte order. - * @param[in] number The number in the network byte order to be converted. - * @returns The number in the host byte order. - */ -#define ntohl(number) uint32_t_be2host(number) - -#endif - -/** @} - */ Index: uspace/lib/packet/include/net_err.h =================================================================== --- uspace/lib/packet/include/net_err.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,99 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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 net - * @{ - */ - -/** @file - * Common error processing codes and routines. - */ - -#ifndef __NET_ERR_H__ -#define __NET_ERR_H__ - -#include - -#ifdef CONFIG_DEBUG - #include - #include -#endif - -/** An actual stored error code. - * - */ -#define ERROR_CODE error_check_return_value - -/** An error processing routines declaration. - * - * This has to be declared in the block where the error processing - * is desired. - * - */ -#define ERROR_DECLARE int ERROR_CODE - -/** Store the value as an error code and checks if an error occurred. - * - * @param[in] value The value to be checked. May be a function call. - * @return False if the value indicates success (EOK). - * @return True otherwise. - * - */ -#ifdef CONFIG_DEBUG - -#define ERROR_OCCURRED(value) \ - (((ERROR_CODE = (value)) != EOK) \ - && ({ \ - fprintf(stderr, "libsocket error at %s:%d (%s)\n", \ - __FILE__, __LINE__, str_error(ERROR_CODE)); \ - 1; \ - })) - -#else - -#define ERROR_OCCURRED(value) ((ERROR_CODE = (value)) != EOK) - -#endif - -/** Error propagation - * - * Check if an error occurred and immediately exit the actual - * function returning the error code. - * - * @param[in] value The value to be checked. May be a function call. - * - */ - -#define ERROR_PROPAGATE(value) \ - if (ERROR_OCCURRED(value)) \ - return ERROR_CODE - -#endif - -/** @} - */ Index: uspace/lib/packet/include/socket_errno.h =================================================================== --- uspace/lib/packet/include/socket_errno.h (revision 5716e9afd07b8c8ac4e5fb6977a879035c2ffe10) +++ (revision ) @@ -1,136 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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 net - * @{ - */ - -/** @file - * Socket error codes. - * Based on BSD. - */ - -#ifndef __NET_SOCKET_ERR_H__ -#define __NET_SOCKET_ERR_H__ - -#include - -/** @name Socket error codes definitions - */ -/*@{*/ - -////#define EINTR (-10004) -////#define EBADF (-10009) -//#define EACCES (-10013) -//#define EFAULT (-10014) -////#define EINVAL (-10022) -////#define EMFILE (-10024) -//#define EWOULDBLOCK (-10035) - -/** An API function is called while another blocking function is in progress. - */ -#define EINPROGRESS (-10036) - -//#define EALREADY (-10037) - -/** The socket identifier is not valid. - */ -#define ENOTSOCK (-10038) - -/** The destination address required. - */ -#define EDESTADDRREQ (-10039) - -//#define EMSGSIZE (-10040) -//#define EPROTOTYPE (-10041) -//#define ENOPROTOOPT (-10042) - -/** Protocol is not supported. - */ -#define EPROTONOSUPPORT (-10043) - -/** Socket type is not supported. - */ -#define ESOCKTNOSUPPORT (-10044) - -//#define EOPNOTSUPP (-10045) - -/** Protocol family is not supported. - */ -#define EPFNOSUPPORT (-10046) - -/** Address family is not supported. - */ -#define EAFNOSUPPORT (-10047) - -/** Address is already in use. - */ -#define EADDRINUSE (-10048) - -//#define EADDRNOTAVAIL (-10049) -/* May be reported at any time if the implementation detects an underlying failure. - */ -//#define ENETDOWN (-10050) -//#define ENETUNREACH (-10051) -//#define ENETRESET (-10052) -//#define ECONNABORTED (-10053) -//#define ECONNRESET (-10054) -//#define ENOBUFS (-10055) -//#define EISCONN (-10056) - -/** The socket is not connected or bound. - */ -#define ENOTCONN (-10057) - -//#define ESHUTDOWN (-10058) -//#define ETOOMANYREFS (-10059) -//#define ETIMEDOUT (-10060) -//#define ECONNREFUSED (-10061) -//#define ELOOP (-10062) -////#define ENAMETOOLONG (-10063) -//#define EHOSTDOWN (-10064) -//#define EHOSTUNREACH (-10065) -//#define HOST_NOT_FOUND (-11001) - -/** The requested operation was not performed. - * Try again later. - */ -#define TRY_AGAIN (-11002) - -//#define NO_RECOVERY (-11003) - -/** No data. - */ -#define NO_DATA (-11004) - -/*@}*/ - -#endif - -/** @} - */