Changeset 7d60cf5 in mainline for kernel/arch/ia32/include/asm.h

Timestamp:

2009-02-19T21:58:37Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5cb223f

Parents:

4b44099d

Message:

Introduce ioport8_t, ioport16_t and ioport32_t. These types are to be used with
pio_read_n() and pio_write_n() functions. This breaks everything.

File:

• kernel/arch/ia32/include/asm.h (modified) (6 diffs)

kernel/arch/ia32/include/asm.h

@@ -106 +106 @@
  * @param val Value to write
  */
-static inline void pio_write_8(uint16_t port, uint8_t val)
-{
-        asm volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port) );
+static inline void pio_write_8(ioport8_t *port, uint8_t val)
+{
+        asm volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port));
 }
 
@@ -118 +118 @@
  * @param val Value to write
  */
-static inline void pio_write_16(uint16_t port, uint16_t val)
-{
-        asm volatile ("outw %w0, %w1\n" : : "a" (val), "d" (port) );
+static inline void pio_write_16(ioport16_t *port, uint16_t val)
+{
+        asm volatile ("outw %w0, %w1\n" : : "a" (val), "d" (port));
 }
 
@@ -130 +130 @@
  * @param val Value to write
  */
-static inline void pio_write_32(uint16_t port, uint32_t val)
-{
-        asm volatile ("outl %l0, %w1\n" : : "a" (val), "d" (port) );
+static inline void pio_write_32(ioport32_t *port, uint32_t val)
+{
+        asm volatile ("outl %l0, %w1\n" : : "a" (val), "d" (port));
 }
 
@@ -142 +142 @@
  * @return Value read
  */
-static inline uint8_t pio_read_8(uint16_t port)
+static inline uint8_t pio_read_8(ioport8_t *port)
 {
         uint8_t val;
         
-        asm volatile ("inb %w1, %b0 \n" : "=a" (val) : "d" (port) );
+        asm volatile ("inb %w1, %b0 \n" : "=a" (val) : "d" (port));
         return val;
 }
@@ -157 +157 @@
  * @return Value read
  */
-static inline uint16_t pio_read_16(uint16_t port)
+static inline uint16_t pio_read_16(ioport16_t *port)
 {
         uint16_t val;
         
-        asm volatile ("inw %w1, %w0 \n" : "=a" (val) : "d" (port) );
+        asm volatile ("inw %w1, %w0 \n" : "=a" (val) : "d" (port));
         return val;
 }
@@ -172 +172 @@
  * @return Value read
  */
-static inline uint32_t pio_read_32(uint16_t port)
+static inline uint32_t pio_read_32(ioport32_t *port)
 {
         uint32_t val;
         
-        asm volatile ("inl %w1, %l0 \n" : "=a" (val) : "d" (port) );
+        asm volatile ("inl %w1, %l0 \n" : "=a" (val) : "d" (port));
         return val;
 }