ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1375 from TomoYamanaka/master 

Reflect the change size of structure of Mutex to Ethernet module
pull/1379/head
Martin Kojtal 2015-10-09 07:50:07 +01:00
parent 89f11e93a1 eab7196f0f
commit 3f2632bebc
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/net/lwip/lwip-sys/arch/sys_arch.c
View File

@ -285,7 +285,11 @@ void sys_sem_free(sys_sem_t *sem) {}
* @return a new mutex */ * @return a new mutex */
err_t sys_mutex_new(sys_mutex_t *mutex) { err_t sys_mutex_new(sys_mutex_t *mutex) {
#ifdef CMSIS_OS_RTX #ifdef CMSIS_OS_RTX
#ifdef __MBED_CMSIS_RTOS_CA9
memset(mutex->data, 0, sizeof(int32_t)*4);
#else
memset(mutex->data, 0, sizeof(int32_t)*3); memset(mutex->data, 0, sizeof(int32_t)*3);
#endif
mutex->def.mutex = mutex->data; mutex->def.mutex = mutex->data;
#endif #endif
mutex->id = osMutexCreate(&mutex->def); mutex->id = osMutexCreate(&mutex->def);

4
libraries/net/lwip/lwip-sys/arch/sys_arch.h
View File

@ -40,8 +40,12 @@ typedef struct {
osMutexId id; osMutexId id;
osMutexDef_t def; osMutexDef_t def;
#ifdef CMSIS_OS_RTX #ifdef CMSIS_OS_RTX
#ifdef __MBED_CMSIS_RTOS_CA9
int32_t data[4];
#else
int32_t data[3]; int32_t data[3];
#endif #endif
#endif
} sys_mutex_t; } sys_mutex_t;
// === MAIL BOX === // === MAIL BOX ===