Changeset ee06f2a in mainline for kernel/arch/ia64

Timestamp:

2009-02-15T15:28:00Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2d96f4d

Parents:

e7f2ad68

Message:

Introduce a more platform-neutral name for programmed I/O.

The new API looks like pio_read_n() or pio_write_n(), where n is 8, 16 or 32.
The old API (i.e. inb(), inw(), inl(), outb() outw(), outl()) may have made
some people think that the interface is only to be used with the separate I/O
space. That's not the case. This API is to be implemented on all platforms
so that we can finally have really generic kernel device drivers.

Location:

kernel/arch/ia64

Files:

• include/asm.h (modified) (6 diffs)
• include/drivers/i8042.h (modified) (1 diff)
• src/ia64.c (modified) (1 diff)

kernel/arch/ia64/include/asm.h

@@ -42 +42 @@
 #define IA64_IOSPACE_ADDRESS 0xE001000000000000ULL
 
-static inline void outb(ioport_t port, uint8_t v)
+static inline void pio_write_8(ioport_t port, uint8_t v)
 {
         *((uint8_t *)(IA64_IOSPACE_ADDRESS +
@@ -50 +50 @@
 }
 
-static inline void outw(ioport_t port, uint16_t v)
+static inline void pio_write_16(ioport_t port, uint16_t v)
 {
         *((uint16_t *)(IA64_IOSPACE_ADDRESS +
@@ -58 +58 @@
 }
 
-static inline void outl(ioport_t port, uint32_t v)
+static inline void pio_write_32(ioport_t port, uint32_t v)
 {
         *((uint32_t *)(IA64_IOSPACE_ADDRESS +
@@ -66 +66 @@
 }
 
-static inline uint8_t inb(ioport_t port)
+static inline uint8_t pio_read_8(ioport_t port)
 {
         asm volatile ("mf\n" ::: "memory");
@@ -74 +74 @@
 }
 
-static inline uint16_t inw(ioport_t port)
+static inline uint16_t pio_read_16(ioport_t port)
 {
         asm volatile ("mf\n" ::: "memory");
@@ -82 +82 @@
 }
 
-static inline uint32_t inl(ioport_t port)
+static inline uint32_t pio_read_32(ioport_t port)
 {
         asm volatile ("mf\n" ::: "memory");

kernel/arch/ia64/include/drivers/i8042.h

@@ -48 +48 @@
 static inline void i8042_data_write(uint8_t data)
 {
-        outb(i8042_DATA, data);
+        pio_write_8(i8042_DATA, data);
 }
 
 static inline uint8_t i8042_data_read(void)
 {
-        return inb(i8042_DATA);
+        return pio_read_8(i8042_DATA);
 }
 
 static inline uint8_t i8042_status_read(void)
 {
-        return inb(i8042_STATUS);
+        return pio_read_8(i8042_STATUS);
 }
 
 static inline void i8042_command_write(uint8_t command)
 {
-        outb(i8042_STATUS, command);
+        pio_write_8(i8042_STATUS, command);
 }
 

kernel/arch/ia64/src/ia64.c

@@ -250 +250 @@
 void arch_reboot(void)
 {
-        outb(0x64, 0xfe);
+        pio_write_8(0x64, 0xfe);
         while (1)
                 ;