Changeset de7663f in mainline for uspace

Timestamp:

2007-06-13T18:39:31Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

341140c

Parents:

c03ee1c

Message:

Remove some forgotten \r from arm32 files.
Formatting changes.
Add some correct BOOT_mips32_* guards.

Location:

uspace/libc/arch/arm32/include

Files:

• atomic.h (modified) (7 diffs)
• thread.h (modified) (2 diffs)

uspace/libc/arch/arm32/include/atomic.h

@@ -50 +50 @@
 
         asm volatile (
-                "1:                 \n"
-                "ldr r2, [%1]       \n"
-                "add r3, r2, %2     \n"
-                "str r3, %0         \n"
-                "swp r3, r3, [%1]   \n"
-                "cmp r3, r2         \n"
-                "bne 1b             \n"
+        "1:\n"
+                "ldr r2, [%1]\n"
+                "add r3, r2, %2\n"
+                "str r3, %0\n"
+                "swp r3, r3, [%1]\n"
+                "cmp r3, r2\n"
+                "bne 1b\n"
 
                 : "=m" (ret)
@@ -71 +71 @@
  * @param val Variable to be incremented.
  */
-static inline void atomic_inc(atomic_t *val) { atomic_add(val, 1); }
+static inline void atomic_inc(atomic_t *val)
+{
+        atomic_add(val, 1);
+}
 
 
@@ -78 +81 @@
  * @param val Variable to be decremented.
  */
-static inline void atomic_dec(atomic_t *val) { atomic_add(val, -1); }
+static inline void atomic_dec(atomic_t *val)
+{
+        atomic_add(val, -1);
+}
 
 
@@ -86 +92 @@
  * @return    Value after incrementation.
  */
-static inline long atomic_preinc(atomic_t *val) { return atomic_add(val, 1); }
+static inline long atomic_preinc(atomic_t *val)
+{
+        return atomic_add(val, 1);
+}
 
 
@@ -94 +103 @@
  * @return    Value after decrementation.
  */
-static inline long atomic_predec(atomic_t *val) { return atomic_add(val, -1); }
+static inline long atomic_predec(atomic_t *val)
+{
+        return atomic_add(val, -1);
+}
 
 
@@ -102 +114 @@
  * @return    Value before incrementation.
  */
-static inline long atomic_postinc(atomic_t *val) { return atomic_add(val, 1) - 1; }
+static inline long atomic_postinc(atomic_t *val)
+{
+        return atomic_add(val, 1) - 1;
+}
 
 
@@ -110 +125 @@
  * @return    Value before decrementation.
  */
-static inline long atomic_postdec(atomic_t *val) { return atomic_add(val, -1) + 1; }
+static inline long atomic_postdec(atomic_t *val)
+{
+        return atomic_add(val, -1) + 1;
+}
 
 

uspace/libc/arch/arm32/include/thread.h

@@ -61 +61 @@
 static inline void __tcb_set(tcb_t *tcb)
 {
-        void *tls = (void *)tcb;
+        void *tls = (void *) tcb;
         tls += sizeof(tcb_t) + ARM_TP_OFFSET;
         asm volatile (
@@ -82 +82 @@
                 : "=r"(ret)
         );
-        return (tcb_t *)(ret - ARM_TP_OFFSET - sizeof(tcb_t));
+        return (tcb_t *) (ret - ARM_TP_OFFSET - sizeof(tcb_t));
 }