Changeset 850235d in mainline for uspace/lib/c/arch/ia64

Timestamp:

2013-03-10T14:56:21Z (13 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

Location:

uspace/lib/c/arch/ia64

Files:

• include/libarch/ddi.h (modified) (6 diffs)
• src/ddi.c (modified) (2 diffs)
• src/stacktrace.c (modified) (1 diff)
• src/tls.c (modified) (1 diff)

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;

uspace/lib/c/arch/ia64/src/ddi.c

@@ +1 @@
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #include <libarch/ddi.h>
 #include <sysinfo.h>
@@ -12 +39 @@
         return addr;
 }
-

uspace/lib/c/arch/ia64/src/stacktrace.c

@@ -36 +36 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 

uspace/lib/c/arch/ia64/src/tls.c

@@ -38 +38 @@
 #include <malloc.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t *tls_alloc_arch(void **data, size_t size)
 {
         return tls_alloc_variant_1(data, size);
 }
 
-void __free_tls_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size)
 {
         tls_free_variant_1(tcb, size);