Index: uspace/lib/libc/arch/arm32/include/ddi.h =================================================================== --- uspace/lib/libc/arch/arm32/include/ddi.h (revision 150385b9e997a42606e5cd52d68c7f1d91ee61d8) +++ uspace/lib/libc/arch/arm32/include/ddi.h (revision 150385b9e997a42606e5cd52d68c7f1d91ee61d8) @@ -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 libcarm32 + */ + +#ifndef LIBC_arm32_DDI_H_ +#define LIBC_arm32_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/libc/arch/ia32/include/ddi.h =================================================================== --- uspace/lib/libc/arch/ia32/include/ddi.h (revision 0d5a50cade5ee95d9afc0d055a94381254bb6e18) +++ uspace/lib/libc/arch/ia32/include/ddi.h (revision 150385b9e997a42606e5cd52d68c7f1d91ee61d8) @@ -34,44 +34,71 @@ #define LIBC_ia32_DDI_H_ +#include +#include + #define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) -static inline void outb(int16_t port, uint8_t b) -{ - asm volatile ("outb %0, %1\n" :: "a" (b), "d" (port)); -} - -static inline void outw(int16_t port, int16_t w) -{ - asm volatile ("outw %0, %1\n" :: "a" (w), "d" (port)); -} - -static inline void outl(int16_t port, uint32_t l) -{ - asm volatile ("outl %0, %1\n" :: "a" (l), "d" (port)); -} - -static inline uint8_t inb(int16_t port) +static inline uint8_t pio_read_8(ioport8_t *port) { uint8_t val; - - asm volatile ("inb %1, %0 \n" : "=a" (val) : "d"(port)); + + asm volatile ( + "inb %w[port], %b[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + return val; } -static inline int16_t inw(int16_t port) +static inline uint16_t pio_read_16(ioport16_t *port) { - int16_t val; - - asm volatile ("inw %1, %0 \n" : "=a" (val) : "d"(port)); + uint16_t val; + + asm volatile ( + "inw %w[port], %w[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + return val; } -static inline uint32_t inl(int16_t port) +static inline uint32_t pio_read_32(ioport32_t *port) { uint32_t val; - - asm volatile ("inl %1, %0 \n" : "=a" (val) : "d"(port)); + + asm volatile ( + "inl %w[port], %[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + return val; } +static inline void pio_write_8(ioport8_t *port, uint8_t val) +{ + asm volatile ( + "outb %b[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); +} + +static inline void pio_write_16(ioport16_t *port, uint16_t val) +{ + asm volatile ( + "outw %w[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); +} + +static inline void pio_write_32(ioport32_t *port, uint32_t val) +{ + asm volatile ( + "outl %[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); +} + #endif Index: uspace/lib/libc/arch/ia64/include/ddi.h =================================================================== --- uspace/lib/libc/arch/ia64/include/ddi.h (revision 0d5a50cade5ee95d9afc0d055a94381254bb6e18) +++ uspace/lib/libc/arch/ia64/include/ddi.h (revision 150385b9e997a42606e5cd52d68c7f1d91ee61d8) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2005 Jakub Jermar, Jakub Vana + * Copyright (c) 2005 Jakub Vana * All rights reserved. * @@ -27,5 +27,5 @@ */ -/** @addtogroup ia64 +/** @addtogroup libcia64 * @{ */ @@ -36,7 +36,8 @@ #define LIBC_ia64_DDI_H_ +#include #include -typedef uint64_t ioport_t; +#define IO_SPACE_BOUNDARY (64 * 1024) uint64_t get_ia64_iospace_address(void); @@ -44,52 +45,68 @@ extern uint64_t ia64_iospace_address; -#define IA64_IOSPACE_ADDRESS (ia64_iospace_address?ia64_iospace_address:(ia64_iospace_address=get_ia64_iospace_address())) +#define IA64_IOSPACE_ADDRESS \ + (ia64_iospace_address ? \ + ia64_iospace_address : \ + (ia64_iospace_address = get_ia64_iospace_address())) -static inline void outb(ioport_t port,uint8_t v) +static inline void pio_write_8(ioport8_t *port, uint8_t v) { - *((uint8_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v; + uintptr_t prt = (uintptr_t) port; + + *((uint8_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; asm volatile ("mf\n" ::: "memory"); } -static inline void outw(ioport_t port,uint16_t v) +static inline void pio_write_16(ioport16_t *port, uint16_t v) { - *((uint16_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v; + uintptr_t prt = (uintptr_t) port; + + *((uint16_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; asm volatile ("mf\n" ::: "memory"); } -static inline void outl(ioport_t port,uint32_t v) +static inline void pio_write_32(ioport32_t *port, uint32_t v) { - *((uint32_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v; + uintptr_t prt = (uintptr_t) port; + + *((uint32_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; asm volatile ("mf\n" ::: "memory"); } +static inline uint8_t pio_read_8(ioport8_t *port) +{ + uintptr_t prt = (uintptr_t) port; - -static inline uint8_t inb(ioport_t port) -{ asm volatile ("mf\n" ::: "memory"); - return *((uint8_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))); + return *((uint8_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); } -static inline uint16_t inw(ioport_t port) +static inline uint16_t pio_read_16(ioport16_t *port) { + uintptr_t prt = (uintptr_t) port; + asm volatile ("mf\n" ::: "memory"); - return *((uint16_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xffE) | ( (port >> 2) << 12 )))); + return *((uint16_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xffE) | ((prt >> 2) << 12)))); } -static inline uint32_t inl(ioport_t port) +static inline uint32_t pio_read_32(ioport32_t *port) { + uintptr_t prt = (uintptr_t) port; + asm volatile ("mf\n" ::: "memory"); - return *((uint32_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))); + return *((uint32_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); } - - - #endif Index: uspace/lib/libc/arch/mips32/include/ddi.h =================================================================== --- uspace/lib/libc/arch/mips32/include/ddi.h (revision 150385b9e997a42606e5cd52d68c7f1d91ee61d8) +++ uspace/lib/libc/arch/mips32/include/ddi.h (revision 150385b9e997a42606e5cd52d68c7f1d91ee61d8) @@ -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 libcmips32 + */ + +#ifndef LIBC_mips32_DDI_H_ +#define LIBC_mips32_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/libc/arch/ppc32/include/ddi.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/ddi.h (revision 150385b9e997a42606e5cd52d68c7f1d91ee61d8) +++ uspace/lib/libc/arch/ppc32/include/ddi.h (revision 150385b9e997a42606e5cd52d68c7f1d91ee61d8) @@ -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 libcppc32 + */ + +#ifndef LIBC_ppc32_DDI_H_ +#define LIBC_ppc32_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/libc/arch/sparc64/include/ddi.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/ddi.h (revision 150385b9e997a42606e5cd52d68c7f1d91ee61d8) +++ uspace/lib/libc/arch/sparc64/include/ddi.h (revision 150385b9e997a42606e5cd52d68c7f1d91ee61d8) @@ -0,0 +1,92 @@ +/* + * 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 libsparc64 + */ + +#ifndef LIBC_sparc64_DDI_H_ +#define LIBC_sparc64_DDI_H_ + +#include +#include + +static inline memory_barrier(void) +{ + asm volatile ("membar #LoadLoad | #StoreStore\n" ::: "memory"); +} + +static inline void pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; + memory_barrier(); +} + +static inline void pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; + memory_barrier(); +} + +static inline void pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; + memory_barrier(); +} + +static inline uint8_t pio_read_8(ioport8_t *port) +{ + uint8_t rv; + + rv = *port; + memory_barrier(); + + return rv; +} + +static inline uint16_t pio_read_16(ioport16_t *port) +{ + uint16_t rv; + + rv = *port; + memory_barrier(); + + return rv; +} + +static inline uint32_t pio_read_32(ioport32_t *port) +{ + uint32_t rv; + + rv = *port; + memory_barrier(); + + return rv; +} + +#endif