Changeset 25eec4e in mainline for uspace/lib/c/arch/ia32/include/libarch/ddi.h

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline chages.

File:

• uspace/lib/c/arch/ia32/include/libarch/ddi.h (moved) (moved from uspace/lib/c/arch/ia32/include/ddi.h ) (6 diffs)

uspace/lib/c/arch/ia32/include/libarch/ddi.h

@@ -39 +39 @@
 #define IO_SPACE_BOUNDARY  ((void *) (64 * 1024))
 
-static inline uint8_t pio_read_8(ioport8_t *port)
+static inline uint8_t arch_pio_read_8(const ioport8_t *port)
 {
         if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
@@ -55 +55 @@
 }
 
-static inline uint16_t pio_read_16(ioport16_t *port)
+static inline uint16_t arch_pio_read_16(const ioport16_t *port)
 {
         if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
@@ -71 +71 @@
 }
 
-static inline uint32_t pio_read_32(ioport32_t *port)
+static inline uint32_t arch_pio_read_32(const ioport32_t *port)
 {
         if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
@@ -87 +87 @@
 }
 
-static inline void pio_write_8(ioport8_t *port, uint8_t val)
+static inline void arch_pio_write_8(ioport8_t *port, uint8_t val)
 {
         if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
@@ -98 +98 @@
 }
 
-static inline void pio_write_16(ioport16_t *port, uint16_t val)
+static inline void arch_pio_write_16(ioport16_t *port, uint16_t val)
 {
         if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
@@ -109 +109 @@
 }
 
-static inline void pio_write_32(ioport32_t *port, uint32_t val)
+static inline void arch_pio_write_32(ioport32_t *port, uint32_t val)
 {
         if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {