andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7720 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
Giovanni Di Sirio 2015-03-06 16:55:04 +00:00
parent 9a77cde34e
commit 3c8445c326
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os/rt/ports/ARMCMx/chcore_v7m.h
View File

@ -282,12 +282,16 @@ struct port_intctx {
* by an @p port_intctx structure. * by an @p port_intctx structure.
*/ */
#define PORT_SETUP_CONTEXT(tp, workspace, wsize, pf, arg) { \ #define PORT_SETUP_CONTEXT(tp, workspace, wsize, pf, arg) { \
/*lint -save -e9016 -e9087 [18.4, 11.3] Normal pointers arithmetic.*/ \
(tp)->p_ctx.r13 = (struct port_intctx *)((uint8_t *)(workspace) + \ (tp)->p_ctx.r13 = (struct port_intctx *)((uint8_t *)(workspace) + \
(wsize) - \ (size_t)(wsize) - \
sizeof(struct port_intctx)); \ sizeof(struct port_intctx)); \
/*lint -restore*/ \
/*lint -save -e9074 -e9087 [11.1, 11.3] Casts are planned here.*/ \
(tp)->p_ctx.r13->r4 = (regarm_t)(pf); \ (tp)->p_ctx.r13->r4 = (regarm_t)(pf); \
(tp)->p_ctx.r13->r5 = (regarm_t)(arg); \ (tp)->p_ctx.r13->r5 = (regarm_t)(arg); \
(tp)->p_ctx.r13->lr = (regarm_t)(_port_thread_start); \ (tp)->p_ctx.r13->lr = (regarm_t)(_port_thread_start); \
/*lint -restore*/ \
} }
/** /**

1
os/rt/src/chschd.c
View File

@ -304,6 +304,7 @@ static void wakeup(void *p) {
(void) queue_dequeue(tp); (void) queue_dequeue(tp);
break; break;
default: default:
/* Any other state, nothing to do.*/
break; break;
} }
tp->p_u.rdymsg = MSG_TIMEOUT; tp->p_u.rdymsg = MSG_TIMEOUT;