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

Timestamp:

2009-02-19T21:58:37Z (15 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/sparc64/include/asm.h (modified) (3 diffs)

kernel/arch/sparc64/include/asm.h

@@ -45 +45 @@
 #include <arch/barrier.h>
 
-static inline void pio_write_8(ioport_t port, uint8_t v)
-{
-        *((volatile uint8_t *)(port)) = v;
-        memory_barrier();
-}
-
-static inline void pio_write_16(ioport_t port, uint16_t v)
-{
-        *((volatile uint16_t *)(port)) = v;
-        memory_barrier();
-}
-
-static inline void pio_write_32(ioport_t port, uint32_t v)
-{
-        *((volatile uint32_t *)(port)) = v;
-        memory_barrier();
-}
-
-static inline uint8_t pio_read_8(ioport_t port)
+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 = *((volatile uint8_t *)(port));
+        rv = *port;
         memory_barrier();
 
@@ -73 +73 @@
 }
 
-static inline uint16_t pio_read_16(ioport_t port)
+static inline uint16_t pio_read_16(ioport16_t *port)
 {
         uint16_t rv;
 
-        rv = *((volatile uint16_t *)(port));
+        rv = *port;
         memory_barrier();
 
@@ -83 +83 @@
 }
 
-static inline uint32_t pio_read_32(ioport_t port)
+static inline uint32_t pio_read_32(ioport32_t *port)
 {
         uint32_t rv;
 
-        rv = *((volatile uint32_t *)(port));
+        rv = *port;
         memory_barrier();