Changeset 6843a9c in mainline for uspace/lib/c/arch/arm32/include/fibril.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/c/arch/arm32/include/fibril.h (modified) (4 diffs)

uspace/lib/c/arch/arm32/include/fibril.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libcarm32       
+/** @addtogroup libcarm32
  * @{
  */
@@ -42 +42 @@
 
 /** Size of a stack item */
-#define STACK_ITEM_SIZE         4
+#define STACK_ITEM_SIZE  4
 
 /** Stack alignment - see <a href="http://www.arm.com/support/faqdev/14269.html">ABI</a> for details */
-#define STACK_ALIGNMENT         8
+#define STACK_ALIGNMENT  8
 
-#define SP_DELTA        (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
+#define SP_DELTA  (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
 
-/** Sets data to the context. 
- *  
+/** Sets data to the context.
+ *
  *  @param c     Context (#context_t).
  *  @param _pc   Program counter.
@@ -62 +62 @@
                 (c)->pc = (sysarg_t) (_pc); \
                 (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
-                (c)->tls = ((sysarg_t)(ptls)) + sizeof(tcb_t) + ARM_TP_OFFSET; \
+                (c)->tls = ((sysarg_t)(ptls)) + sizeof(tcb_t) + ARM_TP_OFFSET; \
                 (c)->fp = 0; \
         } while (0)
 
-/** Fibril context. 
+/** Fibril context.
  *
  *  Only registers preserved accross function calls are included. r9 is used 
@@ -91 +91 @@
 }
 
-
 #endif