michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: philosophers: fix pointer type mismatch for stack fork

Browse source 
When using the stack fork type in the philosophers sample,
there were a few pointer type mismatch since the k_stack_*()
functions are using stack_data_t but the parameters are uint32_t.
So cast them to void pointer to suppress compiler warnings.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2021-09-09 10:28:50 -07:00 • committed by Christopher Friedt
commit 8580f63ad9
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
samples/philosophers/src/phil_obj_abstract.h
View file

@ -81,12 +81,12 @@
uint32_t stack_mem[1]; uint32_t stack_mem[1];
} fork_obj_t; } fork_obj_t;
#define fork_init(x) do { \ #define fork_init(x) do { \
k_stack_init(x, (uint32_t *)((x) + 1), 1); \ k_stack_init(x, (void *)((x) + 1), 1); \
k_stack_push(x, MAGIC); \ k_stack_push(x, MAGIC); \
} while ((0)) } while ((0))
#endif #endif
#define take(x) do { \ #define take(x) do { \
uint32_t data; k_stack_pop(x, &data, K_FOREVER); \ uint32_t data; k_stack_pop(x, (void *)&data, K_FOREVER); \
__ASSERT(data == MAGIC, "data was %x\n", data); \ __ASSERT(data == MAGIC, "data was %x\n", data); \
} while ((0)) } while ((0))
#define drop(x) k_stack_push(x, MAGIC) #define drop(x) k_stack_push(x, MAGIC)