summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshaojinchun <[email protected]>2019-04-24 09:14:00 +0800
committershaojinchun <[email protected]>2019-04-24 09:14:00 +0800
commit7bcee9bcb14f337efb6fcacecc1501d01624c0a3 (patch)
treea16bd01b9a3b2596ff64e7b464f559a5feb36e8d
parentfa697a763f5cbece6b886cf2eca54b2dd28f718d (diff)
semaphore结构中value仍改为uint16_t,加入对其设置范围的检测,加入对齐变量
-rw-r--r--include/rtdef.h3
-rw-r--r--src/ipc.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/include/rtdef.h b/include/rtdef.h
index 8c7e6e8c43..743b91d959 100644
--- a/include/rtdef.h
+++ b/include/rtdef.h
@@ -655,7 +655,8 @@ struct rt_semaphore
{
struct rt_ipc_object parent; /**< inherit from ipc_object */
- rt_uint32_t value; /**< value of semaphore. */
+ rt_uint16_t value; /**< value of semaphore. */
+ rt_uint16_t reserved; /**< reserved field */
};
typedef struct rt_semaphore *rt_sem_t;
#endif
diff --git a/src/ipc.c b/src/ipc.c
index 7f603cfc4d..74faf6ac7e 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -201,6 +201,7 @@ rt_err_t rt_sem_init(rt_sem_t sem,
rt_uint8_t flag)
{
RT_ASSERT(sem != RT_NULL);
+ RT_ASSERT(value < 0x10000U);
/* init object */
rt_object_init(&(sem->parent.parent), RT_Object_Class_Semaphore, name);
@@ -209,7 +210,7 @@ rt_err_t rt_sem_init(rt_sem_t sem,
rt_ipc_object_init(&(sem->parent));
/* set init value */
- sem->value = value;
+ sem->value = (rt_uint16_t)value;
/* set parent */
sem->parent.parent.flag = flag;
@@ -261,6 +262,7 @@ rt_sem_t rt_sem_create(const char *name, rt_uint32_t value, rt_uint8_t flag)
rt_sem_t sem;
RT_DEBUG_NOT_IN_INTERRUPT;
+ RT_ASSERT(value < 0x10000U);
/* allocate object */
sem = (rt_sem_t)rt_object_allocate(RT_Object_Class_Semaphore, name);