Index: uspace/lib/libc/arch/ia64/include/ddi.h
===================================================================
--- uspace/lib/libc/arch/ia64/include/ddi.h	(revision 323a5aaf36674c20719d102e0508c32ef466bfa3)
+++ uspace/lib/libc/arch/ia64/include/ddi.h	(revision ff685c93ca4666ba47a3b747bd9da4268cc5aa47)
@@ -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 <sys/types.h>
 #include <libarch/types.h>
 
-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