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

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/ia32

Files:

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

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) {

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

@@ -37 +37 @@
 #include <libarch/config.h>
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <stacktrace.h>
 

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

@@ -39 +39 @@
 #include <align.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t *tls_alloc_arch(void **data, size_t size)
 {
         return tls_alloc_variant_2(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_2(tcb, size);