aboutsummaryrefslogtreecommitdiffstats
path: root/os/rt/ports
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-11-04 10:51:23 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-11-04 10:51:23 +0000
commit476270c2ab91169a8e731562b0e68b86602e0d77 (patch)
tree08407b10b44bea3e84b37b6796da967229c02571 /os/rt/ports
parent5626d9925ff6fafabac43ae65c38a290fd2c0db6 (diff)
downloadChibiOS-476270c2ab91169a8e731562b0e68b86602e0d77.tar.gz
ChibiOS-476270c2ab91169a8e731562b0e68b86602e0d77.tar.bz2
ChibiOS-476270c2ab91169a8e731562b0e68b86602e0d77.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7475 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/ports')
-rw-r--r--os/rt/ports/SIMIA32/chcore.c2
-rw-r--r--os/rt/ports/SIMIA32/chcore.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/os/rt/ports/SIMIA32/chcore.c b/os/rt/ports/SIMIA32/chcore.c
index b4357dfc7..244e4c30f 100644
--- a/os/rt/ports/SIMIA32/chcore.c
+++ b/os/rt/ports/SIMIA32/chcore.c
@@ -58,7 +58,7 @@
* @param ntp the thread to be switched in
*/
__attribute__((used))
-static void __dummy(Thread *ntp, Thread *otp) {
+static void __dummy(thread_t *ntp, thread_t *otp) {
(void)ntp; (void)otp;
asm volatile (
diff --git a/os/rt/ports/SIMIA32/chcore.h b/os/rt/ports/SIMIA32/chcore.h
index 9c8cd2587..6174f93eb 100644
--- a/os/rt/ports/SIMIA32/chcore.h
+++ b/os/rt/ports/SIMIA32/chcore.h
@@ -148,7 +148,7 @@ struct port_intctx {
* at context switch time.
*/
struct context {
- struct intctx volatile *esp;
+ struct port_intctx *esp;
};
/*===========================================================================*/
@@ -177,11 +177,11 @@ struct context {
APUSH(esp, pf); \
APUSH(esp, 0); \
esp -= sizeof(struct port_intctx); \
- ((struct port_intctx *)esp)->eip = _port_thread_start; \
+ ((struct port_intctx *)esp)->eip = (void *)_port_thread_start; \
((struct port_intctx *)esp)->ebx = 0; \
((struct port_intctx *)esp)->edi = 0; \
((struct port_intctx *)esp)->esi = 0; \
- ((struct port_intctx *)esp)->ebp = savebp; \
+ ((struct port_intctx *)esp)->ebp = (void *)savebp; \
(tp)->p_ctx.esp = (struct port_intctx *)esp; \
}