Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/Makefile (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -69,5 +69,4 @@ generic/devmap.c \ generic/devman.c \ - generic/devman_obsolete.c \ generic/device/hw_res.c \ generic/device/char_dev.c \ Index: uspace/lib/c/arch/mips32/Makefile.common =================================================================== --- uspace/lib/c/arch/mips32/Makefile.common (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/arch/mips32/Makefile.common (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,5 +27,5 @@ # -GCC_CFLAGS += -mips3 +GCC_CFLAGS += -mips3 -mabi=32 ENDIANESS = LE Index: uspace/lib/c/arch/mips32/include/atomic.h =================================================================== --- uspace/lib/c/arch/mips32/include/atomic.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/arch/mips32/include/atomic.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -31,5 +31,5 @@ */ /** @file - * @ingroup libcmips32eb + * @ingroup libcmips32 */ Index: uspace/lib/c/arch/mips32/include/fibril.h =================================================================== --- uspace/lib/c/arch/mips32/include/fibril.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/arch/mips32/include/fibril.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,9 +27,9 @@ */ -/** @addtogroup libcmips32 +/** @addtogroup libcmips32 * @{ */ /** @file - * @ingroup libcmips32eb + * @ingroup libcmips32 */ Index: uspace/lib/c/arch/mips32/include/thread.h =================================================================== --- uspace/lib/c/arch/mips32/include/thread.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/arch/mips32/include/thread.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,9 +27,9 @@ */ -/** @addtogroup libcmips32 +/** @addtogroup libcmips32 * @{ */ /** @file - * @ingroup libcmips32eb + * @ingroup libcmips32 */ Index: uspace/lib/c/arch/mips32/include/tls.h =================================================================== --- uspace/lib/c/arch/mips32/include/tls.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/arch/mips32/include/tls.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,9 +27,9 @@ */ -/** @addtogroup libcmips32 +/** @addtogroup libcmips32 * @{ */ /** @file - * @ingroup libcmips32eb + * @ingroup libcmips32 */ Index: uspace/lib/c/arch/mips32/include/types.h =================================================================== --- uspace/lib/c/arch/mips32/include/types.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/arch/mips32/include/types.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -31,5 +31,5 @@ */ /** @file - * @ingroup libcmips32eb + * @ingroup libcmips32 */ Index: uspace/lib/c/arch/mips32/src/syscall.c =================================================================== --- uspace/lib/c/arch/mips32/src/syscall.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/arch/mips32/src/syscall.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,9 +27,9 @@ */ - /** @addtogroup libcmips32 +/** @addtogroup libcmips32 * @{ */ /** @file - * @ingroup libcmips32eb + * @ingroup libcmips32 */ @@ -64,5 +64,4 @@ } - /** @} +/** @} */ - Index: uspace/lib/c/arch/mips32/src/tls.c =================================================================== --- uspace/lib/c/arch/mips32/src/tls.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/arch/mips32/src/tls.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,9 +27,9 @@ */ -/** @addtogroup libcmips32 +/** @addtogroup libcmips32 * @{ */ /** @file - * @ingroup libcmips32eb + * @ingroup libcmips32 */ Index: uspace/lib/c/arch/mips32eb/Makefile.common =================================================================== --- uspace/lib/c/arch/mips32eb/Makefile.common (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/arch/mips32eb/Makefile.common (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,5 +27,5 @@ # -GCC_CFLAGS += -mips3 +GCC_CFLAGS += -mips3 -mabi=32 ENDIANESS = BE Index: uspace/lib/c/arch/mips64/Makefile.common =================================================================== --- uspace/lib/c/arch/mips64/Makefile.common (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/Makefile.common (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,35 @@ +# +# 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 += -mips3 -mabi=64 +AFLAGS = -64 + +ENDIANESS = LE + +BFD_ARCH = mips:4000 +BFD_NAME = elf64-tradlittlemips Index: uspace/lib/c/arch/mips64/Makefile.inc =================================================================== --- uspace/lib/c/arch/mips64/Makefile.inc (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/Makefile.inc (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,39 @@ +# +# 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. +# + +ARCH_SOURCES = \ + arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/entryjmp.s \ + arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/syscall.c \ + arch/$(UARCH)/src/fibril.S \ + arch/$(UARCH)/src/tls.c \ + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S + +.PRECIOUS: arch/$(UARCH)/src/entry.o Index: uspace/lib/c/arch/mips64/_link.ld.in =================================================================== --- uspace/lib/c/arch/mips64/_link.ld.in (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/_link.ld.in (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,73 @@ +OUTPUT_FORMAT(elf64-tradlittlemips) +STARTUP(LIBC_PATH/arch/UARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { +#ifdef LOADER + interp PT_INTERP; + text PT_LOAD FILEHDR PHDRS FLAGS(5); +#else + text PT_LOAD FLAGS(5); +#endif + data PT_LOAD FLAGS(6); +} + +SECTIONS { +#ifdef LOADER + .interp : { + *(.interp); + } :interp + + . = 0x70004000 + SIZEOF_HEADERS; +#else + . = 0x4000 + SIZEOF_HEADERS; +#endif + .init : { + *(.init); + } :text + + .text : { + *(.text .text.*); + *(.rodata .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 = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss)); + + .sbss : { + *(.scommon); + *(.sbss); + } + + .bss : { + *(.bss); + *(COMMON); + } :data + + /DISCARD/ : { + *(*); + } +} Index: uspace/lib/c/arch/mips64/include/atomic.h =================================================================== --- uspace/lib/c/arch/mips64/include/atomic.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/include/atomic.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * 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 libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips64 + */ + +#ifndef LIBC_mips64_ATOMIC_H_ +#define LIBC_mips64_ATOMIC_H_ + +#define LIBC_ARCH_ATOMIC_H_ + +#include + +#define atomic_inc(x) ((void) atomic_add(x, 1)) +#define atomic_dec(x) ((void) atomic_add(x, -1)) + +#define atomic_postinc(x) (atomic_add(x, 1) - 1) +#define atomic_postdec(x) (atomic_add(x, -1) + 1) + +#define atomic_preinc(x) atomic_add(x, 1) +#define atomic_predec(x) atomic_add(x, -1) + +/* Atomic addition of immediate value. + * + * @param val Memory location to which will be the immediate value added. + * @param i Signed immediate that will be added to *val. + * + * @return Value after addition. + * + */ +static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i) +{ + atomic_count_t tmp; + atomic_count_t v; + + asm volatile ( + "1:\n" + " lld %0, %1\n" + " daddu %0, %0, %3\n" /* same as add, but never traps on overflow */ + " move %2, %0\n" + " scd %0, %1\n" + " beq %0, %4, 1b\n" /* if the atomic operation failed, try again */ + " nop\n" + : "=&r" (tmp), + "+m" (val->count), + "=&r" (v) + : "r" (i), + "i" (0) + ); + + return v; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/config.h =================================================================== --- uspace/lib/c/arch/mips64/include/config.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/include/config.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcmips64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips64_CONFIG_H_ +#define LIBC_mips64_CONFIG_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/ddi.h =================================================================== --- uspace/lib/c/arch/mips64/include/ddi.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/include/ddi.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2009 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. + */ + +/** @file + * @ingroup libcmips64 + */ + +#ifndef LIBC_mips64_DDI_H_ +#define LIBC_mips64_DDI_H_ + +#include +#include + +static inline void pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +static inline void pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +static inline void pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +static inline uint8_t pio_read_8(ioport8_t *port) +{ + return *port; +} + +static inline uint16_t pio_read_16(ioport16_t *port) +{ + return *port; +} + +static inline uint32_t pio_read_32(ioport32_t *port) +{ + return *port; +} + +#endif Index: uspace/lib/c/arch/mips64/include/faddr.h =================================================================== --- uspace/lib/c/arch/mips64/include/faddr.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/include/faddr.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * 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 libcmips64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips64_FADDR_H_ +#define LIBC_mips64_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/fibril.h =================================================================== --- uspace/lib/c/arch/mips64/include/fibril.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/include/fibril.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * 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 libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips64 + */ + +#ifndef LIBC_mips64_FIBRIL_H_ +#define LIBC_mips64_FIBRIL_H_ + +#include + +/* We define our own context_set, because we need to set + * the TLS pointer to the tcb+0x7000 + * + * See tls_set in thread.h + */ +#define context_set(c, _pc, stack, size, ptls) \ + (c)->pc = (sysarg_t) (_pc); \ + (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ + (c)->tls = ((sysarg_t)(ptls)) + 0x7000 + sizeof(tcb_t); + +/* +16 is just for sure that the called function + * have space to store it's arguments + */ +#define SP_DELTA (8 + 16) + +typedef struct { + uint64_t sp; + uint64_t pc; + + uint64_t s0; + uint64_t s1; + uint64_t s2; + uint64_t s3; + uint64_t s4; + uint64_t s5; + uint64_t s6; + uint64_t s7; + uint64_t s8; + uint64_t gp; + uint64_t tls; /* Thread local storage (k1) */ + + uint64_t f20; + uint64_t f21; + uint64_t f22; + uint64_t f23; + uint64_t f24; + uint64_t f25; + uint64_t f26; + uint64_t f27; + uint64_t f28; + uint64_t f29; + uint64_t f30; +} context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + return ctx->sp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/mips64/include/inttypes.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/include/inttypes.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2010 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 libcmips64 + * @{ + */ + +#ifndef LIBC_mips64_INTTYPES_H_ +#define LIBC_mips64_INTTYPES_H_ + +#define PRIdn PRId64 /**< Format for native_t. */ +#define PRIun PRIu64 /**< Format for sysarg_t. */ +#define PRIxn PRIx64 /**< Format for hexadecimal sysarg_t. */ +#define PRIua PRIu64 /**< Format for atomic_count_t. */ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/istate.h =================================================================== --- uspace/lib/c/arch/mips64/include/istate.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/include/istate.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010 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 libcmips64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips64__ISTATE_H_ +#define LIBC_mips64__ISTATE_H_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/syscall.h =================================================================== --- uspace/lib/c/arch/mips64/include/syscall.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/include/syscall.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** + * @file + */ + +#ifndef LIBC_mips64_SYSCALL_H_ +#define LIBC_mips64_SYSCALL_H_ + +#define LIBARCH_SYSCALL_GENERIC + +#include + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/thread.h =================================================================== --- uspace/lib/c/arch/mips64/include/thread.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/include/thread.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * 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 libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips64 + */ + +#ifndef LIBC_mips64_THREAD_H_ +#define LIBC_mips64_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/tls.h =================================================================== --- uspace/lib/c/arch/mips64/include/tls.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/include/tls.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * 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 libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips64 + */ + +/* TLS for MIPS is described in http://www.linux-mips.org/wiki/NPTL */ + +#ifndef LIBC_mips64_TLS_H_ +#define LIBC_mips64_TLS_H_ + +/* + * FIXME: Note that the use of variant I contradicts the observations made in + * the note below. Nevertheless the scheme we have used for allocating and + * deallocatin TLS corresponds to TLS variant I. + */ +#define CONFIG_TLS_VARIANT_1 + +/* I did not find any specification (neither MIPS nor PowerPC), but + * as I found it + * - it uses Variant II + * - TCB is at Address(First TLS Block)+0x7000. + * - DTV is at Address(First TLS Block)+0x8000 + * - What would happen if the TLS data was larger then 0x7000? + * - The linker never accesses DTV directly, has the second definition any + * sense? + * We will make it this way: + * - TCB is at TP-0x7000-sizeof(tcb) + * - No assumption about DTV etc., but it will not have a fixed address + */ +#define MIPS_TP_OFFSET 0x7000 + +typedef struct { + void *fibril_data; +} tcb_t; + +static inline void __tcb_set(tcb_t *tcb) +{ + void *tp = tcb; + tp += MIPS_TP_OFFSET + sizeof(tcb_t); + + /* Move tls to K1 */ + asm volatile ( + "add $27, %0, $0" + :: "r" (tp) + ); +} + +static inline tcb_t *__tcb_get(void) +{ + void *retval; + + asm volatile ( + "add %0, $27, $0" + : "=r" (retval) + ); + + return (tcb_t *) (retval - MIPS_TP_OFFSET - sizeof(tcb_t)); +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/types.h =================================================================== --- uspace/lib/c/arch/mips64/include/types.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/include/types.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips32 + */ + +#ifndef LIBC_mips64_TYPES_H_ +#define LIBC_mips64_TYPES_H_ + +#define __64_BITS__ + +#include + +#define SIZE_MIN UINT64_MIN +#define SIZE_MAX UINT64_MAX + +#define SSIZE_MIN INT64_MIN +#define SSIZE_MAX INT64_MAX + +typedef uint64_t sysarg_t; + +typedef int64_t ssize_t; +typedef uint64_t size_t; + +typedef uint64_t uintptr_t; +typedef uint64_t atomic_count_t; +typedef int64_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/src/entry.s =================================================================== --- uspace/lib/c/arch/mips64/src/entry.s (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/src/entry.s (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,57 @@ +# +# 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. +# + +.text +.section .init, "ax" + +.global __entry + +.set noreorder +.option pic2 + +## User-space task entry point +# +# $a0 ($4) contains the PCB pointer +# +.ent __entry +__entry: + .frame $sp, 32, $31 + .cpload $25 + + # FIXME: Reflect exactly ABI specs here + + addiu $sp, -32 + .cprestore 16 # Allow PIC code + + # Pass pcb_ptr to __main() as the first argument. pcb_ptr is already + # in $a0. As the first argument is passed in $a0, no operation + # is needed. + + jal __main + nop +.end Index: uspace/lib/c/arch/mips64/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/mips64/src/entryjmp.s (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/src/entryjmp.s (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,49 @@ +# +# Copyright (c) 2008 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. +# + +.text +.section .text +.global entry_point_jmp +.set noreorder + +## void entry_point_jmp(void *entry_point, void *pcb); +# +# $a0 (=$4) contains entry_point +# $a1 (=$5) contains pcb +# +# Jump to program entry point +.ent entry_point_jmp +entry_point_jmp: + # tmp := entry_point + move $25, $a0 + + # Pass pcb to the entry point in $a0 + move $a0, $a1 + jr $25 + nop +.end Index: uspace/lib/c/arch/mips64/src/fibril.S =================================================================== --- uspace/lib/c/arch/mips64/src/fibril.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/src/fibril.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,55 @@ +# +# Copyright (c) 2003-2004 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. +# + +.text + +.set noat +.set noreorder + +#include + +.global context_save +.global context_restore + +context_save: + CONTEXT_SAVE_ARCH_CORE $a0 + + # context_save returns 1 + j $ra + li $v0, 1 + +context_restore: + CONTEXT_RESTORE_ARCH_CORE $a0 + + # Just for the jump into first function, + # but one instruction should not bother us + move $t9, $ra + + # context_restore returns 0 + j $ra + xor $v0, $v0 Index: uspace/lib/c/arch/mips64/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/mips64/src/stacktrace.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/src/stacktrace.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 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 libcmips64 mips64 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include +#include + +#include + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; (void) fp; + return false; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + (void) st; (void) fp; (void) prev; + return ENOTSUP; +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + (void) st; (void) fp; (void) ra; + return ENOTSUP; +} + +/** @} + */ Index: uspace/lib/c/arch/mips64/src/stacktrace_asm.S =================================================================== --- uspace/lib/c/arch/mips64/src/stacktrace_asm.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/src/stacktrace_asm.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,42 @@ +# +# Copyright (c) 2009 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. +# + +.text + +.set noat +.set noreorder + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: +stacktrace_fp_get: +stacktrace_pc_get: + j $ra + xor $v0, $v0 Index: uspace/lib/c/arch/mips64/src/syscall.c =================================================================== --- uspace/lib/c/arch/mips64/src/syscall.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/src/syscall.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips64 + */ + +#include + +sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3, + const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, const syscall_t id) +{ + register sysarg_t __mips_reg_a0 asm("$4") = p1; + register sysarg_t __mips_reg_a1 asm("$5") = p2; + register sysarg_t __mips_reg_a2 asm("$6") = p3; + register sysarg_t __mips_reg_a3 asm("$7") = p4; + register sysarg_t __mips_reg_t0 asm("$8") = p5; + register sysarg_t __mips_reg_t1 asm("$9") = p6; + register sysarg_t __mips_reg_v0 asm("$2") = id; + + asm volatile ( + "syscall\n" + : "=r" (__mips_reg_v0) + : "r" (__mips_reg_a0), + "r" (__mips_reg_a1), + "r" (__mips_reg_a2), + "r" (__mips_reg_a3), + "r" (__mips_reg_t0), + "r" (__mips_reg_t1), + "r" (__mips_reg_v0) + /* + * We are a function call, although + * C does not know it + */ + : "%ra" + ); + + return __mips_reg_v0; +} + +/** @} + */ Index: uspace/lib/c/arch/mips64/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/mips64/src/thread_entry.s (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/src/thread_entry.s (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,59 @@ +# +# Copyright (c) 2006 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.set noat +.set noreorder +.option pic2 + +.globl __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +.ent __thread_entry +__thread_entry: + .frame $sp, 32, $31 + .cpload $25 + + # + # v0 contains address of uarg. + # + add $4, $2, 0 + + addiu $sp, -32 + .cprestore 16 + + jal __thread_main + nop + + # + # Not reached. + # +.end __thread_entry Index: uspace/lib/c/arch/mips64/src/tls.c =================================================================== --- uspace/lib/c/arch/mips64/src/tls.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/arch/mips64/src/tls.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * 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 libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips64 + */ + +#include +#include + +tcb_t * __alloc_tls(void **data, size_t size) +{ + return tls_alloc_variant_1(data, size); +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + tls_free_variant_1(tcb, size); +} + +/** @} + */ Index: uspace/lib/c/generic/adt/measured_strings.c =================================================================== --- uspace/lib/c/generic/adt/measured_strings.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/generic/adt/measured_strings.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -42,5 +42,4 @@ #include #include -#include /** Creates a new measured string bundled with a copy of the given string @@ -298,5 +297,5 @@ * size has to be negotiated in advance. * - * @param[in] phone The other module phone. + * @param[in] exch Exchange. * @param[out] strings The returned measured strings array. * @param[out] data The measured strings data. This memory block stores the @@ -305,5 +304,5 @@ * @return EOK on success. * @return EINVAL if the strings or data parameter is NULL. - * @return EINVAL if the phone or count parameter is not positive. + * @return EINVAL if the exch or count parameter is invalid. * @return EINVAL if the sent array differs in size. * @return ENOMEM if there is not enough memory left. @@ -311,7 +310,6 @@ * async_data_read_start() function. */ -int -measured_strings_return(int phone, measured_string_t **strings, uint8_t **data, - size_t count) +int measured_strings_return(async_exch_t *exch, measured_string_t **strings, + uint8_t **data, size_t count) { size_t *lengths; @@ -320,5 +318,5 @@ int rc; - if ((phone < 0) || (!strings) || (!data) || (count <= 0)) + if ((exch == NULL) || (!strings) || (!data) || (count <= 0)) return EINVAL; @@ -327,5 +325,5 @@ return ENOMEM; - rc = async_obsolete_data_read_start(phone, lengths, + rc = async_data_read_start(exch, lengths, sizeof(size_t) * (count + 1)); if (rc != EOK) { @@ -352,5 +350,5 @@ (*strings)[index].length = lengths[index]; if (lengths[index] > 0) { - rc = async_obsolete_data_read_start(phone, next, lengths[index]); + rc = async_data_read_start(exch, next, lengths[index]); if (rc != EOK) { free(lengths); @@ -376,15 +374,14 @@ * size has to be negotiated in advance. * - * @param[in] phone The other module phone. + * @param[in] exch Exchange. * @param[in] strings The measured strings array to be transferred. * @param[in] count The measured strings array size. * @return EOK on success. * @return EINVAL if the strings parameter is NULL. - * @return EINVAL if the phone or count parameter is not positive. + * @return EINVAL if the exch or count parameter is invalid. * @return Other error codes as defined for the * async_data_write_start() function. */ -int -measured_strings_send(int phone, const measured_string_t *strings, +int measured_strings_send(async_exch_t *exch, const measured_string_t *strings, size_t count) { @@ -393,5 +390,5 @@ int rc; - if ((phone < 0) || (!strings) || (count <= 0)) + if ((exch == NULL) || (!strings) || (count <= 0)) return EINVAL; @@ -400,5 +397,5 @@ return ENOMEM; - rc = async_obsolete_data_write_start(phone, lengths, + rc = async_data_write_start(exch, lengths, sizeof(size_t) * (count + 1)); if (rc != EOK) { @@ -411,5 +408,5 @@ for (index = 0; index < count; index++) { if (strings[index].length > 0) { - rc = async_obsolete_data_write_start(phone, strings[index].value, + rc = async_data_write_start(exch, strings[index].value, strings[index].length); if (rc != EOK) @@ -423,3 +420,2 @@ /** @} */ - Index: uspace/lib/c/generic/devman_obsolete.c =================================================================== --- uspace/lib/c/generic/devman_obsolete.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ (revision ) @@ -1,149 +1,0 @@ -/* - * Copyright (c) 2007 Josef Cejka - * Copyright (c) 2009 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static int devman_phone_driver = -1; -static int devman_phone_client = -1; - -static FIBRIL_MUTEX_INITIALIZE(devman_phone_mutex); - -int devman_obsolete_get_phone(devman_interface_t iface, unsigned int flags) -{ - switch (iface) { - case DEVMAN_DRIVER: - fibril_mutex_lock(&devman_phone_mutex); - if (devman_phone_driver >= 0) { - fibril_mutex_unlock(&devman_phone_mutex); - return devman_phone_driver; - } - - if (flags & IPC_FLAG_BLOCKING) - devman_phone_driver = service_obsolete_connect_blocking( - SERVICE_DEVMAN, DEVMAN_DRIVER, 0); - else - devman_phone_driver = service_obsolete_connect(SERVICE_DEVMAN, - DEVMAN_DRIVER, 0); - - fibril_mutex_unlock(&devman_phone_mutex); - return devman_phone_driver; - case DEVMAN_CLIENT: - fibril_mutex_lock(&devman_phone_mutex); - if (devman_phone_client >= 0) { - fibril_mutex_unlock(&devman_phone_mutex); - return devman_phone_client; - } - - if (flags & IPC_FLAG_BLOCKING) { - devman_phone_client = service_obsolete_connect_blocking( - SERVICE_DEVMAN, DEVMAN_CLIENT, 0); - } else { - devman_phone_client = service_obsolete_connect(SERVICE_DEVMAN, - DEVMAN_CLIENT, 0); - } - - fibril_mutex_unlock(&devman_phone_mutex); - return devman_phone_client; - default: - return -1; - } -} - -void devman_obsolete_hangup_phone(devman_interface_t iface) -{ - switch (iface) { - case DEVMAN_DRIVER: - if (devman_phone_driver >= 0) { - async_obsolete_hangup(devman_phone_driver); - devman_phone_driver = -1; - } - break; - case DEVMAN_CLIENT: - if (devman_phone_client >= 0) { - async_obsolete_hangup(devman_phone_client); - devman_phone_client = -1; - } - break; - default: - break; - } -} - -int devman_obsolete_device_connect(devman_handle_t handle, unsigned int flags) -{ - int phone; - - if (flags & IPC_FLAG_BLOCKING) { - phone = service_obsolete_connect_blocking(SERVICE_DEVMAN, - DEVMAN_CONNECT_TO_DEVICE, handle); - } else { - phone = service_obsolete_connect(SERVICE_DEVMAN, - DEVMAN_CONNECT_TO_DEVICE, handle); - } - - return phone; -} - -int devman_obsolete_parent_device_connect(devman_handle_t handle, unsigned int flags) -{ - int phone; - - if (flags & IPC_FLAG_BLOCKING) { - phone = service_obsolete_connect_blocking(SERVICE_DEVMAN, - DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle); - } else { - phone = service_obsolete_connect(SERVICE_DEVMAN, - DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle); - } - - return phone; -} - -/** @} - */ Index: uspace/lib/c/generic/io/console.c =================================================================== --- uspace/lib/c/generic/io/console.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/generic/io/console.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -76,9 +76,5 @@ bool console_kcon(void) { -#if 0 return __SYSCALL0(SYS_DEBUG_ACTIVATE_CONSOLE); -#endif - - return false; } Index: uspace/lib/c/generic/net/icmp_api.c =================================================================== --- uspace/lib/c/generic/net/icmp_api.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/generic/net/icmp_api.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -42,5 +42,4 @@ #include #include -#include #include #include @@ -55,5 +54,5 @@ * timeout occurs. * - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. + * @param[in] sess The ICMP session. * @param[in] size The message data length in bytes. * @param[in] timeout The timeout in milliseconds. @@ -74,5 +73,5 @@ */ int -icmp_echo_msg(int icmp_phone, size_t size, mseconds_t timeout, ip_ttl_t ttl, +icmp_echo_msg(async_sess_t *sess, size_t size, mseconds_t timeout, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, const struct sockaddr *addr, socklen_t addrlen) @@ -83,10 +82,14 @@ if (addrlen <= 0) return EINVAL; - - message_id = async_obsolete_send_5(icmp_phone, NET_ICMP_ECHO, size, timeout, ttl, + + async_exch_t *exch = async_exchange_begin(sess); + + message_id = async_send_5(exch, NET_ICMP_ECHO, size, timeout, ttl, tos, (sysarg_t) dont_fragment, NULL); - + /* Send the address */ - async_obsolete_data_write_start(icmp_phone, addr, (size_t) addrlen); + async_data_write_start(exch, addr, (size_t) addrlen); + + async_exchange_end(exch); async_wait_for(message_id, &result); Index: uspace/lib/c/generic/net/icmp_common.c =================================================================== --- uspace/lib/c/generic/net/icmp_common.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/generic/net/icmp_common.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -45,8 +45,8 @@ /** Connect to the ICMP module. * - * @return ICMP module phone on success. + * @return ICMP module session. * */ -int icmp_connect_module(void) +async_sess_t *icmp_connect_module(void) { return connect_to_service(SERVICE_ICMP); Index: uspace/lib/c/generic/net/modules.c =================================================================== --- uspace/lib/c/generic/net/modules.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/generic/net/modules.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -40,5 +40,4 @@ #include -#include #include #include @@ -47,8 +46,4 @@ #include #include -#include - -/** The time between connect requests in microseconds. */ -#define MODULE_WAIT_TIME (10 * 1000) /** Answer a call. @@ -98,55 +93,65 @@ } -/** Create bidirectional connection with the needed module service and registers +/** Create bidirectional connection with the needed module service and register * the message receiver. * - * @param[in] need The needed module service. - * @param[in] arg1 The first parameter. - * @param[in] arg2 The second parameter. - * @param[in] arg3 The third parameter. - * @param[in] client_receiver The message receiver. - * - * @return The phone of the needed service. - * @return Other error codes as defined for the ipc_connect_to_me() - * function. - */ -int bind_service(services_t need, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, - async_client_conn_t client_receiver) + * @param[in] need Needed module service. + * @param[in] arg1 First parameter. + * @param[in] arg2 Second parameter. + * @param[in] arg3 Third parameter. + * @param[in] client_receiver Message receiver. + * + * @return Session to the needed service. + * @return Other error codes as defined for the async_connect_to_me() + * function. + * + */ +async_sess_t *bind_service(services_t need, sysarg_t arg1, sysarg_t arg2, + sysarg_t arg3, async_client_conn_t client_receiver) { /* Connect to the needed service */ - int phone = connect_to_service(need); - if (phone >= 0) { + async_sess_t *sess = connect_to_service(need); + if (sess != NULL) { /* Request the bidirectional connection */ - int rc = async_obsolete_connect_to_me(phone, arg1, arg2, arg3, + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_connect_to_me(exch, arg1, arg2, arg3, client_receiver, NULL); + async_exchange_end(exch); + if (rc != EOK) { - async_obsolete_hangup(phone); - return rc; + async_hangup(sess); + errno = rc; + return NULL; } } - return phone; -} - -/** Connects to the needed module. - * - * @param[in] need The needed module service. - * @return The phone of the needed service. - */ -int connect_to_service(services_t need) -{ - return service_obsolete_connect_blocking(need, 0, 0); -} - -/** Replies the data to the other party. - * - * @param[in] data The data buffer to be sent. + return sess; +} + +/** Connect to the needed module. + * + * @param[in] need Needed module service. + * + * @return Session to the needed service. + * @return NULL if the connection timeouted. + * + */ +async_sess_t *connect_to_service(services_t need) +{ + return service_connect_blocking(EXCHANGE_SERIALIZE, need, 0, 0); +} + +/** Reply the data to the other party. + * + * @param[in] data The data buffer to be sent. * @param[in] data_length The buffer length. - * @return EOK on success. - * @return EINVAL if the client does not expect the data. - * @return EOVERFLOW if the client does not expect all the data. - * Only partial data are transfered. - * @return Other error codes as defined for the - * async_data_read_finalize() function. + * + * @return EOK on success. + * @return EINVAL if the client does not expect the data. + * @return EOVERFLOW if the client does not expect all the data. + * Only partial data are transfered. + * @return Other error codes as defined for the + * async_data_read_finalize() function. + * */ int data_reply(void *data, size_t data_length) @@ -154,9 +159,9 @@ size_t length; ipc_callid_t callid; - + /* Fetch the request */ if (!async_data_read_receive(&callid, &length)) return EINVAL; - + /* Check the requested data size */ if (length < data_length) { @@ -164,5 +169,5 @@ return EOVERFLOW; } - + /* Send the data */ return async_data_read_finalize(callid, data, data_length); Index: uspace/lib/c/generic/net/socket_client.c =================================================================== --- uspace/lib/c/generic/net/socket_client.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/generic/net/socket_client.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -39,5 +39,4 @@ #include #include -#include #include #include @@ -84,6 +83,6 @@ /** Socket identifier. */ int socket_id; - /** Parent module phone. */ - int phone; + /** Parent module session. */ + async_sess_t *sess; /** Parent module service. */ services_t service; @@ -144,12 +143,8 @@ /** Socket client library global data. */ static struct socket_client_globals { - /** TCP module phone. */ - int tcp_phone; - /** UDP module phone. */ - int udp_phone; - -// /** The last socket identifier. -// */ -// int last_id; + /** TCP module session. */ + async_sess_t *tcp_sess; + /** UDP module session. */ + async_sess_t *udp_sess; /** Active sockets. */ @@ -164,7 +159,6 @@ fibril_rwlock_t lock; } socket_globals = { - .tcp_phone = -1, - .udp_phone = -1, -// .last_id = 0, + .tcp_sess = NULL, + .udp_sess = NULL, .sockets = NULL, .lock = FIBRIL_RWLOCK_INITIALIZER(socket_globals.lock) @@ -280,38 +274,36 @@ } -/** Returns the TCP module phone. - * - * Connects to the TCP module if necessary. - * - * @return The TCP module phone. - * @return Other error codes as defined for the - * bind_service() function. - */ -static int socket_get_tcp_phone(void) -{ - if (socket_globals.tcp_phone < 0) { - socket_globals.tcp_phone = bind_service(SERVICE_TCP, +/** Return the TCP module session. + * + * Connect to the TCP module if necessary. + * + * @return The TCP module session. + * + */ +static async_sess_t *socket_get_tcp_sess(void) +{ + if (socket_globals.tcp_sess == NULL) { + socket_globals.tcp_sess = bind_service(SERVICE_TCP, 0, 0, SERVICE_TCP, socket_connection); } - return socket_globals.tcp_phone; -} - -/** Returns the UDP module phone. - * - * Connects to the UDP module if necessary. - * - * @return The UDP module phone. - * @return Other error codes as defined for the - * bind_service() function. - */ -static int socket_get_udp_phone(void) -{ - if (socket_globals.udp_phone < 0) { - socket_globals.udp_phone = bind_service(SERVICE_UDP, + return socket_globals.tcp_sess; +} + +/** Return the UDP module session. + * + * Connect to the UDP module if necessary. + * + * @return The UDP module session. + * + */ +static async_sess_t *socket_get_udp_sess(void) +{ + if (socket_globals.udp_sess == NULL) { + socket_globals.udp_sess = bind_service(SERVICE_UDP, 0, 0, SERVICE_UDP, socket_connection); } - return socket_globals.udp_phone; + return socket_globals.udp_sess; } @@ -329,5 +321,4 @@ sockets = socket_get_sockets(); count = 0; -// socket_id = socket_globals.last_id; do { @@ -342,14 +333,10 @@ if (socket_id < INT_MAX) { ++socket_id; -/* } else if(socket_globals.last_id) { - * socket_globals.last_id = 0; - * socket_id = 1; - */ } else { + } else { return ELIMIT; } } } while (sockets_find(sockets, socket_id)); - -// last_id = socket_id + return socket_id; } @@ -358,14 +345,13 @@ * * @param[in,out] socket The socket to be initialized. - * @param[in] socket_id The new socket identifier. - * @param[in] phone The parent module phone. - * @param[in] service The parent module service. - */ -static void -socket_initialize(socket_t *socket, int socket_id, int phone, - services_t service) + * @param[in] socket_id The new socket identifier. + * @param[in] sess The parent module session. + * @param[in] service The parent module service. + */ +static void socket_initialize(socket_t *socket, int socket_id, + async_sess_t *sess, services_t service) { socket->socket_id = socket_id; - socket->phone = phone; + socket->sess = sess; socket->service = service; dyn_fifo_initialize(&socket->received, SOCKET_INITIAL_RECEIVED_SIZE); @@ -397,5 +383,5 @@ { socket_t *socket; - int phone; + async_sess_t *sess; int socket_id; services_t service; @@ -414,5 +400,5 @@ switch (protocol) { case IPPROTO_TCP: - phone = socket_get_tcp_phone(); + sess = socket_get_tcp_sess(); service = SERVICE_TCP; break; @@ -429,5 +415,5 @@ switch (protocol) { case IPPROTO_UDP: - phone = socket_get_udp_phone(); + sess = socket_get_udp_sess(); service = SERVICE_UDP; break; @@ -450,6 +436,6 @@ } - if (phone < 0) - return phone; + if (sess == NULL) + return ENOENT; /* Create a new socket structure */ @@ -468,7 +454,10 @@ return socket_id; } - - rc = (int) async_obsolete_req_3_3(phone, NET_SOCKET, socket_id, 0, service, NULL, + + async_exch_t *exch = async_exchange_begin(sess); + rc = (int) async_req_3_3(exch, NET_SOCKET, socket_id, 0, service, NULL, &fragment_size, &header_size); + async_exchange_end(exch); + if (rc != EOK) { fibril_rwlock_write_unlock(&socket_globals.lock); @@ -481,5 +470,5 @@ /* Finish the new socket initialization */ - socket_initialize(socket, socket_id, phone, service); + socket_initialize(socket, socket_id, sess, service); /* Store the new socket */ rc = sockets_add(socket_get_sockets(), socket_id, socket); @@ -490,6 +479,10 @@ dyn_fifo_destroy(&socket->accepted); free(socket); - async_obsolete_msg_3(phone, NET_SOCKET_CLOSE, (sysarg_t) socket_id, 0, + + exch = async_exchange_begin(sess); + async_msg_3(exch, NET_SOCKET_CLOSE, (sysarg_t) socket_id, 0, service); + async_exchange_end(exch); + return rc; } @@ -535,8 +528,10 @@ /* Request the message */ - message_id = async_obsolete_send_3(socket->phone, message, + async_exch_t *exch = async_exchange_begin(socket->sess); + message_id = async_send_3(exch, message, (sysarg_t) socket->socket_id, arg2, socket->service, NULL); /* Send the address */ - async_obsolete_data_write_start(socket->phone, data, datalength); + async_data_write_start(exch, data, datalength); + async_exchange_end(exch); fibril_rwlock_read_unlock(&socket_globals.lock); @@ -595,6 +590,8 @@ /* Request listen backlog change */ - result = (int) async_obsolete_req_3_0(socket->phone, NET_SOCKET_LISTEN, + async_exch_t *exch = async_exchange_begin(socket->sess); + result = (int) async_req_3_0(exch, NET_SOCKET_LISTEN, (sysarg_t) socket->socket_id, (sysarg_t) backlog, socket->service); + async_exchange_end(exch); fibril_rwlock_read_unlock(&socket_globals.lock); @@ -666,5 +663,5 @@ return socket_id; } - socket_initialize(new_socket, socket_id, socket->phone, + socket_initialize(new_socket, socket_id, socket->sess, socket->service); result = sockets_add(socket_get_sockets(), new_socket->socket_id, @@ -678,10 +675,13 @@ /* Request accept */ - message_id = async_obsolete_send_5(socket->phone, NET_SOCKET_ACCEPT, + async_exch_t *exch = async_exchange_begin(socket->sess); + message_id = async_send_5(exch, NET_SOCKET_ACCEPT, (sysarg_t) socket->socket_id, 0, socket->service, 0, new_socket->socket_id, &answer); /* Read address */ - async_obsolete_data_read_start(socket->phone, cliaddr, *addrlen); + async_data_read_start(exch, cliaddr, *addrlen); + async_exchange_end(exch); + fibril_rwlock_write_unlock(&socket_globals.lock); async_wait_for(message_id, &ipc_result); @@ -777,6 +777,9 @@ /* Request close */ - rc = (int) async_obsolete_req_3_0(socket->phone, NET_SOCKET_CLOSE, + async_exch_t *exch = async_exchange_begin(socket->sess); + rc = (int) async_req_3_0(exch, NET_SOCKET_CLOSE, (sysarg_t) socket->socket_id, 0, socket->service); + async_exchange_end(exch); + if (rc != EOK) { fibril_rwlock_write_unlock(&socket_globals.lock); @@ -850,5 +853,7 @@ /* Request send */ - message_id = async_obsolete_send_5(socket->phone, message, + async_exch_t *exch = async_exchange_begin(socket->sess); + + message_id = async_send_5(exch, message, (sysarg_t) socket->socket_id, (fragments == 1 ? datalength : socket->data_fragment_size), @@ -857,11 +862,11 @@ /* Send the address if given */ if (!toaddr || - (async_obsolete_data_write_start(socket->phone, toaddr, addrlen) == EOK)) { + (async_data_write_start(exch, toaddr, addrlen) == EOK)) { if (fragments == 1) { /* Send all if only one fragment */ - async_obsolete_data_write_start(socket->phone, data, datalength); + async_data_write_start(exch, data, datalength); } else { /* Send the first fragment */ - async_obsolete_data_write_start(socket->phone, data, + async_data_write_start(exch, data, socket->data_fragment_size - socket->header_size); data = ((const uint8_t *) data) + @@ -870,5 +875,5 @@ /* Send the middle fragments */ while (--fragments > 1) { - async_obsolete_data_write_start(socket->phone, data, + async_data_write_start(exch, data, socket->data_fragment_size); data = ((const uint8_t *) data) + @@ -877,9 +882,11 @@ /* Send the last fragment */ - async_obsolete_data_write_start(socket->phone, data, + async_data_write_start(exch, data, (datalength + socket->header_size) % socket->data_fragment_size); } } + + async_exchange_end(exch); async_wait_for(message_id, &result); @@ -1023,4 +1030,6 @@ return 0; } + + async_exch_t *exch = async_exchange_begin(socket->sess); /* Prepare lengths if more fragments */ @@ -1035,5 +1044,5 @@ /* Request packet data */ - message_id = async_obsolete_send_4(socket->phone, message, + message_id = async_send_4(exch, message, (sysarg_t) socket->socket_id, 0, socket->service, (sysarg_t) flags, &answer); @@ -1041,8 +1050,8 @@ /* Read the address if desired */ if(!fromaddr || - (async_obsolete_data_read_start(socket->phone, fromaddr, + (async_data_read_start(exch, fromaddr, *addrlen) == EOK)) { /* Read the fragment lengths */ - if (async_obsolete_data_read_start(socket->phone, lengths, + if (async_data_read_start(exch, lengths, sizeof(int) * (fragments + 1)) == EOK) { if (lengths[fragments] <= datalength) { @@ -1051,6 +1060,5 @@ for (index = 0; index < fragments; ++index) { - async_obsolete_data_read_start( - socket->phone, data, + async_data_read_start(exch, data, lengths[index]); data = ((uint8_t *) data) + @@ -1064,5 +1072,5 @@ } else { /* fragments == 1 */ /* Request packet data */ - message_id = async_obsolete_send_4(socket->phone, message, + message_id = async_send_4(exch, message, (sysarg_t) socket->socket_id, 0, socket->service, (sysarg_t) flags, &answer); @@ -1070,10 +1078,11 @@ /* Read the address if desired */ if (!fromaddr || - (async_obsolete_data_read_start(socket->phone, fromaddr, - *addrlen) == EOK)) { + (async_data_read_start(exch, fromaddr, *addrlen) == EOK)) { /* Read all if only one fragment */ - async_obsolete_data_read_start(socket->phone, data, datalength); + async_data_read_start(exch, data, datalength); } } + + async_exchange_end(exch); async_wait_for(message_id, &ipc_result); @@ -1187,14 +1196,18 @@ /* Request option value */ - message_id = async_obsolete_send_3(socket->phone, NET_SOCKET_GETSOCKOPT, + async_exch_t *exch = async_exchange_begin(socket->sess); + + message_id = async_send_3(exch, NET_SOCKET_GETSOCKOPT, (sysarg_t) socket->socket_id, (sysarg_t) optname, socket->service, NULL); /* Read the length */ - if (async_obsolete_data_read_start(socket->phone, optlen, + if (async_data_read_start(exch, optlen, sizeof(*optlen)) == EOK) { /* Read the value */ - async_obsolete_data_read_start(socket->phone, value, *optlen); - } + async_data_read_start(exch, value, *optlen); + } + + async_exchange_end(exch); fibril_rwlock_read_unlock(&socket_globals.lock); Index: uspace/lib/c/generic/str.c =================================================================== --- uspace/lib/c/generic/str.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/generic/str.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -544,4 +544,67 @@ str_cpy(dest + dstr_size, size - dstr_size, src); +} + +/** Convert space-padded ASCII to string. + * + * Common legacy text encoding in hardware is 7-bit ASCII fitted into + * a fixed-with byte buffer (bit 7 always zero), right-padded with spaces + * (ASCII 0x20). Convert space-padded ascii to string representation. + * + * If the text does not fit into the destination buffer, the function converts + * as many characters as possible and returns EOVERFLOW. + * + * If the text contains non-ASCII bytes (with bit 7 set), the whole string is + * converted anyway and invalid characters are replaced with question marks + * (U_SPECIAL) and the function returns EIO. + * + * Regardless of return value upon return @a dest will always be well-formed. + * + * @param dest Destination buffer + * @param size Size of destination buffer + * @param src Space-padded ASCII. + * @param n Size of the source buffer in bytes. + * + * @return EOK on success, EOVERFLOW if the text does not fit + * destination buffer, EIO if the text contains + * non-ASCII bytes. + */ +int spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n) +{ + size_t sidx; + size_t didx; + size_t dlast; + uint8_t byte; + int rc; + int result; + + /* There must be space for a null terminator in the buffer. */ + assert(size > 0); + result = EOK; + + didx = 0; + dlast = 0; + for (sidx = 0; sidx < n; ++sidx) { + byte = src[sidx]; + if (!ascii_check(byte)) { + byte = U_SPECIAL; + result = EIO; + } + + rc = chr_encode(byte, dest, &didx, size - 1); + if (rc != EOK) { + assert(rc == EOVERFLOW); + dest[didx] = '\0'; + return rc; + } + + /* Remember dest index after last non-empty character */ + if (byte != 0x20) + dlast = didx; + } + + /* Terminate string after last non-empty character */ + dest[dlast] = '\0'; + return result; } Index: uspace/lib/c/include/adt/measured_strings.h =================================================================== --- uspace/lib/c/include/adt/measured_strings.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/include/adt/measured_strings.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -41,4 +41,5 @@ #include +#include /** Type definition of the character string with measured length. @@ -64,6 +65,9 @@ extern int measured_strings_receive(measured_string_t **, uint8_t **, size_t); extern int measured_strings_reply(const measured_string_t *, size_t); -extern int measured_strings_return(int, measured_string_t **, uint8_t **, size_t); -extern int measured_strings_send(int, const measured_string_t *, size_t); + +extern int measured_strings_return(async_exch_t *, measured_string_t **, + uint8_t **, size_t); +extern int measured_strings_send(async_exch_t *, const measured_string_t *, + size_t); #endif Index: uspace/lib/c/include/bitops.h =================================================================== --- uspace/lib/c/include/bitops.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/include/bitops.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,4 +38,19 @@ #include +/** Mask with bit @a n set. */ +#define BIT_V(type, n) \ + ((type)1 << ((n) - 1)) + +/** Mask with rightmost @a n bits set. */ +#define BIT_RRANGE(type, n) \ + (BIT_V(type, (n) + 1) - 1) + +/** Mask with bits @a hi .. @a lo set. @a hi >= @a lo. */ +#define BIT_RANGE(type, hi, lo) \ + (BIT_RRANGE(type, (hi) - (lo) + 1) << (lo)) + +/** Extract range of bits @a hi .. @a lo from @a value. */ +#define BIT_RANGE_EXTRACT(type, hi, lo, value) \ + (((value) >> (lo)) & BIT_RRANGE(type, (hi) - (lo) + 1)) /** Return position of first non-zero bit from left (i.e. [log_2(arg)]). Index: uspace/lib/c/include/devman_obsolete.h =================================================================== --- uspace/lib/c/include/devman_obsolete.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ (revision ) @@ -1,52 +1,0 @@ -/* - * Copyright (c) 2009 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_DEVMAN_OBSOLETE_H_ -#define LIBC_DEVMAN_OBSOLETE_H_ - -#include -#include -#include - -extern int devman_obsolete_get_phone(devman_interface_t, unsigned int); -extern void devman_obsolete_hangup_phone(devman_interface_t); - -extern int devman_obsolete_device_connect(devman_handle_t, unsigned int); -extern int devman_obsolete_parent_device_connect(devman_handle_t, unsigned int); - -#endif - -/** @} - */ Index: uspace/lib/c/include/fourcc.h =================================================================== --- uspace/lib/c/include/fourcc.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/c/include/fourcc.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2011 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_FOURCC_H_ +#define LIBC_FOURCC_H_ + +#include + +#define FOURCC(a, b, c, d) \ + (((UINT32_T) (a)) | (((UINT32_T) (b)) << 8) | \ + (((UINT32_T) (c)) << 16) | (((UINT32_T) (d)) << 24)) + +#endif + +/** @} + */ Index: uspace/lib/c/include/ipc/console.h =================================================================== --- uspace/lib/c/include/ipc/console.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/include/ipc/console.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -48,6 +48,5 @@ CONSOLE_SET_COLOR, CONSOLE_SET_RGB_COLOR, - CONSOLE_CURSOR_VISIBILITY, - CONSOLE_KCON_ENABLE + CONSOLE_CURSOR_VISIBILITY } console_request_t; Index: uspace/lib/c/include/ipc/net.h =================================================================== --- uspace/lib/c/include/ipc/net.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/include/ipc/net.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -335,11 +335,4 @@ #define IPC_GET_ERROR(call) ((services_t) IPC_GET_ARG4(call)) -/** Return the phone message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_PHONE(call) ((int) IPC_GET_ARG5(call)) - /** Set the device identifier in the message answer. * Index: uspace/lib/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/include/ipc/services.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,23 +38,25 @@ #define LIBC_SERVICES_H_ +#include + typedef enum { - SERVICE_NONE = 0, - SERVICE_LOAD, - SERVICE_VIDEO, - SERVICE_VFS, - SERVICE_DEVMAP, - SERVICE_DEVMAN, - SERVICE_IRC, - SERVICE_CLIPBOARD, - SERVICE_NETWORKING, - SERVICE_LO, - SERVICE_NE2000, - SERVICE_ETHERNET, - SERVICE_NILDUMMY, - SERVICE_IP, - SERVICE_ARP, - SERVICE_ICMP, - SERVICE_UDP, - SERVICE_TCP + SERVICE_NONE = 0, + SERVICE_LOAD = FOURCC('l', 'o', 'a', 'd'), + SERVICE_VIDEO = FOURCC('v', 'i', 'd', ' '), + SERVICE_VFS = FOURCC('v', 'f', 's', ' '), + SERVICE_DEVMAP = FOURCC('d', 'e', 'v', 'p'), + SERVICE_DEVMAN = FOURCC('d', 'e', 'v', 'n'), + SERVICE_IRC = FOURCC('i', 'r', 'c', ' '), + SERVICE_CLIPBOARD = FOURCC('c', 'l', 'i', 'p'), + SERVICE_NETWORKING = FOURCC('n', 'e', 't', ' '), + SERVICE_LO = FOURCC('l', 'o', ' ', ' '), + SERVICE_NE2000 = FOURCC('n', 'e', '2', 'k'), + SERVICE_ETHERNET = FOURCC('e', 't', 'h', ' '), + SERVICE_NILDUMMY = FOURCC('n', 'i', 'l', 'd'), + SERVICE_IP = FOURCC('i', 'p', 'v', '4'), + SERVICE_ARP = FOURCC('a', 'r', 'p', ' '), + SERVICE_ICMP = FOURCC('i', 'c', 'm', 'p'), + SERVICE_UDP = FOURCC('u', 'd', 'p', ' '), + SERVICE_TCP = FOURCC('t', 'c', 'p', ' ') } services_t; Index: uspace/lib/c/include/net/icmp_api.h =================================================================== --- uspace/lib/c/include/net/icmp_api.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/include/net/icmp_api.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -42,9 +42,9 @@ #include #include - #include #include #include #include +#include /** @name ICMP module application interface @@ -53,6 +53,6 @@ /*@{*/ -extern int icmp_echo_msg(int, size_t, mseconds_t, ip_ttl_t, ip_tos_t, int, - const struct sockaddr *, socklen_t); +extern int icmp_echo_msg(async_sess_t *, size_t, mseconds_t, ip_ttl_t, ip_tos_t, + int, const struct sockaddr *, socklen_t); /*@}*/ Index: uspace/lib/c/include/net/icmp_common.h =================================================================== --- uspace/lib/c/include/net/icmp_common.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/include/net/icmp_common.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -40,6 +40,7 @@ #include #include +#include -extern int icmp_connect_module(void); +extern async_sess_t *icmp_connect_module(void); #endif Index: uspace/lib/c/include/net/modules.h =================================================================== --- uspace/lib/c/include/net/modules.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/include/net/modules.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -46,17 +46,15 @@ #include -/** Connect to the needed module function type definition. +/** Connect to module function type definition. * - * @param[in] need The needed module service. - * - * @return The phone of the needed service. + * @return Session to the service. * */ -typedef int connect_module_t(services_t need); +typedef async_sess_t *connect_module_t(services_t); extern void answer_call(ipc_callid_t, int, ipc_call_t *, size_t); -extern int bind_service(services_t, sysarg_t, sysarg_t, sysarg_t, +extern async_sess_t *bind_service(services_t, sysarg_t, sysarg_t, sysarg_t, async_client_conn_t); -extern int connect_to_service(services_t); +extern async_sess_t *connect_to_service(services_t); extern int data_reply(void *, size_t); extern void refresh_answer(ipc_call_t *, size_t *); Index: uspace/lib/c/include/str.h =================================================================== --- uspace/lib/c/include/str.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/c/include/str.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -48,4 +48,10 @@ #define STR_BOUNDS(length) ((length) << 2) +/** + * Maximum size of a buffer needed to a string converted from space-padded + * ASCII of size @a spa_size using spascii_to_str(). + */ +#define SPASCII_STR_BUFSIZE(spa_size) ((spa_size) + 1) + extern wchar_t str_decode(const char *str, size_t *offset, size_t sz); extern int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t sz); @@ -73,4 +79,5 @@ extern void str_append(char *dest, size_t size, const char *src); +extern int spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n); extern void wstr_to_str(char *dest, size_t size, const wchar_t *src); extern char *wstr_to_astr(const wchar_t *src); Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/drv/generic/driver.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -314,4 +314,10 @@ " %" PRIun " was found.\n", driver->name, handle); async_answer_0(iid, ENOENT); + return; + } + + if (fun->conn_handler != NULL) { + /* Driver has a custom connection handler. */ + (*fun->conn_handler)(iid, icall, (void *)fun); return; } Index: uspace/lib/drv/include/ddf/driver.h =================================================================== --- uspace/lib/drv/include/ddf/driver.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/drv/include/ddf/driver.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -118,4 +118,6 @@ /** Implementation of operations provided by this function */ ddf_dev_ops_t *ops; + /** Connection handler or @c NULL to use the DDF default handler. */ + async_client_conn_t conn_handler; /** Link in the list of functions handled by the driver */ Index: uspace/lib/ext2/libext2_directory.c =================================================================== --- uspace/lib/ext2/libext2_directory.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/ext2/libext2_directory.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -86,32 +86,17 @@ * @param fs pointer to filesystem structure * @param inode pointer to inode reference structure + * @param pos position within inode to start at, 0 is the first entry * @return EOK on success or negative error code on failure */ int ext2_directory_iterator_init(ext2_directory_iterator_t *it, - ext2_filesystem_t *fs, ext2_inode_ref_t *inode_ref) -{ - int rc; - uint32_t block_id; - uint32_t block_size; - + ext2_filesystem_t *fs, ext2_inode_ref_t *inode_ref, aoff64_t pos) +{ it->inode_ref = inode_ref; it->fs = fs; - - /* Get the first data block, so we can get the first entry */ - rc = ext2_filesystem_get_inode_data_block_index(fs, inode_ref->inode, 0, - &block_id); - if (rc != EOK) { - return rc; - } - - rc = block_get(&it->current_block, fs->device, block_id, 0); - if (rc != EOK) { - return rc; - } - - block_size = ext2_superblock_get_block_size(fs->superblock); - - it->current_offset = 0; - return ext2_directory_iterator_set(it, block_size); + it->current = NULL; + it->current_offset = 0; + it->current_block = NULL; + + return ext2_directory_iterator_seek(it, pos); } @@ -124,6 +109,23 @@ int ext2_directory_iterator_next(ext2_directory_iterator_t *it) { + uint16_t skip; + + assert(it->current != NULL); + + skip = ext2_directory_entry_ll_get_entry_length(it->current); + + return ext2_directory_iterator_seek(it, it->current_offset + skip); +} + +/** + * Seek the directory iterator to the given byte offset within the inode. + * + * @param it pointer to iterator to initialize + * @return EOK on success or negative error code on failure + */ +int ext2_directory_iterator_seek(ext2_directory_iterator_t *it, aoff64_t pos) +{ int rc; - uint16_t skip; + uint64_t size; aoff64_t current_block_idx; @@ -132,19 +134,20 @@ uint32_t block_size; - assert(it->current != NULL); - - skip = ext2_directory_entry_ll_get_entry_length(it->current); size = ext2_inode_get_size(it->fs->superblock, it->inode_ref->inode); + /* The iterator is not valid until we seek to the desired position */ + it->current = NULL; + /* Are we at the end? */ - if (it->current_offset + skip >= size) { - rc = block_put(it->current_block); - it->current_block = NULL; - it->current = NULL; - if (rc != EOK) { - return rc; + if (pos >= size) { + if (it->current_block) { + rc = block_put(it->current_block); + it->current_block = NULL; + if (rc != EOK) { + return rc; + } } - it->current_offset += skip; + it->current_offset = pos; return EOK; } @@ -152,15 +155,16 @@ block_size = ext2_superblock_get_block_size(it->fs->superblock); current_block_idx = it->current_offset / block_size; - next_block_idx = (it->current_offset + skip) / block_size; - - /* If we are moving accross block boundary, + next_block_idx = pos / block_size; + + /* If we don't have a block or are moving accross block boundary, * we need to get another block */ - if (current_block_idx != next_block_idx) { - rc = block_put(it->current_block); - it->current_block = NULL; - it->current = NULL; - if (rc != EOK) { - return rc; + if (it->current_block == NULL || current_block_idx != next_block_idx) { + if (it->current_block) { + rc = block_put(it->current_block); + it->current_block = NULL; + if (rc != EOK) { + return rc; + } } @@ -179,8 +183,15 @@ } - it->current_offset += skip; + it->current_offset = pos; return ext2_directory_iterator_set(it, block_size); } +/** Setup the entry at the current iterator offset. + * + * This function checks the validity of the directory entry, + * before setting the data pointer. + * + * @return EOK on success or error code on failure + */ static int ext2_directory_iterator_set(ext2_directory_iterator_t *it, uint32_t block_size) Index: uspace/lib/ext2/libext2_directory.h =================================================================== --- uspace/lib/ext2/libext2_directory.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/ext2/libext2_directory.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -71,6 +71,7 @@ extern int ext2_directory_iterator_init(ext2_directory_iterator_t *, - ext2_filesystem_t *, ext2_inode_ref_t *); + ext2_filesystem_t *, ext2_inode_ref_t *, aoff64_t); extern int ext2_directory_iterator_next(ext2_directory_iterator_t *); +extern int ext2_directory_iterator_seek(ext2_directory_iterator_t *, aoff64_t pos); extern int ext2_directory_iterator_fini(ext2_directory_iterator_t *); Index: uspace/lib/net/adt/module_map.c =================================================================== --- uspace/lib/net/adt/module_map.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/adt/module_map.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -39,9 +39,5 @@ #include #include - -#include - #include - #include #include @@ -49,19 +45,20 @@ GENERIC_CHAR_MAP_IMPLEMENT(modules, module_t) -/** Adds module to the module map. +/** Add module to the module map. * - * @param[out] module The module structure added. - * @param[in] modules The module map. - * @param[in] name The module name. - * @param[in] filename The full path filename. - * @param[in] service The module service. - * @param[in] task_id The module current task identifier. Zero means not - * running. - * @param[in] connect_module The module connecting function. - * @return EOK on success. - * @return ENOMEM if there is not enough memory left. + * @param[out] module Module structure added. + * @param[in] modules Module map. + * @param[in] name Module name. + * @param[in] filename Full path filename. + * @param[in] service Module service. + * @param[in] task_id Module current task identifier. + * Zero means not running. + * @param[in] connect_module Module connecting function. + * + * @return EOK on success. + * @return ENOMEM if there is not enough memory left. + * */ -int -add_module(module_t **module, modules_t *modules, const uint8_t *name, +int add_module(module_t **module, modules_t *modules, const uint8_t *name, const uint8_t *filename, services_t service, task_id_t task_id, connect_module_t connect_module) @@ -69,11 +66,11 @@ module_t *tmp_module; int rc; - + tmp_module = (module_t *) malloc(sizeof(module_t)); if (!tmp_module) return ENOMEM; - + tmp_module->task_id = task_id; - tmp_module->phone = 0; + tmp_module->sess = NULL; tmp_module->usage = 0; tmp_module->name = name; @@ -81,5 +78,5 @@ tmp_module->service = service; tmp_module->connect_module = connect_module; - + rc = modules_add(modules, tmp_module->name, 0, tmp_module); if (rc != EOK) { @@ -87,29 +84,30 @@ return rc; } + if (module) *module = tmp_module; - + return EOK; } -/** Searches and returns the specified module. +/** Search and return the specified module. * * If the module is not running, the module filaname is spawned. * If the module is not connected, the connect_function is called. * - * @param[in] modules The module map. - * @param[in] name The module name. - * @return The running module found. It does not have to be - * connected. - * @return NULL if there is no such module. + * @param[in] modules Module map. + * @param[in] name Module name. + * + * @return The running module found. It does not have to be + * connected. + * @return NULL if there is no such module. + * */ module_t *get_running_module(modules_t *modules, uint8_t *name) { - module_t *module; - - module = modules_find(modules, name, 0); + module_t *module = modules_find(modules, name, 0); if (!module) return NULL; - + if (!module->task_id) { module->task_id = net_spawn(module->filename); @@ -117,7 +115,8 @@ return NULL; } - if (!module->phone) - module->phone = module->connect_module(module->service); - + + if (!module->sess) + module->sess = module->connect_module(module->service); + return module; } Index: uspace/lib/net/generic/generic.c =================================================================== --- uspace/lib/net/generic/generic.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/generic/generic.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -37,5 +37,4 @@ #include #include -#include #include #include @@ -45,18 +44,19 @@ /** Notify the module about the device state change. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[in] state The new device state. - * @param[in] target The target module service. - * @return EOK on success. - * - */ -int -generic_device_state_msg_remote(int phone, int message, device_id_t device_id, - int state, services_t target) -{ - async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id, - (sysarg_t) state, target); + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[in] state New device state. + * @param[in] target Target module service. + * + * @return EOK on success. + * + */ +int generic_device_state_msg_remote(async_sess_t *sess, sysarg_t message, + device_id_t device_id, sysarg_t state, services_t target) +{ + async_exch_t *exch = async_exchange_begin(sess); + async_msg_3(exch, message, (sysarg_t) device_id, state, target); + async_exchange_end(exch); return EOK; @@ -65,54 +65,59 @@ /** Notify a module about the device. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[in] arg2 The second argument of the message. - * @param[in] service The device module service. - * @return EOK on success. - * @return Other error codes as defined for the specific service - * message. - * - */ -int -generic_device_req_remote(int phone, int message, device_id_t device_id, - int arg2, services_t service) -{ - return (int) async_obsolete_req_3_0(phone, (sysarg_t) message, - (sysarg_t) device_id, (sysarg_t) arg2, (sysarg_t) service); + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[in] arg2 Second argument of the message. + * @param[in] service Device module service. + * + * @return EOK on success. + * @return Other error codes as defined for the specific service + * message. + * + */ +int generic_device_req_remote(async_sess_t *sess, sysarg_t message, + device_id_t device_id, sysarg_t arg2, services_t service) +{ + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_3_0(exch, message, (sysarg_t) device_id, + arg2, (sysarg_t) service); + async_exchange_end(exch); + + return rc; } /** Returns the address. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[out] address The desired address. - * @param[out] data The address data container. - * @return EOK on success. - * @return EBADMEM if the address parameter and/or the data - * parameter is NULL. - * @return Other error codes as defined for the specific service - * message. - */ -int -generic_get_addr_req(int phone, int message, device_id_t device_id, - measured_string_t **address, uint8_t **data) -{ - aid_t message_id; + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[out] address Desired address. + * @param[out] data Address data container. + * + * @return EOK on success. + * @return EBADMEM if the address parameter and/or the data + * parameter is NULL. + * @return Other error codes as defined for the specific service + * message. + * + */ +int generic_get_addr_req(async_sess_t *sess, sysarg_t message, + device_id_t device_id, measured_string_t **address, uint8_t **data) +{ + if ((!address) || (!data)) + return EBADMEM; + + /* Request the address */ + async_exch_t *exch = async_exchange_begin(sess); + aid_t message_id = async_send_1(exch, message, (sysarg_t) device_id, + NULL); + int rc = measured_strings_return(exch, address, data, 1); + async_exchange_end(exch); + sysarg_t result; - int string; - - if (!address || !data) - return EBADMEM; - - /* Request the address */ - message_id = async_obsolete_send_1(phone, (sysarg_t) message, - (sysarg_t) device_id, NULL); - string = measured_strings_return(phone, address, data, 1); async_wait_for(message_id, &result); - + /* If not successful */ - if ((string == EOK) && (result != EOK)) { + if ((rc == EOK) && (result != EOK)) { /* Clear the data */ free(*address); @@ -125,16 +130,17 @@ /** Return the device packet dimension for sending. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[out] packet_dimension The packet dimension. - * @return EOK on success. - * @return EBADMEM if the packet_dimension parameter is NULL. - * @return Other error codes as defined for the specific service - * message. - */ -int -generic_packet_size_req_remote(int phone, int message, device_id_t device_id, - packet_dimension_t *packet_dimension) + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[out] packet_dimension Packet dimension. + * + * @return EOK on success. + * @return EBADMEM if the packet_dimension parameter is NULL. + * @return Other error codes as defined for the specific service + * message. + * + */ +int generic_packet_size_req_remote(async_sess_t *sess, sysarg_t message, + device_id_t device_id, packet_dimension_t *packet_dimension) { if (!packet_dimension) @@ -146,6 +152,8 @@ sysarg_t suffix; - sysarg_t result = async_obsolete_req_1_4(phone, (sysarg_t) message, - (sysarg_t) device_id, &addr_len, &prefix, &content, &suffix); + async_exch_t *exch = async_exchange_begin(sess); + sysarg_t result = async_req_1_4(exch, message, (sysarg_t) device_id, + &addr_len, &prefix, &content, &suffix); + async_exchange_end(exch); packet_dimension->prefix = (size_t) prefix; @@ -159,25 +167,31 @@ /** Pass the packet queue to the module. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[in] packet_id The received packet or the received packet queue - * identifier. - * @param[in] target The target module service. - * @param[in] error The error module service. - * @return EOK on success. - */ -int -generic_received_msg_remote(int phone, int message, device_id_t device_id, - packet_id_t packet_id, services_t target, services_t error) -{ + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[in] packet_id Received packet or the received packet queue + * identifier. + * @param[in] target Target module service. + * @param[in] error Error module service. + * + * @return EOK on success. + * + */ +int generic_received_msg_remote(async_sess_t *sess, sysarg_t message, + device_id_t device_id, packet_id_t packet_id, services_t target, + services_t error) +{ + async_exch_t *exch = async_exchange_begin(sess); + if (error) { - async_obsolete_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id, + async_msg_4(exch, message, (sysarg_t) device_id, (sysarg_t) packet_id, (sysarg_t) target, (sysarg_t) error); } else { - async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id, + async_msg_3(exch, message, (sysarg_t) device_id, (sysarg_t) packet_id, (sysarg_t) target); } + async_exchange_end(exch); + return EOK; } @@ -185,25 +199,30 @@ /** Send the packet queue. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[in] packet_id The packet or the packet queue identifier. - * @param[in] sender The sending module service. - * @param[in] error The error module service. - * @return EOK on success. - * - */ -int -generic_send_msg_remote(int phone, int message, device_id_t device_id, - packet_id_t packet_id, services_t sender, services_t error) -{ + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[in] packet_id Packet or the packet queue identifier. + * @param[in] sender Sending module service. + * @param[in] error Error module service. + * + * @return EOK on success. + * + */ +int generic_send_msg_remote(async_sess_t *sess, sysarg_t message, + device_id_t device_id, packet_id_t packet_id, services_t sender, + services_t error) +{ + async_exch_t *exch = async_exchange_begin(sess); + if (error) { - async_obsolete_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id, + async_msg_4(exch, message, (sysarg_t) device_id, (sysarg_t) packet_id, (sysarg_t) sender, (sysarg_t) error); } else { - async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id, + async_msg_3(exch, message, (sysarg_t) device_id, (sysarg_t) packet_id, (sysarg_t) sender); } + async_exchange_end(exch); + return EOK; } @@ -213,48 +232,51 @@ * Allocates and returns the needed memory block as the data parameter. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[in] service The module service. - * @param[in] configuration The key strings. - * @param[in] count The number of configuration keys. - * @param[out] translation The translated values. - * @param[out] data The translation data container. - * @return EOK on success. - * @return EINVAL if the configuration parameter is NULL. - * @return EINVAL if the count parameter is zero. - * @return EBADMEM if the translation or the data parameters are - * NULL. - * @return Other error codes as defined for the specific service - * message. - */ -int -generic_translate_req(int phone, int message, device_id_t device_id, - services_t service, measured_string_t *configuration, size_t count, + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[in] service Module service. + * @param[in] configuration Key strings. + * @param[in] count Number of configuration keys. + * @param[out] translation Translated values. + * @param[out] data Translation data container. + * + * @return EOK on success. + * @return EINVAL if the configuration parameter is NULL. + * @return EINVAL if the count parameter is zero. + * @return EBADMEM if the translation or the data parameters are + * NULL. + * @return Other error codes as defined for the specific service + * message. + * + */ +int generic_translate_req(async_sess_t *sess, sysarg_t message, + device_id_t device_id, services_t service, + measured_string_t *configuration, size_t count, measured_string_t **translation, uint8_t **data) { - aid_t message_id; + if ((!configuration) || (count == 0)) + return EINVAL; + + if ((!translation) || (!data)) + return EBADMEM; + + /* Request the translation */ + async_exch_t *exch = async_exchange_begin(sess); + aid_t message_id = async_send_3(exch, message, (sysarg_t) device_id, + (sysarg_t) count, (sysarg_t) service, NULL); + measured_strings_send(exch, configuration, count); + int rc = measured_strings_return(exch, translation, data, count); + async_exchange_end(exch); + sysarg_t result; - int string; - - if (!configuration || (count == 0)) - return EINVAL; - if (!translation || !data) - return EBADMEM; - - /* Request the translation */ - message_id = async_obsolete_send_3(phone, (sysarg_t) message, - (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL); - measured_strings_send(phone, configuration, count); - string = measured_strings_return(phone, translation, data, count); async_wait_for(message_id, &result); - + /* If not successful */ - if ((string == EOK) && (result != EOK)) { + if ((rc == EOK) && (result != EOK)) { /* Clear the data */ free(*translation); free(*data); } - + return (int) result; } Index: uspace/lib/net/generic/net_remote.c =================================================================== --- uspace/lib/net/generic/net_remote.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/generic/net_remote.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -47,19 +47,22 @@ #include -/** Connects to the networking module. +/** Connect to the networking module. * - * @return The networking module phone on success. + * @return Networking module session on success. + * */ -int net_connect_module(void) +async_sess_t *net_connect_module(void) { return connect_to_service(SERVICE_NETWORKING); } -/** Frees the received settings. +/** Free the received settings. * - * @param[in] settings The received settings. - * @param[in] data The received settings data. - * @see net_get_device_conf_req() + * @param[in] settings Received settings. + * @param[in] data Received settings data. + * + * @see net_get_device_conf_req() * @see net_get_conf_req() + * */ void net_free_settings(measured_string_t *settings, uint8_t *data) @@ -71,5 +74,5 @@ } -/** Returns the global configuration. +/** Return the global configuration. * * The configuration names are read and the appropriate settings are set @@ -77,48 +80,52 @@ * configuration. * - * @param[in] net_phone The networking module phone. - * @param[in,out] configuration The requested configuration. The names are read - * and the appropriate settings are set instead. + * @param[in] sess Networking module session. + * @param[in,out] configuration Requested configuration. The names are + * read and the appropriate settings are set + * instead. * - * @param[in] count The configuration entries count. - * @param[in,out] data The configuration and settings data. - * @return EOK on success. - * @return EINVAL if the configuration is NULL. - * @return EINVAL if the count is zero. - * @return Other error codes as defined for the - * generic_translate_req() function. + * @param[in] count Configuration entries count. + * @param[in,out] data Configuration and settings data. + * + * @return EOK on success. + * @return EINVAL if the configuration is NULL. + * @return EINVAL if the count is zero. + * @return Other error codes as defined for the + * generic_translate_req() function. + * */ -int -net_get_conf_req(int net_phone, measured_string_t **configuration, +int net_get_conf_req(async_sess_t *sess, measured_string_t **configuration, size_t count, uint8_t **data) { - return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0, + return generic_translate_req(sess, NET_NET_GET_DEVICE_CONF, 0, 0, *configuration, count, configuration, data); } -/** Returns the device specific configuration. +/** Return the device specific configuration. * - * Returns the global configuration if the device specific is not found. + * Return the global configuration if the device specific is not found. * The configuration names are read and the appropriate settings are set * instead. Call net_free_settings() function to release the returned * configuration. * - * @param[in] net_phone The networking module phone. - * @param[in] device_id The device identifier. - * @param[in,out] configuration The requested device configuration. The names - * are read and the appropriate settings are set instead. - * @param[in] count The configuration entries count. - * @param[in,out] data The configuration and settings data. - * @return EOK on success. - * @return EINVAL if the configuration is NULL. - * @return EINVAL if the count is zero. - * @return Other error codes as defined for the - * generic_translate_req() function. + * @param[in] sess The networking module session. + * @param[in] device_id Device identifier. + * @param[in,out] configuration Requested device configuration. The names + * are read and the appropriate settings are + * set instead. + * @param[in] count Configuration entries count. + * @param[in,out] data Configuration and settings data. + * + * @return EOK on success. + * @return EINVAL if the configuration is NULL. + * @return EINVAL if the count is zero. + * @return Other error codes as defined for the + * generic_translate_req() function. + * */ -int -net_get_device_conf_req(int net_phone, device_id_t device_id, +int net_get_device_conf_req(async_sess_t *sess, device_id_t device_id, measured_string_t **configuration, size_t count, uint8_t **data) { - return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, + return generic_translate_req(sess, NET_NET_GET_DEVICE_CONF, device_id, 0, *configuration, count, configuration, data); } Index: uspace/lib/net/generic/packet_client.c =================================================================== --- uspace/lib/net/generic/packet_client.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/generic/packet_client.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -247,33 +247,34 @@ } -/** Returns the packet copy. - * - * Copies the addresses, data, order and metric values. - * Does not copy the queue placement. - * - * @param[in] phone The packet server module phone. - * @param[in] packet The original packet. - * @return The packet copy. - * @return NULL on error. - */ -packet_t *packet_get_copy(int phone, packet_t *packet) -{ - packet_t *copy; - uint8_t * src = NULL; - uint8_t * dest = NULL; - size_t addrlen; - - if (!packet_is_valid(packet)) - return NULL; - +/** Return the packet copy. + * + * Copy the addresses, data, order and metric values. + * Queue placement is not copied. + * + * @param[in] sess Packet server module session. + * @param[in] packet Original packet. + * + * @return Packet copy. + * @return NULL on error. + * + */ +packet_t *packet_get_copy(async_sess_t *sess, packet_t *packet) +{ + if (!packet_is_valid(packet)) + return NULL; + /* Get a new packet */ - copy = packet_get_4_remote(phone, PACKET_DATA_LENGTH(packet), + packet_t *copy = packet_get_4_remote(sess, PACKET_DATA_LENGTH(packet), PACKET_MAX_ADDRESS_LENGTH(packet), packet->max_prefix, PACKET_MIN_SUFFIX(packet)); + if (!copy) return NULL; - + /* Get addresses */ - addrlen = packet_get_addr(packet, &src, &dest); + uint8_t *src = NULL; + uint8_t *dest = NULL; + size_t addrlen = packet_get_addr(packet, &src, &dest); + /* Copy data */ if ((packet_copy_data(copy, packet_get_data(packet), @@ -286,5 +287,5 @@ return copy; } else { - pq_release_remote(phone, copy->packet_id); + pq_release_remote(sess, copy->packet_id); return NULL; } Index: uspace/lib/net/generic/packet_remote.c =================================================================== --- uspace/lib/net/generic/packet_remote.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/generic/packet_remote.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -37,5 +37,4 @@ #include -#include #include #include @@ -52,63 +51,64 @@ * Create the local packet mapping as well. * - * @param[in] phone The packet server module phone. - * @param[out] packet The packet reference pointer to store the received + * @param[in] sess Packet server module session. + * @param[out] packet Packet reference pointer to store the received * packet reference. - * @param[in] packet_id The packet identifier. - * @param[in] size The packet total size in bytes. + * @param[in] packet_id Packet identifier. + * @param[in] size Packet total size in bytes. * * @return EOK on success. * @return Other error codes as defined for the pm_add() function. - * @return Other error codes as defined for the async_obsolete_share_in_start() function. - * - */ -static int -packet_return(int phone, packet_t **packet, packet_id_t packet_id, size_t size) -{ + * @return Other error codes as defined for the async_share_in_start() + * function. + * + */ +static int packet_return(async_sess_t *sess, packet_t **packet, + packet_id_t packet_id, size_t size) +{ + *packet = (packet_t *) as_get_mappable_page(size); + + async_exch_t *exch = async_exchange_begin(sess); ipc_call_t answer; - aid_t message; - int rc; - - message = async_obsolete_send_1(phone, NET_PACKET_GET, packet_id, &answer); - - *packet = (packet_t *) as_get_mappable_page(size); - rc = async_obsolete_share_in_start_0_0(phone, *packet, size); + aid_t message = async_send_1(exch, NET_PACKET_GET, packet_id, &answer); + int rc = async_share_in_start_0_0(exch, *packet, size); + async_exchange_end(exch); + + sysarg_t result; + async_wait_for(message, &result); + if (rc != EOK) { munmap(*packet, size); - async_wait_for(message, NULL); return rc; } + rc = pm_add(*packet); if (rc != EOK) { munmap(*packet, size); - async_wait_for(message, NULL); return rc; } - sysarg_t result; - async_wait_for(message, &result); - return result; } -/** Translates the packet identifier to the packet reference. - * - * Tries to find mapping first. - * Contacts the packet server to share the packet if the mapping is not present. - * - * @param[in] phone The packet server module phone. - * @param[out] packet The packet reference. - * @param[in] packet_id The packet identifier. - * @return EOK on success. - * @return EINVAL if the packet parameter is NULL. - * @return Other error codes as defined for the NET_PACKET_GET_SIZE - * message. - * @return Other error codes as defined for the packet_return() - * function. - */ -int packet_translate_remote(int phone, packet_t **packet, packet_id_t packet_id) -{ - int rc; - +/** Translate the packet identifier to the packet reference. + * + * Try to find mapping first. The packet server is asked to share + * the packet if the mapping is not present. + * + * @param[in] sess Packet server module session. + * @param[out] packet Packet reference. + * @param[in] packet_id Packet identifier. + * + * @return EOK on success. + * @return EINVAL if the packet parameter is NULL. + * @return Other error codes as defined for the NET_PACKET_GET_SIZE + * message. + * @return Other error codes as defined for the packet_return() + * function. + * + */ +int packet_translate_remote(async_sess_t *sess, packet_t **packet, + packet_id_t packet_id) +{ if (!packet) return EINVAL; @@ -116,18 +116,21 @@ *packet = pm_find(packet_id); if (!*packet) { + async_exch_t *exch = async_exchange_begin(sess); sysarg_t size; + int rc = async_req_1_1(exch, NET_PACKET_GET_SIZE, packet_id, + &size); + async_exchange_end(exch); - rc = async_obsolete_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id, - &size); if (rc != EOK) return rc; - rc = packet_return(phone, packet, packet_id, size); + + rc = packet_return(sess, packet, packet_id, size); if (rc != EOK) return rc; } + if ((*packet)->next) { packet_t *next; - - return packet_translate_remote(phone, &next, (*packet)->next); + return packet_translate_remote(sess, &next, (*packet)->next); } @@ -135,33 +138,35 @@ } -/** Obtains the packet of the given dimensions. - * - * Contacts the packet server to return the appropriate packet. - * - * @param[in] phone The packet server module phone. - * @param[in] addr_len The source and destination addresses maximal length in - * bytes. - * @param[in] max_prefix The maximal prefix length in bytes. - * @param[in] max_content The maximal content length in bytes. - * @param[in] max_suffix The maximal suffix length in bytes. - * @return The packet reference. - * @return NULL on error. - */ -packet_t *packet_get_4_remote(int phone, size_t max_content, size_t addr_len, - size_t max_prefix, size_t max_suffix) -{ +/** Obtain the packet of given dimensions. + * + * Contact the packet server to return the appropriate packet. + * + * @param[in] sess Packet server module session. + * @param[in] addr_len Source and destination addresses maximal length + * in bytes. + * @param[in] max_prefix Maximal prefix length in bytes. + * @param[in] max_content Maximal content length in bytes. + * @param[in] max_suffix Maximal suffix length in bytes. + * + * @return The packet reference. + * @return NULL on error. + * + */ +packet_t *packet_get_4_remote(async_sess_t *sess, size_t max_content, + size_t addr_len, size_t max_prefix, size_t max_suffix) +{ + async_exch_t *exch = async_exchange_begin(sess); sysarg_t packet_id; sysarg_t size; - int rc; - - rc = async_obsolete_req_4_2(phone, NET_PACKET_CREATE_4, max_content, addr_len, + int rc = async_req_4_2(exch, NET_PACKET_CREATE_4, max_content, addr_len, max_prefix, max_suffix, &packet_id, &size); + async_exchange_end(exch); + if (rc != EOK) return NULL; - packet_t *packet = pm_find(packet_id); if (!packet) { - rc = packet_return(phone, &packet, packet_id, size); + rc = packet_return(sess, &packet, packet_id, size); if (rc != EOK) return NULL; @@ -171,21 +176,24 @@ } -/** Obtains the packet of the given content size. - * - * Contacts the packet server to return the appropriate packet. - * - * @param[in] phone The packet server module phone. - * @param[in] content The maximal content length in bytes. - * @return The packet reference. - * @return NULL on error. - */ -packet_t *packet_get_1_remote(int phone, size_t content) -{ +/** Obtain the packet of given content size. + * + * Contact the packet server to return the appropriate packet. + * + * @param[in] sess Packet server module session. + * @param[in] content Maximal content length in bytes. + * + * @return The packet reference. + * @return NULL on error. + * + */ +packet_t *packet_get_1_remote(async_sess_t *sess, size_t content) +{ + async_exch_t *exch = async_exchange_begin(sess); sysarg_t packet_id; sysarg_t size; - int rc; - - rc = async_obsolete_req_1_2(phone, NET_PACKET_CREATE_1, content, &packet_id, + int rc = async_req_1_2(exch, NET_PACKET_CREATE_1, content, &packet_id, &size); + async_exchange_end(exch); + if (rc != EOK) return NULL; @@ -193,5 +201,5 @@ packet_t *packet = pm_find(packet_id); if (!packet) { - rc = packet_return(phone, &packet, packet_id, size); + rc = packet_return(sess, &packet, packet_id, size); if (rc != EOK) return NULL; @@ -201,5 +209,5 @@ } -/** Releases the packet queue. +/** Release the packet queue. * * All packets in the queue are marked as free for use. @@ -208,10 +216,13 @@ * received or obtained again. * - * @param[in] phone The packet server module phone. - * @param[in] packet_id The packet identifier. - */ -void pq_release_remote(int phone, packet_id_t packet_id) -{ - async_obsolete_msg_1(phone, NET_PACKET_RELEASE, packet_id); + * @param[in] sess Packet server module session. + * @param[in] packet_id Packet identifier. + * + */ +void pq_release_remote(async_sess_t *sess, packet_id_t packet_id) +{ + async_exch_t *exch = async_exchange_begin(sess); + async_msg_1(exch, NET_PACKET_RELEASE, packet_id); + async_exchange_end(exch); } Index: uspace/lib/net/il/arp_remote.c =================================================================== --- uspace/lib/net/il/arp_remote.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/il/arp_remote.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,25 +38,20 @@ #include #include - -#include -#include -#include #include #include - #include #include #include +#include +#include -/** Connects to the ARP module. +/** Connect to the ARP module. * - * @param service The ARP module service. Ignored parameter. - * @return The ARP module phone on success. + * @return ARP module session on success. + * */ -int arp_connect_module(services_t service) +async_sess_t *arp_connect_module(services_t service) { - if (service != SERVICE_ARP) - return EINVAL; - + // FIXME: Get rid of the useless argument return connect_to_service(SERVICE_ARP); } @@ -64,31 +59,98 @@ /** Cleans the cache. * - * @param[in] arp_phone The ARP module phone used for (semi)remote calls. - * @return EOK on success. + * @param[in] sess ARP module session. + * + * @return EOK on success. + * */ -int arp_clean_cache_req(int arp_phone) +int arp_clean_cache_req(async_sess_t *sess) { - return (int) async_obsolete_req_0_0(arp_phone, NET_ARP_CLEAN_CACHE); + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_0_0(exch, NET_ARP_CLEAN_CACHE); + async_exchange_end(exch); + + return rc; } -/** Clears the given protocol address from the cache. +/** Clear the given protocol address from the cache. * - * @param[in] arp_phone The ARP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] protocol The requesting protocol service. - * @param[in] address The protocol address to be cleared. - * @return EOK on success. - * @return ENOENT if the mapping is not found. + * @param[in] sess ARP module session. + * @param[in] device_id Device identifier. + * @param[in] protocol Requesting protocol service. + * @param[in] address Protocol address to be cleared. + * + * @return EOK on success. + * @return ENOENT if the mapping is not found. + * */ -int -arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol, - measured_string_t *address) +int arp_clear_address_req(async_sess_t *sess, device_id_t device_id, + services_t protocol, measured_string_t *address) { - aid_t message_id; + async_exch_t *exch = async_exchange_begin(sess); + aid_t message_id = async_send_2(exch, NET_ARP_CLEAR_ADDRESS, + (sysarg_t) device_id, protocol, NULL); + measured_strings_send(exch, address, 1); + async_exchange_end(exch); + sysarg_t result; + async_wait_for(message_id, &result); + + return (int) result; +} - message_id = async_obsolete_send_2(arp_phone, NET_ARP_CLEAR_ADDRESS, - (sysarg_t) device_id, protocol, NULL); - measured_strings_send(arp_phone, address, 1); +/** Clear the device cache. + * + * @param[in] sess ARP module session. + * @param[in] device_id Device identifier. + * + * @return EOK on success. + * @return ENOENT if the device is not found. + * + */ +int arp_clear_device_req(async_sess_t *sess, device_id_t device_id) +{ + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_1_0(exch, NET_ARP_CLEAR_DEVICE, + (sysarg_t) device_id); + async_exchange_end(exch); + + return rc; +} + +/** Register new device and the requesting protocol service. + * + * Connect to the network interface layer service. + * Determine the device broadcast address, its address lengths and packet size. + * + * @param[in] sess ARP module session. + * @param[in] device_id New device identifier. + * @param[in] protocol Requesting protocol service. + * @param[in] netif Underlying device network interface layer service. + * @param[in] address Local requesting protocol address of the device. + * + * @return EOK on success. + * @return EEXIST if the device is already used. + * @return ENOMEM if there is not enough memory left. + * @return ENOENT if the network interface service is not known. + * @return EREFUSED if the network interface service is not + * responding. + * @return Other error codes as defined for the + * nil_packet_get_size() function. + * @return Other error codes as defined for the nil_get_addr() + * function. + * @return Other error codes as defined for the + * nil_get_broadcast_addr() function. + * + */ +int arp_device_req(async_sess_t *sess, device_id_t device_id, + services_t protocol, services_t netif, measured_string_t *address) +{ + async_exch_t *exch = async_exchange_begin(sess); + aid_t message_id = async_send_3(exch, NET_ARP_DEVICE, + (sysarg_t) device_id, protocol, netif, NULL); + measured_strings_send(exch, address, 1); + async_exchange_end(exch); + + sysarg_t result; async_wait_for(message_id, &result); @@ -96,76 +158,28 @@ } -/** Clears the device cache. +/** Translate the given protocol address to the network interface address. * - * @param[in] arp_phone The ARP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @return EOK on success. - * @return ENOENT if the device is not found. + * Broadcast the ARP request if the mapping is not found. + * Allocate and returns the needed memory block as the data parameter. + * + * @param[in] sess ARP module session. + * @param[in] device_id Device identifier. + * @param[in] protocol Requesting protocol service. + * @param[in] address Local requesting protocol address. + * @param[out] translation Translation of the local protocol address. + * @param[out] data Allocated raw translation data container. + * + * @return EOK on success. + * @return EINVAL if the address parameter is NULL. + * @return EBADMEM if the translation or the data parameters are + * NULL. + * @return ENOENT if the mapping is not found. + * */ -int arp_clear_device_req(int arp_phone, device_id_t device_id) +int arp_translate_req(async_sess_t *sess, device_id_t device_id, + services_t protocol, measured_string_t *address, + measured_string_t **translation, uint8_t **data) { - return (int) async_obsolete_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE, - (sysarg_t) device_id); -} - -/** Registers the new device and the requesting protocol service. - * - * Connects to the network interface layer service. - * Determines the device broadcast address, its address lengths and packet size. - * - * @param[in] arp_phone The ARP module phone used for (semi)remote calls. - * @param[in] device_id The new device identifier. - * @param[in] protocol The requesting protocol service. - * @param[in] netif The underlying device network interface layer service. - * @param[in] address The local requesting protocol address of the device. - * @return EOK on success. - * @return EEXIST if the device is already used. - * @return ENOMEM if there is not enough memory left. - * @return ENOENT if the network interface service is not known. - * @return EREFUSED if the network interface service is not - * responding. - * @return Other error codes as defined for the - * nil_packet_get_size() function. - * @return Other error codes as defined for the nil_get_addr() - * function. - * @return Other error codes as defined for the - * nil_get_broadcast_addr() function. - */ -int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol, - services_t netif, measured_string_t *address) -{ - aid_t message_id; - sysarg_t result; - - message_id = async_obsolete_send_3(arp_phone, NET_ARP_DEVICE, - (sysarg_t) device_id, protocol, netif, NULL); - measured_strings_send(arp_phone, address, 1); - async_wait_for(message_id, &result); - - return (int) result; -} - -/** Translates the given protocol address to the network interface address. - * - * Broadcasts the ARP request if the mapping is not found. - * Allocates and returns the needed memory block as the data parameter. - * - * @param[in] arp_phone The ARP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] protocol The requesting protocol service. - * @param[in] address The local requesting protocol address. - * @param[out] translation The translation of the local protocol address. - * @param[out] data The allocated raw translation data container. - * @return EOK on success. - * @return EINVAL if the address parameter is NULL. - * @return EBADMEM if the translation or the data parameters are - * NULL. - * @return ENOENT if the mapping is not found. - */ -int -arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, - measured_string_t *address, measured_string_t **translation, uint8_t **data) -{ - return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id, + return generic_translate_req(sess, NET_ARP_TRANSLATE, device_id, protocol, address, 1, translation, data); } Index: uspace/lib/net/il/il_remote.c =================================================================== --- uspace/lib/net/il/il_remote.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/il/il_remote.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -39,8 +39,6 @@ #include #include - #include #include - #include #include @@ -48,9 +46,8 @@ /** Notify the internetwork layer modules about the device state change. * - * @param[in] il_phone The internetwork layer module phone used for - * (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] state The new device state. - * @param[in] target The target internetwork module service to be + * @param[in] sess Internetwork layer module session. + * @param[in] device_id Device identifier. + * @param[in] state New device state. + * @param[in] target Target internetwork module service to be * delivered to. * @@ -58,8 +55,8 @@ * */ -int il_device_state_msg(int il_phone, device_id_t device_id, +int il_device_state_msg(async_sess_t *sess, device_id_t device_id, device_state_t state, services_t target) { - return generic_device_state_msg_remote(il_phone, NET_IL_DEVICE_STATE, + return generic_device_state_msg_remote(sess, NET_IL_DEVICE_STATE, device_id, state, target); } @@ -67,9 +64,8 @@ /** Notify the internetwork layer modules about the received packet/s. * - * @param[in] il_phone The internetwork layer module phone used for - * (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] packet The received packet or the received packet queue. - * @param[in] target The target internetwork module service to be + * @param[in] sess Internetwork layer module session. + * @param[in] device_id Device identifier. + * @param[in] packet Received packet or the received packet queue. + * @param[in] target Target internetwork module service to be * delivered to. * @@ -77,8 +73,8 @@ * */ -int il_received_msg(int il_phone, device_id_t device_id, packet_t *packet, +int il_received_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, services_t target) { - return generic_received_msg_remote(il_phone, NET_IL_RECEIVED, device_id, + return generic_received_msg_remote(sess, NET_IL_RECEIVED, device_id, packet_get_id(packet), target, 0); } @@ -86,9 +82,8 @@ /** Notify the internetwork layer modules about the mtu change. * - * @param[in] il_phone The internetwork layer module phone used for - * (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] mtu The new mtu value. - * @param[in] target The target internetwork module service to be + * @param[in] sess Internetwork layer module session. + * @param[in] device_id Device identifier. + * @param[in] mtu New MTU value. + * @param[in] target Target internetwork module service to be * delivered to. * @@ -96,9 +91,9 @@ * */ -int il_mtu_changed_msg(int il_phone, device_id_t device_id, size_t mtu, +int il_mtu_changed_msg(async_sess_t *sess, device_id_t device_id, size_t mtu, services_t target) { - return generic_device_state_msg_remote(il_phone, NET_IL_MTU_CHANGED, - device_id, (int) mtu, target); + return generic_device_state_msg_remote(sess, NET_IL_MTU_CHANGED, + device_id, mtu, target); } Index: uspace/lib/net/il/il_skel.c =================================================================== --- uspace/lib/net/il/il_skel.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/il/il_skel.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,10 +38,8 @@ #include #include +#include #include #include #include - -// FIXME: remove this header -#include /** Default thread for new connections. @@ -99,14 +97,12 @@ * @return Other error codes as defined for the il_initialize() * function. - * @return Other error codes as defined for the REGISTER_ME() macro - * function. * */ -int il_module_start(int service) +int il_module_start(sysarg_t service) { async_set_client_connection(il_client_connection); - int net_phone = net_connect_module(); - if (net_phone < 0) - return net_phone; + async_sess_t *sess = net_connect_module(); + if (!sess) + return ENOENT; int rc = pm_init(); @@ -114,9 +110,9 @@ return rc; - rc = il_initialize(net_phone); + rc = il_initialize(sess); if (rc != EOK) goto out; - rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL); + rc = service_register(service); if (rc != EOK) goto out; Index: uspace/lib/net/il/ip_remote.c =================================================================== --- uspace/lib/net/il/ip_remote.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/il/ip_remote.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -44,9 +44,7 @@ #include #include -#include #include #include #include - #include #include @@ -57,44 +55,50 @@ * The target network is routed using this device. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] address The target network address. - * @param[in] netmask The target network mask. - * @param[in] gateway The target network gateway. Not used if zero. - */ -int ip_add_route_req_remote(int ip_phone, device_id_t device_id, + * @param[in] sess IP module sessions. + * @param[in] device_id Device identifier. + * @param[in] address Target network address. + * @param[in] netmask Target network mask. + * @param[in] gateway Target network gateway. Not used if zero. + * + */ +int ip_add_route_req_remote(async_sess_t *sess, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway) { - return (int) async_obsolete_req_4_0(ip_phone, NET_IP_ADD_ROUTE, + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_4_0(exch, NET_IP_ADD_ROUTE, (sysarg_t) device_id, (sysarg_t) gateway.s_addr, (sysarg_t) address.s_addr, (sysarg_t) netmask.s_addr); -} - -/** Creates bidirectional connection with the ip module service and registers + async_exchange_end(exch); + + return rc; +} + +/** Create bidirectional connection with the ip module service and register * the message receiver. * - * @param[in] service The IP module service. - * @param[in] protocol The transport layer protocol. - * @param[in] me The requesting module service. - * @param[in] receiver The message receiver. Used for remote connection. - * @return The phone of the needed service. - * @return EOK on success. - * @return Other error codes as defined for the bind_service() - * function. - */ -int ip_bind_service(services_t service, int protocol, services_t me, + * @param[in] service IP module service. + * @param[in] protocol Transport layer protocol. + * @param[in] me Rquesting module service. + * @param[in] receiver Message receiver. Used for remote connection. + * + * @return Session to the needed service. + * @return NULL on failure. + * + */ +async_sess_t *ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver) { - return (int) bind_service(service, (sysarg_t) protocol, me, service, + return bind_service(service, (sysarg_t) protocol, me, service, receiver); } -/** Connects to the IP module. - * - * @param service The IP module service. Ignored parameter. - * @return The IP module phone on success. - */ -int ip_connect_module(services_t service) -{ +/** Connect to the IP module. + * + * @return The IP module session. + * + */ +async_sess_t *ip_connect_module(services_t service) +{ + // FIXME: Get rid of the useless argument return connect_to_service(SERVICE_IP); } @@ -105,21 +109,22 @@ * If the device uses ARP registers also the new ARP device. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The new device identifier. - * @param[in] netif The underlying device network interface layer service. - * @return EOK on success. - * @return ENOMEM if there is not enough memory left. - * @return EINVAL if the device configuration is invalid. - * @return ENOTSUP if the device uses IPv6. - * @return ENOTSUP if the device uses DHCP. - * @return Other error codes as defined for the - * net_get_device_conf_req() function. - * @return Other error codes as defined for the arp_device_req() - * function. - */ -int ip_device_req_remote(int ip_phone, device_id_t device_id, + * @param[in] sess IP module session. + * @param[in] device_id New device identifier. + * + * @return EOK on success. + * @return ENOMEM if there is not enough memory left. + * @return EINVAL if the device configuration is invalid. + * @return ENOTSUP if the device uses IPv6. + * @return ENOTSUP if the device uses DHCP. + * @return Other error codes as defined for the + * net_get_device_conf_req() function. + * @return Other error codes as defined for the arp_device_req() + * function. + * + */ +int ip_device_req_remote(async_sess_t *sess, device_id_t device_id, services_t service) { - return generic_device_req_remote(ip_phone, NET_IP_DEVICE, device_id, 0, + return generic_device_req_remote(sess, NET_IP_DEVICE, device_id, 0, service); } @@ -128,35 +133,37 @@ * destination address. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] protocol The transport protocol. - * @param[in] destination The destination address. - * @param[in] addrlen The destination address length. - * @param[out] device_id The device identifier. - * @param[out] header The constructed IP pseudo header. - * @param[out] headerlen The IP pseudo header length. - * - */ -int ip_get_route_req_remote(int ip_phone, ip_protocol_t protocol, + * @param[in] sess IP module session. + * @param[in] protocol Transport protocol. + * @param[in] destination Destination address. + * @param[in] addrlen Destination address length. + * @param[out] device_id Device identifier. + * @param[out] header Constructed IP pseudo header. + * @param[out] headerlen IP pseudo header length. + * + */ +int ip_get_route_req_remote(async_sess_t *sess, ip_protocol_t protocol, const struct sockaddr *destination, socklen_t addrlen, device_id_t *device_id, void **header, size_t *headerlen) { - if (!destination || (addrlen == 0)) + if ((!destination) || (addrlen == 0)) return EINVAL; - if (!device_id || !header || !headerlen) + if ((!device_id) || (!header) || (!headerlen)) return EBADMEM; *header = NULL; + async_exch_t *exch = async_exchange_begin(sess); + ipc_call_t answer; - aid_t message_id = async_obsolete_send_1(ip_phone, NET_IP_GET_ROUTE, + aid_t message_id = async_send_1(exch, NET_IP_GET_ROUTE, (sysarg_t) protocol, &answer); - if ((async_obsolete_data_write_start(ip_phone, destination, addrlen) == EOK) && - (async_obsolete_data_read_start(ip_phone, headerlen, - sizeof(*headerlen)) == EOK) && (*headerlen > 0)) { + if ((async_data_write_start(exch, destination, addrlen) == EOK) && + (async_data_read_start(exch, headerlen, sizeof(*headerlen)) == EOK) && + (*headerlen > 0)) { *header = malloc(*headerlen); if (*header) { - if (async_obsolete_data_read_start(ip_phone, *header, + if (async_data_read_start(exch, *header, *headerlen) != EOK) free(*header); @@ -164,4 +171,6 @@ } + async_exchange_end(exch); + sysarg_t result; async_wait_for(message_id, &result); @@ -177,16 +186,18 @@ /** Return the device packet dimension for sending. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[out] packet_dimension The packet dimension. - * @return EOK on success. - * @return ENOENT if there is no such device. - * @return Other error codes as defined for the - * generic_packet_size_req_remote() function. - */ -int ip_packet_size_req_remote(int ip_phone, device_id_t device_id, + * @param[in] sess IP module session. + * @param[in] device_id Device identifier. + * @param[out] packet_dimension Packet dimension. + * + * @return EOK on success. + * @return ENOENT if there is no such device. + * @return Other error codes as defined for the + * generic_packet_size_req_remote() function. + * + */ +int ip_packet_size_req_remote(async_sess_t *sess, device_id_t device_id, packet_dimension_t *packet_dimension) { - return generic_packet_size_req_remote(ip_phone, NET_IP_PACKET_SPACE, + return generic_packet_size_req_remote(sess, NET_IP_PACKET_SPACE, device_id, packet_dimension); } @@ -194,17 +205,19 @@ /** Notify the IP module about the received error notification packet. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] packet The received packet or the received packet queue. - * @param[in] target The target internetwork module service to be - * delivered to. - * @param[in] error The packet error reporting service. Prefixes the - * received packet. - * @return EOK on success. - */ -int ip_received_error_msg_remote(int ip_phone, device_id_t device_id, + * @param[in] sess IP module session. + * @param[in] device_id Device identifier. + * @param[in] packet Received packet or the received packet queue. + * @param[in] target Target internetwork module service to be + * delivered to. + * @param[in] error Packet error reporting service. Prefixes the + * received packet. + * + * @return EOK on success. + * + */ +int ip_received_error_msg_remote(async_sess_t *sess, device_id_t device_id, packet_t *packet, services_t target, services_t error) { - return generic_received_msg_remote(ip_phone, NET_IP_RECEIVED_ERROR, + return generic_received_msg_remote(sess, NET_IP_RECEIVED_ERROR, device_id, packet_get_id(packet), target, error); } @@ -214,19 +227,21 @@ * The packets may get fragmented if needed. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] packet The packet fragments as a packet queue. All the - * packets have to have the same destination address. - * @param[in] sender The sending module service. - * @param[in] error The packet error reporting service. Prefixes the - * received packet. - * @return EOK on success. - * @return Other error codes as defined for the generic_send_msg() - * function. - */ -int ip_send_msg_remote(int ip_phone, device_id_t device_id, packet_t *packet, - services_t sender, services_t error) -{ - return generic_send_msg_remote(ip_phone, NET_IP_SEND, device_id, + * @param[in] sess IP module session. + * @param[in] device_id Device identifier. + * @param[in] packet Packet fragments as a packet queue. All the + * packets have to have the same destination address. + * @param[in] sender Sending module service. + * @param[in] error Packet error reporting service. Prefixes the + * received packet. + * + * @return EOK on success. + * @return Other error codes as defined for the generic_send_msg() + * function. + * + */ +int ip_send_msg_remote(async_sess_t *sess, device_id_t device_id, + packet_t *packet, services_t sender, services_t error) +{ + return generic_send_msg_remote(sess, NET_IP_SEND, device_id, packet_get_id(packet), sender, error); } @@ -236,13 +251,18 @@ * This gateway is used if no other route is found. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] gateway The default gateway. - */ -int ip_set_gateway_req_remote(int ip_phone, device_id_t device_id, + * @param[in] sess IP module session. + * @param[in] device_id Device identifier. + * @param[in] gateway Default gateway. + * + */ +int ip_set_gateway_req_remote(async_sess_t *sess, device_id_t device_id, in_addr_t gateway) { - return (int) async_obsolete_req_2_0(ip_phone, NET_IP_SET_GATEWAY, + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_2_0(exch, NET_IP_SET_GATEWAY, (sysarg_t) device_id, (sysarg_t) gateway.s_addr); + async_exchange_end(exch); + + return rc; } Index: uspace/lib/net/include/adt/module_map.h =================================================================== --- uspace/lib/net/include/adt/module_map.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/adt/module_map.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -39,5 +39,5 @@ #include -#include +#include #include #include @@ -60,6 +60,6 @@ /** Module service identifier. */ services_t service; - /** Module phone if running and connected. */ - int phone; + /** Module session if running and connected. */ + async_sess_t *sess; /** Usage counter. */ int usage; Index: uspace/lib/net/include/arp_interface.h =================================================================== --- uspace/lib/net/include/arp_interface.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/arp_interface.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -36,9 +36,8 @@ #include #include - #include - #include #include +#include /** @name ARP module interface @@ -47,13 +46,13 @@ /*@{*/ -extern int arp_device_req(int, device_id_t, services_t, services_t, +extern int arp_device_req(async_sess_t *, device_id_t, services_t, services_t, measured_string_t *); -extern int arp_translate_req(int, device_id_t, services_t, measured_string_t *, - measured_string_t **, uint8_t **); -extern int arp_clear_device_req(int, device_id_t); -extern int arp_clear_address_req(int, device_id_t, services_t, +extern int arp_translate_req(async_sess_t *, device_id_t, services_t, + measured_string_t *, measured_string_t **, uint8_t **); +extern int arp_clear_device_req(async_sess_t *, device_id_t); +extern int arp_clear_address_req(async_sess_t *, device_id_t, services_t, measured_string_t *); -extern int arp_clean_cache_req(int); -extern int arp_connect_module(services_t); +extern int arp_clean_cache_req(async_sess_t *); +extern async_sess_t *arp_connect_module(services_t); /*@}*/ Index: uspace/lib/net/include/generic.h =================================================================== --- uspace/lib/net/include/generic.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/generic.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,24 +38,24 @@ #define LIBNET_GENERIC_H_ -#include #include - #include #include #include +#include -extern int generic_device_state_msg_remote(int, int, device_id_t, int, - services_t); -extern int generic_device_req_remote(int, int, device_id_t, int, services_t); -extern int generic_get_addr_req(int, int, device_id_t, measured_string_t **, - uint8_t **); -extern int generic_packet_size_req_remote(int, int, device_id_t, +extern int generic_device_state_msg_remote(async_sess_t *, sysarg_t, + device_id_t, sysarg_t, services_t); +extern int generic_device_req_remote(async_sess_t *, sysarg_t, device_id_t, + sysarg_t, services_t); +extern int generic_get_addr_req(async_sess_t *, sysarg_t, device_id_t, + measured_string_t **, uint8_t **); +extern int generic_packet_size_req_remote(async_sess_t *, sysarg_t, device_id_t, packet_dimension_t *); -extern int generic_received_msg_remote(int, int, device_id_t, packet_id_t, - services_t, services_t); -extern int generic_send_msg_remote(int, int, device_id_t, packet_id_t, - services_t, services_t); -extern int generic_translate_req(int, int, device_id_t, services_t, - measured_string_t *, size_t, measured_string_t **, uint8_t **); +extern int generic_received_msg_remote(async_sess_t *, sysarg_t, device_id_t, + packet_id_t, services_t, services_t); +extern int generic_send_msg_remote(async_sess_t *, sysarg_t, device_id_t, + packet_id_t, services_t, services_t); +extern int generic_translate_req(async_sess_t *, sysarg_t, device_id_t, + services_t, measured_string_t *, size_t, measured_string_t **, uint8_t **); #endif Index: uspace/lib/net/include/icmp_remote.h =================================================================== --- uspace/lib/net/include/icmp_remote.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/icmp_remote.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -36,5 +36,4 @@ #include #include - #include #include @@ -44,4 +43,5 @@ #include #include +#include /** @name ICMP module interface @@ -50,9 +50,9 @@ /*@{*/ -extern int icmp_destination_unreachable_msg(int, icmp_code_t, icmp_param_t, - packet_t *); -extern int icmp_source_quench_msg(int, packet_t *); -extern int icmp_time_exceeded_msg(int, icmp_code_t, packet_t *); -extern int icmp_parameter_problem_msg(int, icmp_code_t, icmp_param_t, +extern int icmp_destination_unreachable_msg(async_sess_t *, icmp_code_t, + icmp_param_t, packet_t *); +extern int icmp_source_quench_msg(async_sess_t *, packet_t *); +extern int icmp_time_exceeded_msg(async_sess_t *, icmp_code_t, packet_t *); +extern int icmp_parameter_problem_msg(async_sess_t *, icmp_code_t, icmp_param_t, packet_t *); Index: uspace/lib/net/include/il_remote.h =================================================================== --- uspace/lib/net/include/il_remote.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/il_remote.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -41,7 +41,7 @@ #include #include - #include #include +#include /** @name Internetwork layer module interface @@ -50,7 +50,8 @@ /*@{*/ -extern int il_device_state_msg(int, device_id_t, device_state_t, services_t); -extern int il_received_msg(int, device_id_t, packet_t *, services_t); -extern int il_mtu_changed_msg(int, device_id_t, size_t, services_t); +extern int il_device_state_msg(async_sess_t *, device_id_t, device_state_t, + services_t); +extern int il_received_msg(async_sess_t *, device_id_t, packet_t *, services_t); +extern int il_mtu_changed_msg(async_sess_t *, device_id_t, size_t, services_t); /*@}*/ Index: uspace/lib/net/include/il_skel.h =================================================================== --- uspace/lib/net/include/il_skel.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/il_skel.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -39,11 +39,9 @@ */ -#include -#include #include - #include #include #include +#include /** Module initialization. @@ -51,5 +49,5 @@ * This has to be implemented in user code. * - * @param[in] net_phone Networking module phone. + * @param[in] sess Networking module session. * * @return EOK on success. @@ -58,5 +56,5 @@ * */ -extern int il_initialize(int net_phone); +extern int il_initialize(async_sess_t *sess); /** Process the internetwork layer module message. @@ -76,5 +74,5 @@ ipc_call_t *answer, size_t *answer_count); -extern int il_module_start(int); +extern int il_module_start(sysarg_t); #endif Index: uspace/lib/net/include/ip_interface.h =================================================================== --- uspace/lib/net/include/ip_interface.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/ip_interface.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -35,14 +35,11 @@ #include -#include #include - #include #include - #include #include - #include +#include #define ip_received_error_msg ip_received_error_msg_remote @@ -61,18 +58,20 @@ /** The transport layer notification function type definition. * - * Notifies the transport layer modules about the received packet/s. + * Notify the transport layer modules about the received packet/s. * - * @param[in] device_id The device identifier. - * @param[in] packet The received packet or the received packet queue. - * @param[in] receiver The receiving module service. - * @param[in] error The packet error reporting service. Prefixes the - * received packet. - * @return EOK on success. + * @param[in] device_id Device identifier. + * @param[in] packet Received packet or the received packet queue. + * @param[in] receiver Receiving module service. + * @param[in] error Packet error reporting service. Prefixes the + * received packet. + * + * @return EOK on success. + * */ typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t *packet, services_t receiver, services_t error); -extern int ip_bind_service(services_t, int, services_t, async_client_conn_t); -extern int ip_connect_module(services_t); +extern async_sess_t *ip_bind_service(services_t, int, services_t, async_client_conn_t); +extern async_sess_t *ip_connect_module(services_t); /*@}*/ Index: uspace/lib/net/include/ip_remote.h =================================================================== --- uspace/lib/net/include/ip_remote.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/ip_remote.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -35,5 +35,4 @@ #include - #include #include @@ -42,16 +41,18 @@ #include #include +#include -extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t); -extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_t *); -extern int ip_received_error_msg_remote(int, device_id_t, packet_t *, services_t, - services_t); -extern int ip_device_req_remote(int, device_id_t, services_t); -extern int ip_add_route_req_remote(int, device_id_t, in_addr_t, in_addr_t, - in_addr_t); -extern int ip_send_msg_remote(int, device_id_t, packet_t *, services_t, - services_t); -extern int ip_get_route_req_remote(int, ip_protocol_t, const struct sockaddr *, - socklen_t, device_id_t *, void **, size_t *); +extern int ip_set_gateway_req_remote(async_sess_t *, device_id_t, in_addr_t); +extern int ip_packet_size_req_remote(async_sess_t *, device_id_t, + packet_dimension_t *); +extern int ip_received_error_msg_remote(async_sess_t *, device_id_t, packet_t *, + services_t, services_t); +extern int ip_device_req_remote(async_sess_t *, device_id_t, services_t); +extern int ip_add_route_req_remote(async_sess_t *, device_id_t, in_addr_t, + in_addr_t, in_addr_t); +extern int ip_send_msg_remote(async_sess_t *, device_id_t, packet_t *, + services_t, services_t); +extern int ip_get_route_req_remote(async_sess_t *, ip_protocol_t, + const struct sockaddr *, socklen_t, device_id_t *, void **, size_t *); #endif Index: uspace/lib/net/include/net_interface.h =================================================================== --- uspace/lib/net/include/net_interface.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/net_interface.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,4 +38,5 @@ #include #include +#include /** @name Networking module interface @@ -44,9 +45,10 @@ /*@{*/ -extern int net_get_device_conf_req(int, device_id_t, measured_string_t **, - size_t, uint8_t **); -extern int net_get_conf_req(int, measured_string_t **, size_t, uint8_t **); +extern int net_get_device_conf_req(async_sess_t *, device_id_t, + measured_string_t **, size_t, uint8_t **); +extern int net_get_conf_req(async_sess_t *, measured_string_t **, size_t, + uint8_t **); extern void net_free_settings(measured_string_t *, uint8_t *); -extern int net_connect_module(void); +extern async_sess_t *net_connect_module(void); /*@}*/ Index: uspace/lib/net/include/netif_remote.h =================================================================== --- uspace/lib/net/include/netif_remote.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/netif_remote.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -34,19 +34,18 @@ #define LIBNET_NETIF_REMOTE_H_ -#include #include #include - #include #include +#include -extern int netif_get_addr_req(int, device_id_t, measured_string_t **, +extern int netif_get_addr_req(async_sess_t *, device_id_t, measured_string_t **, uint8_t **); -extern int netif_probe_req(int, device_id_t, int, void *); -extern int netif_send_msg(int, device_id_t, packet_t *, services_t); -extern int netif_start_req(int, device_id_t); -extern int netif_stop_req(int, device_id_t); -extern int netif_stats_req(int, device_id_t, device_stats_t *); -extern int netif_bind_service(services_t, device_id_t, services_t, +extern int netif_probe_req(async_sess_t *, device_id_t, int, void *); +extern int netif_send_msg(async_sess_t *, device_id_t, packet_t *, services_t); +extern int netif_start_req(async_sess_t *, device_id_t); +extern int netif_stop_req(async_sess_t *, device_id_t); +extern int netif_stats_req(async_sess_t *, device_id_t, device_stats_t *); +extern async_sess_t *netif_bind_service(services_t, device_id_t, services_t, async_client_conn_t); Index: uspace/lib/net/include/netif_skel.h =================================================================== --- uspace/lib/net/include/netif_skel.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/netif_skel.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -39,18 +39,16 @@ #define NET_NETIF_SKEL_H_ -#include #include #include - #include #include #include +#include /** Network interface device specific data. */ typedef struct { - device_id_t device_id; /**< Device identifier. */ - int nil_phone; /**< Receiving network interface layer phone. */ - device_state_t state; /**< Actual device state. */ - void *specific; /**< Driver specific data. */ + device_id_t device_id; /**< Device identifier. */ + device_state_t state; /**< Actual device state. */ + void *specific; /**< Driver specific data. */ } netif_device_t; @@ -65,5 +63,6 @@ /** Network interface module skeleton global data. */ typedef struct { - int net_phone; /**< Networking module phone. */ + async_sess_t *sess; /**< Networking module session. */ + async_sess_t *nil_sess; /**< Network interface layer session. */ netif_device_map_t device_map; /**< Device map. */ fibril_rwlock_t lock; /**< Safety lock. */ @@ -127,5 +126,4 @@ * @return Other error codes as defined for the specific module * message implementation. - * */ Index: uspace/lib/net/include/nil_remote.h =================================================================== --- uspace/lib/net/include/nil_remote.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/nil_remote.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,29 +38,31 @@ #include #include +#include #define nil_bind_service(service, device_id, me, receiver) \ bind_service(service, device_id, me, 0, receiver) -#define nil_packet_size_req(nil_phone, device_id, packet_dimension) \ - generic_packet_size_req_remote(nil_phone, NET_NIL_PACKET_SPACE, \ +#define nil_packet_size_req(sess, device_id, packet_dimension) \ + generic_packet_size_req_remote(sess, NET_NIL_PACKET_SPACE, \ device_id, packet_dimension) -#define nil_get_addr_req(nil_phone, device_id, address, data) \ - generic_get_addr_req(nil_phone, NET_NIL_ADDR, device_id, address, data) +#define nil_get_addr_req(sess, device_id, address, data) \ + generic_get_addr_req(sess, NET_NIL_ADDR, device_id, address, data) -#define nil_get_broadcast_addr_req(nil_phone, device_id, address, data) \ - generic_get_addr_req(nil_phone, NET_NIL_BROADCAST_ADDR, device_id, \ +#define nil_get_broadcast_addr_req(sess, device_id, address, data) \ + generic_get_addr_req(sess, NET_NIL_BROADCAST_ADDR, device_id, \ address, data) -#define nil_send_msg(nil_phone, device_id, packet, sender) \ - generic_send_msg_remote(nil_phone, NET_NIL_SEND, device_id, \ +#define nil_send_msg(sess, device_id, packet, sender) \ + generic_send_msg_remote(sess, NET_NIL_SEND, device_id, \ packet_get_id(packet), sender, 0) -#define nil_device_req(nil_phone, device_id, mtu, netif_service) \ - generic_device_req_remote(nil_phone, NET_NIL_DEVICE, device_id, mtu, \ +#define nil_device_req(sess, device_id, mtu, netif_service) \ + generic_device_req_remote(sess, NET_NIL_DEVICE, device_id, mtu, \ netif_service) -extern int nil_device_state_msg(int, device_id_t, int); -extern int nil_received_msg(int, device_id_t, packet_t *, services_t); +extern int nil_device_state_msg(async_sess_t *, device_id_t, sysarg_t); +extern int nil_received_msg(async_sess_t *, device_id_t, packet_t *, + services_t); #endif Index: uspace/lib/net/include/nil_skel.h =================================================================== --- uspace/lib/net/include/nil_skel.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/nil_skel.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -39,11 +39,9 @@ #define LIBNET_NIL_SKEL_H_ -#include -#include #include - #include #include #include +#include /** Module initialization. @@ -51,5 +49,5 @@ * This has to be implemented in user code. * - * @param[in] net_phone Networking module phone. + * @param[in] sess Networking module session. * * @return EOK on success. @@ -58,5 +56,5 @@ * */ -extern int nil_initialize(int net_phone); +extern int nil_initialize(async_sess_t *sess); /** Notify the network interface layer about the device state change. @@ -64,5 +62,4 @@ * This has to be implemented in user code. * - * @param[in] nil_phone Network interface layer phone. * @param[in] device_id Device identifier. * @param[in] state New device state. @@ -73,5 +70,5 @@ * */ -extern int nil_device_state_msg_local(int, device_id_t, int); +extern int nil_device_state_msg_local(device_id_t device_id, sysarg_t state); /** Pass the packet queue to the network interface layer. @@ -82,5 +79,4 @@ * This has to be implemented in user code. * - * @param[in] nil_phone Network interface layer phone. * @param[in] device_id Source device identifier. * @param[in] packet Received packet or the received packet queue. @@ -92,5 +88,6 @@ * */ -extern int nil_received_msg_local(int, device_id_t, packet_t *, services_t); +extern int nil_received_msg_local(device_id_t device_id, packet_t *packet, + services_t target); /** Message processing function. @@ -98,5 +95,4 @@ * This has to be implemented in user code. * - * @param[in] name Module name. * @param[in] callid Message identifier. * @param[in] call Message parameters. @@ -112,8 +108,8 @@ * */ -extern int nil_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, - size_t *); +extern int nil_module_message(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, size_t *count); -extern int nil_module_start(int); +extern int nil_module_start(sysarg_t); #endif Index: uspace/lib/net/include/packet_client.h =================================================================== --- uspace/lib/net/include/packet_client.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/packet_client.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -49,4 +49,5 @@ #include +#include /** @name Packet client interface */ @@ -108,5 +109,5 @@ extern int packet_get_addr(const packet_t *, uint8_t **, uint8_t **); extern int packet_set_addr(packet_t *, const uint8_t *, const uint8_t *, size_t); -extern packet_t *packet_get_copy(int, packet_t *); +extern packet_t *packet_get_copy(async_sess_t *, packet_t *); /*@}*/ Index: uspace/lib/net/include/packet_remote.h =================================================================== --- uspace/lib/net/include/packet_remote.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/packet_remote.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -36,9 +36,11 @@ #include #include +#include -extern int packet_translate_remote(int, packet_t **, packet_id_t); -extern packet_t *packet_get_4_remote(int, size_t, size_t, size_t, size_t); -extern packet_t *packet_get_1_remote(int, size_t); -extern void pq_release_remote(int, packet_id_t); +extern int packet_translate_remote(async_sess_t *, packet_t **, packet_id_t); +extern packet_t *packet_get_4_remote(async_sess_t *, size_t, size_t, size_t, + size_t); +extern packet_t *packet_get_1_remote(async_sess_t *, size_t); +extern void pq_release_remote(async_sess_t *, packet_id_t); #endif Index: uspace/lib/net/include/socket_core.h =================================================================== --- uspace/lib/net/include/socket_core.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/socket_core.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,5 +27,5 @@ */ -/** @addtogroup libnet +/** @addtogroup libnet * @{ */ @@ -45,19 +45,20 @@ #include #include +#include /** Initial size of the received packet queue. */ -#define SOCKET_INITIAL_RECEIVED_SIZE 4 +#define SOCKET_INITIAL_RECEIVED_SIZE 4 /** Maximum size of the received packet queue. */ -#define SOCKET_MAX_RECEIVED_SIZE 0 +#define SOCKET_MAX_RECEIVED_SIZE 0 /** Initial size of the sockets for acceptance queue. */ -#define SOCKET_INITIAL_ACCEPTED_SIZE 1 +#define SOCKET_INITIAL_ACCEPTED_SIZE 1 /** Maximum size of the sockets for acceptance queue. */ -#define SOCKET_MAX_ACCEPTEDED_SIZE 0 +#define SOCKET_MAX_ACCEPTEDED_SIZE 0 /** Listening sockets' port map key. */ -#define SOCKET_MAP_KEY_LISTENING "L" +#define SOCKET_MAP_KEY_LISTENING "L" /** Type definition of the socket core. @@ -75,6 +76,6 @@ /** Socket identifier. */ int socket_id; - /** Client application phone. */ - int phone; + /** Client application session. */ + async_sess_t *sess; /** Bound port. */ int port; @@ -108,13 +109,13 @@ INT_MAP_DECLARE(socket_ports, socket_port_t); -extern void socket_cores_release(int, socket_cores_t *, socket_ports_t *, - void (*)(socket_core_t *)); +extern void socket_cores_release(async_sess_t *, socket_cores_t *, + socket_ports_t *, void (*)(socket_core_t *)); extern int socket_bind(socket_cores_t *, socket_ports_t *, int, void *, size_t, int, int, int); extern int socket_bind_free_port(socket_ports_t *, socket_core_t *, int, int, int); -extern int socket_create(socket_cores_t *, int, void *, int *); -extern int socket_destroy(int, int, socket_cores_t *, socket_ports_t *, - void (*)(socket_core_t *)); +extern int socket_create(socket_cores_t *, async_sess_t *, void *, int *); +extern int socket_destroy(async_sess_t *, int, socket_cores_t *, + socket_ports_t *, void (*)(socket_core_t *)); extern int socket_reply_packets(packet_t *, size_t *); extern socket_core_t *socket_port_find(socket_ports_t *, int, const uint8_t *, Index: uspace/lib/net/include/tl_common.h =================================================================== --- uspace/lib/net/include/tl_common.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/tl_common.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,5 +27,5 @@ */ -/** @addtogroup libnet +/** @addtogroup libnet * @{ */ @@ -39,9 +39,9 @@ #include - #include #include #include #include +#include /** Device packet dimensions. @@ -51,5 +51,5 @@ DEVICE_MAP_DECLARE(packet_dimensions, packet_dimension_t); -extern int tl_get_ip_packet_dimension(int, packet_dimensions_t *, +extern int tl_get_ip_packet_dimension(async_sess_t *, packet_dimensions_t *, device_id_t, packet_dimension_t **); extern int tl_get_address_port(const struct sockaddr *, int, uint16_t *); @@ -57,6 +57,7 @@ size_t); extern int tl_set_address_port(struct sockaddr *, int, uint16_t); -extern int tl_prepare_icmp_packet(int, int, packet_t *, services_t); -extern int tl_socket_read_packet_data(int, packet_t **, size_t, +extern int tl_prepare_icmp_packet(async_sess_t *, async_sess_t *, packet_t *, + services_t); +extern int tl_socket_read_packet_data(async_sess_t *, packet_t **, size_t, const packet_dimension_t *, const struct sockaddr *, socklen_t); @@ -65,3 +66,2 @@ /** @} */ - Index: uspace/lib/net/include/tl_remote.h =================================================================== --- uspace/lib/net/include/tl_remote.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/tl_remote.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,12 +38,11 @@ #define LIBNET_TL_REMOTE_H_ -#include #include #include - #include #include #include #include +#include /** @name Transport layer module interface @@ -52,5 +51,5 @@ /*@{*/ -extern int tl_received_msg(int, device_id_t, packet_t *, services_t, +extern int tl_received_msg(async_sess_t *, device_id_t, packet_t *, services_t, services_t); Index: uspace/lib/net/include/tl_skel.h =================================================================== --- uspace/lib/net/include/tl_skel.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/include/tl_skel.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -39,11 +39,10 @@ */ -#include #include #include - #include #include #include +#include /** Module initialization. @@ -51,5 +50,5 @@ * This has to be implemented in user code. * - * @param[in] net_phone Networking module phone. + * @param[in] sess Networking module session. * * @return EOK on success. @@ -58,5 +57,5 @@ * */ -extern int tl_initialize(int net_phone); +extern int tl_initialize(async_sess_t *sess); /** Per-connection module initialization. @@ -83,5 +82,5 @@ ipc_call_t *, size_t *); -extern int tl_module_start(int); +extern int tl_module_start(sysarg_t); #endif Index: uspace/lib/net/netif/netif_remote.c =================================================================== --- uspace/lib/net/netif/netif_remote.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/netif/netif_remote.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,8 +38,6 @@ #include #include -#include #include #include - #include #include @@ -49,8 +47,8 @@ /** Return the device local hardware address. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[out] address Device local hardware address. - * @param[out] data Address data. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[out] address Device local hardware address. + * @param[out] data Address data. * * @return EOK on success. @@ -61,8 +59,8 @@ * */ -int netif_get_addr_req(int netif_phone, device_id_t device_id, +int netif_get_addr_req(async_sess_t *sess, device_id_t device_id, measured_string_t **address, uint8_t **data) { - return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id, + return generic_get_addr_req(sess, NET_NETIF_GET_ADDR, device_id, address, data); } @@ -70,8 +68,8 @@ /** Probe the existence of the device. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[in] irq Device interrupt number. - * @param[in] io Device input/output address. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[in] irq Device interrupt number. + * @param[in] io Device input/output address. * * @return EOK on success. @@ -80,16 +78,20 @@ * */ -int netif_probe_req(int netif_phone, device_id_t device_id, int irq, void *io) +int netif_probe_req(async_sess_t *sess, device_id_t device_id, int irq, void *io) { - return async_obsolete_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq, + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_3_0(exch, NET_NETIF_PROBE, device_id, (sysarg_t) irq, (sysarg_t) io); + async_exchange_end(exch); + + return rc; } /** Send the packet queue. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[in] packet Packet queue. - * @param[in] sender Sending module service. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[in] packet Packet queue. + * @param[in] sender Sending module service. * * @return EOK on success. @@ -98,8 +100,8 @@ * */ -int netif_send_msg(int netif_phone, device_id_t device_id, packet_t *packet, +int netif_send_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, services_t sender) { - return generic_send_msg_remote(netif_phone, NET_NETIF_SEND, device_id, + return generic_send_msg_remote(sess, NET_NETIF_SEND, device_id, packet_get_id(packet), sender, 0); } @@ -107,6 +109,6 @@ /** Start the device. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. * * @return EOK on success. @@ -117,13 +119,17 @@ * */ -int netif_start_req(int netif_phone, device_id_t device_id) +int netif_start_req(async_sess_t *sess, device_id_t device_id) { - return async_obsolete_req_1_0(netif_phone, NET_NETIF_START, device_id); + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_1_0(exch, NET_NETIF_START, device_id); + async_exchange_end(exch); + + return rc; } /** Stop the device. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. * * @return EOK on success. @@ -134,19 +140,23 @@ * */ -int netif_stop_req(int netif_phone, device_id_t device_id) +int netif_stop_req(async_sess_t *sess, device_id_t device_id) { - return async_obsolete_req_1_0(netif_phone, NET_NETIF_STOP, device_id); + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_1_0(exch, NET_NETIF_STOP, device_id); + async_exchange_end(exch); + + return rc; } /** Return the device usage statistics. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[out] stats Device usage statistics. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[out] stats Device usage statistics. * * @return EOK on success. * */ -int netif_stats_req(int netif_phone, device_id_t device_id, +int netif_stats_req(async_sess_t *sess, device_id_t device_id, device_stats_t *stats) { @@ -154,7 +164,9 @@ return EBADMEM; - aid_t message_id = async_obsolete_send_1(netif_phone, NET_NETIF_STATS, + async_exch_t *exch = async_exchange_begin(sess); + aid_t message_id = async_send_1(exch, NET_NETIF_STATS, (sysarg_t) device_id, NULL); - async_obsolete_data_read_start(netif_phone, stats, sizeof(*stats)); + async_data_read_start(exch, stats, sizeof(*stats)); + async_exchange_end(exch); sysarg_t result; @@ -169,16 +181,14 @@ * register the message receiver. * - * @param[in] service The network interface module service. - * @param[in] device_id The device identifier. - * @param[in] me The requesting module service. - * @param[in] receiver The message receiver. + * @param[in] service Network interface module service. + * @param[in] device_id Device identifier. + * @param[in] me Requesting module service. + * @param[in] receiver Message receiver. * - * @return The phone of the needed service. - * @return EOK on success. - * @return Other error codes as defined for the bind_service() - * function. + * @return Session to the needed service. + * @return NULL on failure. * */ -int netif_bind_service(services_t service, device_id_t device_id, +async_sess_t *netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver) { Index: uspace/lib/net/netif/netif_skel.c =================================================================== --- uspace/lib/net/netif/netif_skel.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/netif/netif_skel.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -54,7 +54,4 @@ #include -// FIXME: remove this header -#include - DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t); @@ -64,5 +61,4 @@ /** Probe the existence of the device. * - * @param[in] netif_phone Network interface phone. * @param[in] device_id Device identifier. * @param[in] irq Device interrupt number. @@ -74,6 +70,5 @@ * */ -static int netif_probe_req_local(int netif_phone, device_id_t device_id, - int irq, void *io) +static int netif_probe_req_local(device_id_t device_id, int irq, void *io) { fibril_rwlock_write_lock(&netif_globals.lock); @@ -86,5 +81,4 @@ /** Send the packet queue. * - * @param[in] netif_phone Network interface phone. * @param[in] device_id Device identifier. * @param[in] packet Packet queue. @@ -96,6 +90,6 @@ * */ -static int netif_send_msg_local(int netif_phone, device_id_t device_id, - packet_t *packet, services_t sender) +static int netif_send_msg_local(device_id_t device_id, packet_t *packet, + services_t sender) { fibril_rwlock_write_lock(&netif_globals.lock); @@ -108,5 +102,4 @@ /** Start the device. * - * @param[in] netif_phone Network interface phone. * @param[in] device_id Device identifier. * @@ -118,5 +111,5 @@ * */ -static int netif_start_req_local(int netif_phone, device_id_t device_id) +static int netif_start_req_local(device_id_t device_id) { fibril_rwlock_write_lock(&netif_globals.lock); @@ -131,6 +124,5 @@ int result = netif_start_message(device); if (result > NETIF_NULL) { - int phone = device->nil_phone; - nil_device_state_msg(phone, device_id, result); + nil_device_state_msg(netif_globals.nil_sess, device_id, result); fibril_rwlock_write_unlock(&netif_globals.lock); return EOK; @@ -144,5 +136,4 @@ /** Stop the device. * - * @param[in] netif_phone Network interface phone. * @param[in] device_id Device identifier. * @@ -154,5 +145,5 @@ * */ -static int netif_stop_req_local(int netif_phone, device_id_t device_id) +static int netif_stop_req_local(device_id_t device_id) { fibril_rwlock_write_lock(&netif_globals.lock); @@ -167,6 +158,5 @@ int result = netif_stop_message(device); if (result > NETIF_NULL) { - int phone = device->nil_phone; - nil_device_state_msg(phone, device_id, result); + nil_device_state_msg(netif_globals.nil_sess, device_id, result); fibril_rwlock_write_unlock(&netif_globals.lock); return EOK; @@ -222,5 +212,5 @@ void netif_pq_release(packet_id_t packet_id) { - pq_release_remote(netif_globals.net_phone, packet_id); + pq_release_remote(netif_globals.sess, packet_id); } @@ -235,31 +225,29 @@ packet_t *netif_packet_get_1(size_t content) { - return packet_get_1_remote(netif_globals.net_phone, content); + return packet_get_1_remote(netif_globals.sess, content); } /** Register the device notification receiver, * - * Register a network interface layer module as the device + * Register a network interface layer module as the device * notification receiver. * - * @param[in] device_id Device identifier. - * @param[in] phone Network interface layer module phone. - * - * @return EOK on success. - * @return ENOENT if there is no such device. + * @param[in] sess Session to the network interface layer module. + * + * @return EOK on success. * @return ELIMIT if there is another module registered. * */ -static int register_message(device_id_t device_id, int phone) -{ - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) - return rc; - - if (device->nil_phone >= 0) +static int register_message(async_sess_t *sess) +{ + fibril_rwlock_write_lock(&netif_globals.lock); + if (netif_globals.nil_sess != NULL) { + fibril_rwlock_write_unlock(&netif_globals.lock); return ELIMIT; - - device->nil_phone = phone; + } + + netif_globals.nil_sess = sess; + + fibril_rwlock_write_unlock(&netif_globals.lock); return EOK; } @@ -294,28 +282,25 @@ return EOK; + async_sess_t *callback = + async_callback_receive_start(EXCHANGE_SERIALIZE, call); + if (callback) + return register_message(callback); + switch (IPC_GET_IMETHOD(*call)) { case NET_NETIF_PROBE: - return netif_probe_req_local(0, IPC_GET_DEVICE(*call), + return netif_probe_req_local(IPC_GET_DEVICE(*call), NETIF_GET_IRQ(*call), NETIF_GET_IO(*call)); - case IPC_M_CONNECT_TO_ME: - fibril_rwlock_write_lock(&netif_globals.lock); - - rc = register_message(IPC_GET_DEVICE(*call), IPC_GET_PHONE(*call)); - - fibril_rwlock_write_unlock(&netif_globals.lock); - return rc; - case NET_NETIF_SEND: - rc = packet_translate_remote(netif_globals.net_phone, &packet, + rc = packet_translate_remote(netif_globals.sess, &packet, IPC_GET_PACKET(*call)); if (rc != EOK) return rc; - return netif_send_msg_local(0, IPC_GET_DEVICE(*call), packet, + return netif_send_msg_local(IPC_GET_DEVICE(*call), packet, IPC_GET_SENDER(*call)); case NET_NETIF_START: - return netif_start_req_local(0, IPC_GET_DEVICE(*call)); + return netif_start_req_local(IPC_GET_DEVICE(*call)); case NET_NETIF_STATS: @@ -343,5 +328,5 @@ case NET_NETIF_STOP: - return netif_stop_req_local(0, IPC_GET_DEVICE(*call)); + return netif_stop_req_local(IPC_GET_DEVICE(*call)); case NET_NETIF_GET_ADDR: @@ -412,5 +397,6 @@ async_set_client_connection(netif_client_connection); - netif_globals.net_phone = connect_to_service(SERVICE_NETWORKING); + netif_globals.sess = connect_to_service(SERVICE_NETWORKING); + netif_globals.nil_sess = NULL; netif_device_map_initialize(&netif_globals.device_map); Index: uspace/lib/net/nil/nil_remote.c =================================================================== --- uspace/lib/net/nil/nil_remote.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/nil/nil_remote.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -45,5 +45,5 @@ /** Notify the network interface layer about the device state change. * - * @param[in] nil_phone Network interface layer phone. + * @param[in] sess Network interface layer session. * @param[in] device_id Device identifier. * @param[in] state New device state. @@ -54,7 +54,8 @@ * */ -int nil_device_state_msg(int nil_phone, device_id_t device_id, int state) +int nil_device_state_msg(async_sess_t *sess, device_id_t device_id, + sysarg_t state) { - return generic_device_state_msg_remote(nil_phone, NET_NIL_DEVICE_STATE, + return generic_device_state_msg_remote(sess, NET_NIL_DEVICE_STATE, device_id, state, 0); } @@ -65,5 +66,5 @@ * upper layers. * - * @param[in] nil_phone Network interface layer phone. + * @param[in] sess Network interface layer session. * @param[in] device_id Source device identifier. * @param[in] packet Received packet or the received packet queue. @@ -75,8 +76,8 @@ * */ -int nil_received_msg(int nil_phone, device_id_t device_id, +int nil_received_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, services_t target) { - return generic_received_msg_remote(nil_phone, NET_NIL_RECEIVED, + return generic_received_msg_remote(sess, NET_NIL_RECEIVED, device_id, packet_get_id(packet), target, 0); } Index: uspace/lib/net/nil/nil_skel.c =================================================================== --- uspace/lib/net/nil/nil_skel.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/nil/nil_skel.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,10 +38,8 @@ #include #include +#include #include #include #include - -// FIXME: remove this header -#include /** Default thread for new connections. @@ -99,14 +97,12 @@ * @return Other error codes as defined for the nil_initialize() * function. - * @return Other error codes as defined for the REGISTER_ME() macro - * function. * */ -int nil_module_start(int service) +int nil_module_start(sysarg_t service) { async_set_client_connection(nil_client_connection); - int net_phone = net_connect_module(); - if (net_phone < 0) - return net_phone; + async_sess_t *sess = net_connect_module(); + if (!sess) + return ENOENT; int rc = pm_init(); @@ -114,9 +110,9 @@ return rc; - rc = nil_initialize(net_phone); + rc = nil_initialize(sess); if (rc != EOK) goto out; - rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL); + rc = service_register(service); if (rc != EOK) goto out; Index: uspace/lib/net/tl/icmp_remote.c =================================================================== --- uspace/lib/net/tl/icmp_remote.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/tl/icmp_remote.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -39,13 +39,11 @@ #include #include - -#include -#include -#include #include #include #include +#include +#include -/** Sends the Destination Unreachable error notification packet. +/** Send the Destination Unreachable error notification packet. * * Beginning of the packet is sent as the notification packet data. @@ -53,22 +51,26 @@ * packet. * - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] code The error specific code. - * @param[in] mtu The error MTU value. - * @param[in] packet The original packet. - * @return EOK on success. - * @return EPERM if the ICMP error notifications are disabled. - * @return ENOMEM if there is not enough memory left. + * @param[in] sess ICMP module session. + * @param[in] code Error specific code. + * @param[in] mtu Error MTU value. + * @param[in] packet Original packet. + * + * @return EOK on success. + * @return EPERM if the ICMP error notifications are disabled. + * @return ENOMEM if there is not enough memory left. + * */ -int -icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, +int icmp_destination_unreachable_msg(async_sess_t *sess, icmp_code_t code, icmp_param_t mtu, packet_t *packet) { - async_obsolete_msg_3(icmp_phone, NET_ICMP_DEST_UNREACH, (sysarg_t) code, + async_exch_t *exch = async_exchange_begin(sess); + async_msg_3(exch, NET_ICMP_DEST_UNREACH, (sysarg_t) code, (sysarg_t) packet_get_id(packet), (sysarg_t) mtu); + async_exchange_end(exch); + return EOK; } -/** Sends the Source Quench error notification packet. +/** Send the Source Quench error notification packet. * * Beginning of the packet is sent as the notification packet data. @@ -76,18 +78,23 @@ * packet. * - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] packet The original packet. - * @return EOK on success. - * @return EPERM if the ICMP error notifications are disabled. - * @return ENOMEM if there is not enough memory left. + * @param[in] sess ICMP module session. + * @param[in] packet Original packet. + * + * @return EOK on success. + * @return EPERM if the ICMP error notifications are disabled. + * @return ENOMEM if there is not enough memory left. + * */ -int icmp_source_quench_msg(int icmp_phone, packet_t *packet) +int icmp_source_quench_msg(async_sess_t *sess, packet_t *packet) { - async_obsolete_msg_2(icmp_phone, NET_ICMP_SOURCE_QUENCH, 0, + async_exch_t *exch = async_exchange_begin(sess); + async_msg_2(exch, NET_ICMP_SOURCE_QUENCH, 0, (sysarg_t) packet_get_id(packet)); + async_exchange_end(exch); + return EOK; } -/** Sends the Time Exceeded error notification packet. +/** Send the Time Exceeded error notification packet. * * Beginning of the packet is sent as the notification packet data. @@ -95,19 +102,25 @@ * packet. * - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] code The error specific code. - * @param[in] packet The original packet. - * @return EOK on success. - * @return EPERM if the ICMP error notifications are disabled. - * @return ENOMEM if there is not enough memory left. + * @param[in] sess ICMP module session. + * @param[in] code Error specific code. + * @param[in] packet Original packet. + * + * @return EOK on success. + * @return EPERM if the ICMP error notifications are disabled. + * @return ENOMEM if there is not enough memory left. + * */ -int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t *packet) +int icmp_time_exceeded_msg(async_sess_t *sess, icmp_code_t code, + packet_t *packet) { - async_obsolete_msg_2(icmp_phone, NET_ICMP_TIME_EXCEEDED, (sysarg_t) code, + async_exch_t *exch = async_exchange_begin(sess); + async_msg_2(exch, NET_ICMP_TIME_EXCEEDED, (sysarg_t) code, (sysarg_t) packet_get_id(packet)); + async_exchange_end(exch); + return EOK; } -/** Sends the Parameter Problem error notification packet. +/** Send the Parameter Problem error notification packet. * * Beginning of the packet is sent as the notification packet data. @@ -115,17 +128,22 @@ * packet. * - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] code The error specific code. - * @param[in] pointer The problematic parameter offset. - * @param[in] packet The original packet. - * @return EOK on success. - * @return EPERM if the ICMP error notifications are disabled. - * @return ENOMEM if there is not enough memory left. + * @param[in] sess ICMP module session. + * @param[in] code Error specific code. + * @param[in] pointer Problematic parameter offset. + * @param[in] packet Original packet. + * + * @return EOK on success. + * @return EPERM if the ICMP error notifications are disabled. + * @return ENOMEM if there is not enough memory left. + * */ -int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code, +int icmp_parameter_problem_msg(async_sess_t *sess, icmp_code_t code, icmp_param_t pointer, packet_t *packet) { - async_obsolete_msg_3(icmp_phone, NET_ICMP_PARAMETERPROB, (sysarg_t) code, + async_exch_t *exch = async_exchange_begin(sess); + async_msg_3(exch, NET_ICMP_PARAMETERPROB, (sysarg_t) code, (sysarg_t) packet_get_id(packet), (sysarg_t) pointer); + async_exchange_end(exch); + return EOK; } @@ -133,3 +151,2 @@ /** @} */ - Index: uspace/lib/net/tl/socket_core.c =================================================================== --- uspace/lib/net/tl/socket_core.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/tl/socket_core.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,5 +38,4 @@ #include #include - #include #include @@ -44,9 +43,7 @@ #include #include - #include #include #include - #include #include @@ -56,5 +53,5 @@ * switching to the sequence. */ -#define SOCKET_ID_TRIES 100 +#define SOCKET_ID_TRIES 100 /** Bound port sockets.*/ @@ -72,23 +69,21 @@ INT_MAP_IMPLEMENT(socket_ports, socket_port_t); -/** Destroys the socket. +/** Destroy the socket. * * If the socket is bound, the port is released. - * Releases all buffered packets, calls the release function and removes the + * Release all buffered packets, call the release function and remove the * socket from the local sockets. * - * @param[in] packet_phone The packet server phone to release buffered packets. - * @param[in] socket The socket to be destroyed. - * @param[in,out] local_sockets The local sockets to be updated. - * @param[in,out] global_sockets The global sockets to be updated. - * @param[in] socket_release The client release callback function. - */ -static void -socket_destroy_core(int packet_phone, socket_core_t *socket, + * @param[in] sess Packet server session. + * @param[in] socket Socket to be destroyed. + * @param[in,out] local_sockets Local sockets to be updated. + * @param[in,out] global_sockets Global sockets to be updated. + * @param[in] socket_release Client release callback function. + * + */ +static void socket_destroy_core(async_sess_t *sess, socket_core_t *socket, socket_cores_t *local_sockets, socket_ports_t *global_sockets, void (* socket_release)(socket_core_t *socket)) { - int packet_id; - /* If bound */ if (socket->port) { @@ -98,44 +93,44 @@ /* Release all received packets */ + int packet_id; while ((packet_id = dyn_fifo_pop(&socket->received)) >= 0) - pq_release_remote(packet_phone, packet_id); - + pq_release_remote(sess, packet_id); + dyn_fifo_destroy(&socket->received); dyn_fifo_destroy(&socket->accepted); - + if (socket_release) socket_release(socket); - + socket_cores_exclude(local_sockets, socket->socket_id, free); } -/** Destroys local sockets. - * - * Releases all buffered packets and calls the release function for each of the +/** Destroy local sockets. + * + * Release all buffered packets and call the release function for each of the * sockets. * - * @param[in] packet_phone The packet server phone to release buffered packets. - * @param[in] local_sockets The local sockets to be destroyed. - * @param[in,out] global_sockets The global sockets to be updated. - * @param[in] socket_release The client release callback function. - */ -void -socket_cores_release(int packet_phone, socket_cores_t *local_sockets, + * @param[in] sess Packet server session. + * @param[in] local_sockets Local sockets to be destroyed. + * @param[in,out] global_sockets Global sockets to be updated. + * @param[in] socket_release Client release callback function. + * + */ +void socket_cores_release(async_sess_t *sess, socket_cores_t *local_sockets, socket_ports_t *global_sockets, void (* socket_release)(socket_core_t *socket)) { - int index; - if (!socket_cores_is_valid(local_sockets)) return; - + local_sockets->magic = 0; - + + int index; for (index = 0; index < local_sockets->next; ++index) { if (socket_cores_item_is_valid(&local_sockets->items[index])) { local_sockets->items[index].magic = 0; - + if (local_sockets->items[index].value) { - socket_destroy_core(packet_phone, + socket_destroy_core(sess, local_sockets->items[index].value, local_sockets, global_sockets, @@ -146,5 +141,5 @@ } } - + free(local_sockets->items); } @@ -406,18 +401,20 @@ } -/** Creates a new socket. - * - * @param[in,out] local_sockets The local sockets to be updated. - * @param[in] app_phone The application phone. - * @param[in] specific_data The socket specific data. - * @param[in,out] socket_id The new socket identifier. A new identifier is - * chosen if set to zero or negative. A negative identifier - * is chosen if set to negative. - * @return EOK on success. - * @return EINVAL if the socket_id parameter is NULL. - * @return ENOMEM if there is not enough memory left. - */ -int -socket_create(socket_cores_t *local_sockets, int app_phone, +/** Create a new socket. + * + * @param[in,out] local_sockets Local sockets to be updated. + * @param[in] sess Application session. + * @param[in] specific_data Socket specific data. + * @param[in,out] socket_id New socket identifier. A new identifier + * is chosen if set to zero or negative. + * A negative identifier is chosen if set + * to negative. + * + * @return EOK on success. + * @return EINVAL if the socket_id parameter is NULL. + * @return ENOMEM if there is not enough memory left. + * + */ +int socket_create(socket_cores_t *local_sockets, async_sess_t* sess, void *specific_data, int *socket_id) { @@ -446,5 +443,5 @@ /* Initialize */ - socket->phone = app_phone; + socket->sess = sess; socket->port = -1; socket->key = NULL; @@ -475,37 +472,37 @@ } -/** Destroys the socket. +/** Destroy the socket. * * If the socket is bound, the port is released. - * Releases all buffered packets, calls the release function and removes the + * Release all buffered packets, call the release function and remove the * socket from the local sockets. * - * @param[in] packet_phone The packet server phone to release buffered packets. - * @param[in] socket_id The socket identifier. - * @param[in,out] local_sockets The local sockets to be updated. - * @param[in,out] global_sockets The global sockets to be updated. - * @param[in] socket_release The client release callback function. - * @return EOK on success. - * @return ENOTSOCK if the socket is not found. + * @param[in] sess Packet server session. + * @param[in] socket_id Socket identifier. + * @param[in,out] local_sockets Local sockets to be updated. + * @param[in,out] global_sockets Global sockets to be updated. + * @param[in] socket_release Client release callback function. + * + * @return EOK on success. + * @return ENOTSOCK if the socket is not found. + * */ int -socket_destroy(int packet_phone, int socket_id, socket_cores_t *local_sockets, +socket_destroy(async_sess_t *sess, int socket_id, socket_cores_t *local_sockets, socket_ports_t *global_sockets, void (*socket_release)(socket_core_t *socket)) { - socket_core_t *socket; - int accepted_id; - /* Find the socket */ - socket = socket_cores_find(local_sockets, socket_id); + socket_core_t *socket = socket_cores_find(local_sockets, socket_id); if (!socket) return ENOTSOCK; /* Destroy all accepted sockets */ + int accepted_id; while ((accepted_id = dyn_fifo_pop(&socket->accepted)) >= 0) - socket_destroy(packet_phone, accepted_id, local_sockets, + socket_destroy(sess, accepted_id, local_sockets, global_sockets, socket_release); - socket_destroy_core(packet_phone, socket, local_sockets, global_sockets, + socket_destroy_core(sess, socket, local_sockets, global_sockets, socket_release); Index: uspace/lib/net/tl/tl_common.c =================================================================== --- uspace/lib/net/tl/tl_common.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/tl/tl_common.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -43,5 +43,4 @@ #include #include - #include #include @@ -50,5 +49,4 @@ #include #include - #include #include @@ -107,22 +105,21 @@ * The reply is cached then. * - * @param[in] ip_phone The IP moduel phone for (semi)remote calls. - * @param[in] packet_dimensions The packet dimensions cache. - * @param[in] device_id The device identifier. - * @param[out] packet_dimension The IP packet dimensions. - * @return EOK on success. - * @return EBADMEM if the packet_dimension parameter is NULL. - * @return ENOMEM if there is not enough memory left. - * @return EINVAL if the packet_dimensions cache is not valid. - * @return Other codes as defined for the ip_packet_size_req() - * function. - */ -int -tl_get_ip_packet_dimension(int ip_phone, + * @param[in] sess IP module session. + * @param[in] packet_dimensions Packet dimensions cache. + * @param[in] device_id Device identifier. + * @param[out] packet_dimension IP packet dimensions. + * + * @return EOK on success. + * @return EBADMEM if the packet_dimension parameter is NULL. + * @return ENOMEM if there is not enough memory left. + * @return EINVAL if the packet_dimensions cache is not valid. + * @return Other codes as defined for the ip_packet_size_req() + * function. + * + */ +int tl_get_ip_packet_dimension(async_sess_t *sess, packet_dimensions_t *packet_dimensions, device_id_t device_id, packet_dimension_t **packet_dimension) { - int rc; - if (!packet_dimension) return EBADMEM; @@ -133,8 +130,8 @@ /* Ask for and remember them if not found */ *packet_dimension = malloc(sizeof(**packet_dimension)); - if(!*packet_dimension) + if (!*packet_dimension) return ENOMEM; - rc = ip_packet_size_req(ip_phone, device_id, *packet_dimension); + int rc = ip_packet_size_req(sess, device_id, *packet_dimension); if (rc != EOK) { free(*packet_dimension); @@ -236,30 +233,28 @@ /** Prepares the packet for ICMP error notification. * - * Keeps the first packet and releases all the others. - * Releases all the packets on error. - * - * @param[in] packet_phone The packet server module phone. - * @param[in] icmp_phone The ICMP module phone. - * @param[in] packet The packet to be send. - * @param[in] error The packet error reporting service. Prefixes the - * received packet. - * @return EOK on success. - * @return ENOENT if no packet may be sent. - */ -int -tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t *packet, - services_t error) -{ - packet_t *next; + * Keep the first packet and release all the others. + * Release all the packets on error. + * + * @param[in] packet_sess Packet server module session. + * @param[in] icmp_sess ICMP module phone. + * @param[in] packet Packet to be send. + * @param[in] error Packet error reporting service. Prefixes the + * received packet. + * + * @return EOK on success. + * @return ENOENT if no packet may be sent. + * + */ +int tl_prepare_icmp_packet(async_sess_t *packet_sess, async_sess_t *icmp_sess, + packet_t *packet, services_t error) +{ + /* Detach the first packet and release the others */ + packet_t *next = pq_detach(packet); + if (next) + pq_release_remote(packet_sess, packet_get_id(next)); + uint8_t *src; - int length; - - /* Detach the first packet and release the others */ - next = pq_detach(packet); - if (next) - pq_release_remote(packet_phone, packet_get_id(next)); - - length = packet_get_addr(packet, &src, NULL); - if ((length > 0) && (!error) && (icmp_phone >= 0) && + int length = packet_get_addr(packet, &src, NULL); + if ((length > 0) && (!error) && (icmp_sess) && /* * Set both addresses to the source one (avoids the source address @@ -269,6 +264,6 @@ return EOK; } else - pq_release_remote(packet_phone, packet_get_id(packet)); - + pq_release_remote(packet_sess, packet_get_id(packet)); + return ENOENT; } @@ -276,20 +271,21 @@ /** Receives data from the socket into a packet. * - * @param[in] packet_phone The packet server module phone. - * @param[out] packet The new created packet. - * @param[in] prefix Reserved packet data prefix length. - * @param[in] dimension The packet dimension. - * @param[in] addr The destination address. - * @param[in] addrlen The address length. - * @return Number of bytes received. - * @return EINVAL if the client does not send data. - * @return ENOMEM if there is not enough memory left. - * @return Other error codes as defined for the - * async_data_read_finalize() function. - */ -int -tl_socket_read_packet_data(int packet_phone, packet_t **packet, size_t prefix, - const packet_dimension_t *dimension, const struct sockaddr *addr, - socklen_t addrlen) + * @param[in] sess Packet server module session. + * @param[out] packet New created packet. + * @param[in] prefix Reserved packet data prefix length. + * @param[in] dimension Packet dimension. + * @param[in] addr Destination address. + * @param[in] addrlen Address length. + * + * @return Number of bytes received. + * @return EINVAL if the client does not send data. + * @return ENOMEM if there is not enough memory left. + * @return Other error codes as defined for the + * async_data_read_finalize() function. + * + */ +int tl_socket_read_packet_data(async_sess_t *sess, packet_t **packet, + size_t prefix, const packet_dimension_t *dimension, + const struct sockaddr *addr, socklen_t addrlen) { ipc_callid_t callid; @@ -306,5 +302,5 @@ /* Get a new packet */ - *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len, + *packet = packet_get_4_remote(sess, length, dimension->addr_len, prefix + dimension->prefix, dimension->suffix); if (!packet) @@ -314,5 +310,5 @@ data = packet_suffix(*packet, length); if (!data) { - pq_release_remote(packet_phone, packet_get_id(*packet)); + pq_release_remote(sess, packet_get_id(*packet)); return ENOMEM; } @@ -321,5 +317,5 @@ rc = async_data_write_finalize(callid, data, length); if (rc != EOK) { - pq_release_remote(packet_phone, packet_get_id(*packet)); + pq_release_remote(sess, packet_get_id(*packet)); return rc; } @@ -328,5 +324,5 @@ rc = packet_set_addr(*packet, NULL, (uint8_t *) addr, addrlen); if (rc != EOK) { - pq_release_remote(packet_phone, packet_get_id(*packet)); + pq_release_remote(sess, packet_get_id(*packet)); return rc; } Index: uspace/lib/net/tl/tl_remote.c =================================================================== --- uspace/lib/net/tl/tl_remote.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/tl/tl_remote.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -34,22 +34,21 @@ #include #include - #include #include - #include #include +#include /** Notify the remote transport layer modules about the received packet/s. * - * @param[in] tl_phone The transport layer module phone used for remote calls. - * @param[in] device_id The device identifier. - * @param[in] packet The received packet or the received packet queue. + * @param[in] sess Transport layer module session. + * @param[in] device_id Device identifier. + * @param[in] packet Received packet or the received packet queue. * The packet queue is used to carry a fragmented * datagram. The first packet contains the headers, * the others contain only data. - * @param[in] target The target transport layer module service to be + * @param[in] target Target transport layer module service to be * delivered to. - * @param[in] error The packet error reporting service. Prefixes the + * @param[in] error Packet error reporting service. Prefixes the * received packet. * @@ -57,8 +56,8 @@ * */ -int tl_received_msg(int tl_phone, device_id_t device_id, packet_t *packet, +int tl_received_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, services_t target, services_t error) { - return generic_received_msg_remote(tl_phone, NET_TL_RECEIVED, device_id, + return generic_received_msg_remote(sess, NET_TL_RECEIVED, device_id, packet_get_id(packet), target, error); } Index: uspace/lib/net/tl/tl_skel.c =================================================================== --- uspace/lib/net/tl/tl_skel.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/net/tl/tl_skel.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -38,16 +38,14 @@ #include #include +#include #include #include #include -// FIXME: remove this header -#include - /** Default thread for new connections. * - * @param[in] iid The initial message identifier. - * @param[in] icall The initial message call structure. - * @param[in] arg Local argument. + * @param[in] iid The initial message identifier. + * @param[in] icall The initial message call structure. + * @param[in] arg Local argument. * */ @@ -106,10 +104,10 @@ * */ -int tl_module_start(int service) +int tl_module_start(sysarg_t service) { async_set_client_connection(tl_client_connection); - int net_phone = net_connect_module(); - if (net_phone < 0) - return net_phone; + async_sess_t *sess = net_connect_module(); + if (!sess) + return ENOENT; int rc = pm_init(); @@ -117,9 +115,9 @@ return rc; - rc = tl_initialize(net_phone); + rc = tl_initialize(sess); if (rc != EOK) goto out; - rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL); + rc = service_register(service); if (rc != EOK) goto out; Index: uspace/lib/packet/generic/packet_server.c =================================================================== --- uspace/lib/packet/generic/packet_server.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/packet/generic/packet_server.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -36,5 +36,4 @@ #include - #include #include @@ -317,15 +316,13 @@ * packet_release_wrapper() function. */ -int -packet_server_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, +int packet_server_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, size_t *answer_count) { packet_t *packet; - - *answer_count = 0; if (!IPC_GET_IMETHOD(*call)) return EOK; + *answer_count = 0; switch (IPC_GET_IMETHOD(*call)) { case NET_PACKET_CREATE_1: Index: uspace/lib/scsi/Makefile =================================================================== --- uspace/lib/scsi/Makefile (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/scsi/Makefile (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,36 @@ +# +# 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. +# + +USPACE_PREFIX = ../.. +EXTRA_CFLAGS = -Iinclude +LIBRARY = libscsi + +SOURCES = \ + src/spc.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/scsi/include/scsi/sbc.h =================================================================== --- uspace/lib/scsi/include/scsi/sbc.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/scsi/include/scsi/sbc.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,152 @@ +/* + * 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 libscsi + * @{ + */ +/** + * @file SCSI Block Commands. + */ + +#ifndef LIBSCSI_SBC_H_ +#define LIBSCSI_SBC_H_ + +#include + +/** SCSI command codes defined in SCSI-SBC */ +enum scsi_cmd_sbc { + SCSI_CMD_READ_6 = 0x08, + SCSI_CMD_READ_10 = 0x28, + SCSI_CMD_READ_12 = 0xa8, + SCSI_CMD_READ_16 = 0x88, + SCSI_CMD_READ_32 = 0x7f, + + SCSI_CMD_READ_CAPACITY_10 = 0x25, + SCSI_CMD_READ_CAPACITY_16 = 0x9e, + + SCSI_CMD_WRITE_6 = 0x0a, + SCSI_CMD_WRITE_10 = 0x2a, + SCSI_CMD_WRITE_12 = 0xaa, + SCSI_CMD_WRITE_16 = 0x8a +}; + +/** SCSI Read (12) command */ +typedef struct { + /** Operation code (SCSI_CMD_READ_12) */ + uint8_t op_code; + /** RdProtect, DPO, FUA, Reserved, FUA_NV, Reserved */ + uint8_t flags; + /** Logical block address */ + uint32_t lba; + /** Transfer length */ + uint32_t xfer_len; + /** Reserved, Group Number */ + uint8_t group_no; + /** Control */ + uint8_t control; +} __attribute__((packed)) scsi_cdb_read_12_t; + +/** SCSI Read (16) command */ +typedef struct { + /** Operation code (SCSI_CMD_READ_16) */ + uint8_t op_code; + /** RdProtect, DPO, FUA, Reserved, FUA_NV, Reserved */ + uint8_t flags; + /** Logical block address */ + uint64_t lba; + /** Transfer length */ + uint32_t xfer_len; + /** Reserved, Group Number */ + uint8_t group_no; + /** Control */ + uint8_t control; +} __attribute__((packed)) scsi_cdb_read_16_t; + +/** SCSI Read Capacity (10) command */ +typedef struct { + /** Operation code (SCSI_CMD_READ_CAPACITY_10) */ + uint8_t op_code; + /** Reserved, Obsolete */ + uint8_t reserved_1; + /** Logical block address */ + uint32_t lba; + /** Reserved */ + uint32_t reserved_6; + /** Reserved, PM */ + uint8_t pm; + /** Control */ + uint8_t control; +} __attribute__((packed)) scsi_cdb_read_capacity_10_t; + +/** Read Capacity (10) parameter data. + * + * Returned for Read Capacity (10) command. + */ +typedef struct { + /** Logical address of last block */ + uint32_t last_lba; + /** Size of block in bytes */ + uint32_t block_size; +} scsi_read_capacity_10_data_t; + +/** SCSI Write (12) command */ +typedef struct { + /** Operation code (SCSI_CMD_WRITE_12) */ + uint8_t op_code; + /** WrProtect, DPO, FUA, Reserved, FUA_NV, Reserved */ + uint8_t flags; + /** Logical block address */ + uint32_t lba; + /** Transfer length */ + uint32_t xfer_len; + /** Reserved, Group Number */ + uint8_t group_no; + /** Control */ + uint8_t control; +} __attribute__((packed)) scsi_cdb_write_12_t; + +/** SCSI Write (16) command */ +typedef struct { + /** Operation code (SCSI_CMD_WRITE_16) */ + uint8_t op_code; + /** WrProtect, DPO, FUA, Reserved, FUA_NV, Reserved */ + uint8_t flags; + /** Logical block address */ + uint64_t lba; + /** Transfer length */ + uint32_t xfer_len; + /** Reserved, Group Number */ + uint8_t group_no; + /** Control */ + uint8_t control; +} __attribute__((packed)) scsi_cdb_write_16_t; + +#endif + +/** @} + */ Index: uspace/lib/scsi/include/scsi/spc.h =================================================================== --- uspace/lib/scsi/include/scsi/spc.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/scsi/include/scsi/spc.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,216 @@ +/* + * 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 libscsi + * @{ + */ +/** + * @file SCSI Primary Commands. + */ + +#ifndef LIBSCSI_SPC_H_ +#define LIBSCSI_SPC_H_ + +#include +#include + +/** SCSI command codes defined in SCSI-SPC */ +enum scsi_cmd_spc { + SCSI_CMD_INQUIRY = 0x12, + SCSI_CMD_REQUEST_SENSE = 0x03 +}; + +/** SCSI Inquiry command */ +typedef struct { + /** Operation code (SCSI_CMD_INQUIRY) */ + uint8_t op_code; + /** Reserved:7-2, obsolete:1, evpd:0 */ + uint8_t evpd; + /* Page Code */ + uint8_t page_code; + /* Allocation Length */ + uint16_t alloc_len; + /* Control */ + uint8_t control; +} __attribute__((packed)) scsi_cdb_inquiry_t; + +/** Minimum size of inquiry data required since SCSI-2 */ +#define SCSI_STD_INQUIRY_DATA_MIN_SIZE 36 + +/** Standard inquiry data. + * + * Returned for Inquiry command with evpd bit cleared. + */ +typedef struct { + /** Peripheral qualifier, Peripheral device type */ + uint8_t pqual_devtype; + /** RMB, reserved */ + uint8_t rmb; + /** Version */ + uint8_t version; + /** Obsolete, NormACA, HiSup, Response Data Format */ + uint8_t aca_hisup_rdf; + /** Additional Length */ + uint8_t additional_len; + /** SCCS, ACC, TPGS, 3PC, Reserved, Protect */ + uint8_t cap1; + /** Obsolete, EncServ, VS, MuliP, Obsolete, Addr16 */ + uint8_t cap2; + /** Obsolete, WBus16, Sync, Obsolete, CmdQue, VS */ + uint8_t cap3; + + /** Vendor string */ + uint8_t vendor[8]; + /** Product string */ + uint8_t product[16]; + /** Revision string */ + uint8_t revision[4]; + + /* End of required data */ +} __attribute__((packed)) scsi_std_inquiry_data_t; + +/** Size of struct or union member. */ +#define SCSI_MEMBER_SIZE(type, member) \ + (sizeof(((type *)0) -> member)) + +/** Size of string buffer needed to hold converted inquiry vendor string */ +#define SCSI_INQ_VENDOR_STR_BUFSIZE \ + SPASCII_STR_BUFSIZE(SCSI_MEMBER_SIZE(scsi_std_inquiry_data_t, vendor)) + +/** Size of string buffer needed to hold converted inquiry product string */ +#define SCSI_INQ_PRODUCT_STR_BUFSIZE \ + SPASCII_STR_BUFSIZE(SCSI_MEMBER_SIZE(scsi_std_inquiry_data_t, product)) + +/** Size of string buffer needed to hold converted inquiry revision string */ +#define SCSI_INQ_REVISION_STR_BUFSIZE \ + SPASCII_STR_BUFSIZE(SCSI_MEMBER_SIZE(scsi_std_inquiry_data_t, revision)) + +/** Bits in scsi_std_inquiry_data_t.pqual_devtype */ +enum scsi_pqual_devtype_bits { + /* Peripheral qualifier */ + SCSI_PQDT_PQUAL_h = 7, + SCSI_PQDT_PQUAL_l = 5, + + /* Peripheral device type */ + SCSI_PQDT_DEV_TYPE_h = 4, + SCSI_PQDT_DEV_TYPE_l = 0 +}; + +/** Bits in scsi_std_inquiry_data_t.rmb */ +enum scsi_rmb_bits { + SCSI_RMB_RMB = 7 +}; + +/** SCSI peripheral device type */ +enum scsi_device_type { + SCSI_DEV_BLOCK = 0x00, + SCSI_DEV_STREAM = 0x01, + SCSI_DEV_CD_DVD = 0x05, + SCSI_DEV_CHANGER = 0x08, + SCSI_DEV_ENCLOSURE = 0x0d, + SCSI_DEV_OSD = 0x11, + + SCSI_DEV_LIMIT = 0x20 +}; + +/** SCSI Request Sense command */ +typedef struct { + /** Operation code (SCSI_CMD_REQUEST_SENSE) */ + uint8_t op_code; + /** Reserved, Desc */ + uint8_t desc; + /* Reserved */ + uint16_t res_2; + /* Allocation Length */ + uint8_t alloc_len; + /* Control */ + uint8_t control; +} __attribute__((packed)) scsi_cdb_request_sense_t; + +/** Minimum size of sense data. + * + * If the target returns less data, the missing bytes should be considered + * zero. + */ +#define SCSI_SENSE_DATA_MIN_SIZE 18 + +/** Maximum size of sense data */ +#define SCSI_SENSE_DATA_MAX_SIZE 252 + +/** Fixed-format sense data. + * + * Returned for Request Sense command with Desc bit cleared. + */ +typedef struct { + /** Valid, Response Code */ + uint8_t valid_rcode; + /** Peripheral qualifier, Peripheral device type */ + uint8_t obsolete_1; + /** Filemark, EOM, ILI, Reserved, Sense Key */ + uint8_t flags_key; + /** Information */ + uint32_t info; + /** Additional Sense Length */ + uint8_t additional_len; + /** Command-specific Information */ + uint8_t cmd_spec; + /** Additional Sense Code */ + uint8_t additional_code; + /** Additional Sense Code Qualifier */ + uint8_t additional_cqual; + /** Field-replaceable Unit Code */ + uint8_t fru_code; + /** SKSV, Sense-key specific */ + uint8_t key_spec[3]; +} __attribute__((packed)) scsi_sense_data_t; + +/** Sense key */ +enum scsi_sense_key { + SCSI_SK_NO_SENSE = 0x0, + SCSI_SK_RECOVERED_ERROR = 0x1, + SCSI_SK_NOT_READY = 0x2, + SCSI_SK_MEDIUM_ERROR = 0x3, + SCSI_SK_HARDWARE_ERROR = 0x4, + SCSI_SK_ILLEGAL_REQUEST = 0x5, + SCSI_SK_UNIT_ATTENTION = 0x6, + SCSI_SK_DATA_PROTECT = 0x7, + SCSI_SK_BLANK_CHECK = 0x8, + SCSI_SK_VENDOR_SPECIFIC = 0x9, + SCSI_SK_COPY_ABORTED = 0xa, + SCSI_SK_ABORTED_COMMAND = 0xb, + SCSI_SK_VOLUME_OVERFLOW = 0xd, + SCSI_SK_MISCOMPARE = 0xe +}; + +extern const char *scsi_dev_type_str[SCSI_DEV_LIMIT]; +extern const char *scsi_get_dev_type_str(unsigned); + +#endif + +/** @} + */ Index: uspace/lib/scsi/src/spc.c =================================================================== --- uspace/lib/scsi/src/spc.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/scsi/src/spc.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,58 @@ +/* + * 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. + */ + +#include +#include +#include "scsi/spc.h" + +/** String descriptions for SCSI peripheral device type. + * + * Only device types that we are ever likely to encounter are listed here. + */ +const char *scsi_dev_type_str[SCSI_DEV_LIMIT] = { + [SCSI_DEV_BLOCK] = "Direct-Access Block Device (Disk)", + [SCSI_DEV_STREAM] = "Sequential-Access Device (Tape)", + [SCSI_DEV_CD_DVD] = "CD/DVD", + [SCSI_DEV_CHANGER] = "Media Changer", + [SCSI_DEV_ENCLOSURE] = "SCSI Enclosure", + [SCSI_DEV_OSD] = "Object Storage Device" +}; + +/** Get peripheral device type string. + * + * Return string description of SCSI peripheral device type. + * The returned string is valid indefinitely, the caller should + * not attempt to free it. + */ +const char *scsi_get_dev_type_str(unsigned dev_type) +{ + if (dev_type >= SCSI_DEV_LIMIT || scsi_dev_type_str[dev_type] == NULL) + return ""; + + return scsi_dev_type_str[dev_type]; +} Index: uspace/lib/softfloat/arch/mips32/include/functions.h =================================================================== --- uspace/lib/softfloat/arch/mips32/include/functions.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/softfloat/arch/mips32/include/functions.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,5 +27,5 @@ */ - /** @addtogroup softfloatmips32 mips32 +/** @addtogroup softfloatmips32 mips32 * @ingroup sfl * @brief softfloat architecture dependent definitions @@ -72,6 +72,4 @@ #endif - - /** @} +/** @} */ - Index: uspace/lib/softfloat/arch/mips64/include/functions.h =================================================================== --- uspace/lib/softfloat/arch/mips64/include/functions.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ uspace/lib/softfloat/arch/mips64/include/functions.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,75 @@ +/* + * 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 softfloatmips64 mips64 + * @ingroup sfl + * @brief softfloat architecture dependent definitions + * @{ + */ +/** @file + */ + +#ifndef __SOFTFLOAT_FUNCTIONS_H__ +#define __SOFTFLOAT_FUNCTIONS_H__ + +#define float32_to_int(X) float32_to_int32(X); +#define float32_to_long(X) float32_to_int64(X); +#define float32_to_longlong(X) float32_to_int64(X); + +#define float64_to_int(X) float64_to_int32(X); +#define float64_to_long(X) float64_to_int64(X); +#define float64_to_longlong(X) float64_to_int64(X); + +#define float32_to_uint(X) float32_to_uint32(X); +#define float32_to_ulong(X) float32_to_uint64(X); +#define float32_to_ulonglong(X) float32_to_uint64(X); + +#define float64_to_uint(X) float64_to_uint32(X); +#define float64_to_ulong(X) float64_to_uint64(X); +#define float64_to_ulonglong(X) float64_to_uint64(X); + +#define int_to_float32(X) int32_to_float32(X); +#define long_to_float32(X) int64_to_float32(X); +#define longlong_to_float32(X) int64_to_float32(X); + +#define int_to_float64(X) int32_to_float64(X); +#define long_to_float64(X) int64_to_float64(X); +#define longlong_to_float64(X) int64_to_float64(X); + +#define uint_to_float32(X) uint32_to_float32(X); +#define ulong_to_float32(X) uint64_to_float32(X); +#define ulonglong_to_float32(X) uint64_to_float32(X); + +#define uint_to_float64(X) uint32_to_float64(X); +#define ulong_to_float64(X) uint64_to_float64(X); +#define ulonglong_to_float64(X) uint64_to_float64(X); + +#endif + +/** @} + */ Index: uspace/lib/usbhost/src/batch.c =================================================================== --- uspace/lib/usbhost/src/batch.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ uspace/lib/usbhost/src/batch.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -128,5 +128,5 @@ memcpy(instance->buffer, instance->data_buffer, instance->buffer_size); - usb_log_debug("Batch %p " USB_TRANSFER_BATCH_FMT " completed (%zuB): %s.\n", + usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " completed (%zuB): %s.\n", instance, USB_TRANSFER_BATCH_ARGS(*instance), instance->transfered_size, str_error(instance->error)); @@ -145,5 +145,5 @@ assert(instance->callback_out); - usb_log_debug("Batch %p " USB_TRANSFER_BATCH_FMT " completed: %s.\n", + usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " completed: %s.\n", instance, USB_TRANSFER_BATCH_ARGS(*instance), str_error(instance->error));