Changeset 850235d in mainline for uspace/lib/c/arch/ia64/include/libarch/ddi.h

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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 changes

File:

• uspace/lib/c/arch/ia64/include/libarch/ddi.h (modified) (6 diffs)

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

@@ -50 +50 @@
             (ia64_iospace_address = get_ia64_iospace_address()))
 
-static inline void pio_write_8(ioport8_t *port, uint8_t v)
+static inline void arch_pio_write_8(ioport8_t *port, uint8_t v)
 {
         if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
@@ -65 +65 @@
 }
 
-static inline void pio_write_16(ioport16_t *port, uint16_t v)
+static inline void arch_pio_write_16(ioport16_t *port, uint16_t v)
 {
         if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
@@ -80 +80 @@
 }
 
-static inline void pio_write_32(ioport32_t *port, uint32_t v)
+static inline void arch_pio_write_32(ioport32_t *port, uint32_t v)
 {
         if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
@@ -95 +95 @@
 }
 
-static inline uint8_t pio_read_8(ioport8_t *port)
+static inline uint8_t arch_pio_read_8(const ioport8_t *port)
 {
         uint8_t v;
@@ -115 +115 @@
 }
 
-static inline uint16_t pio_read_16(ioport16_t *port)
+static inline uint16_t arch_pio_read_16(const ioport16_t *port)
 {
         uint16_t v;
@@ -135 +135 @@
 }
 
-static inline uint32_t pio_read_32(ioport32_t *port)
+static inline uint32_t arch_pio_read_32(const ioport32_t *port)
 {
         uint32_t v;