cmsis: resolve undefined reference to k_calloc() (467ce894) · Commits · Wenxi XU / zephyr

When no heap has been configured, osMessageQueueNew() will no longer include a call to k_calloc() (which needs the heap). In such a configuration, if osMessageQueueNew() indicates that the buffer must be allocated, it will fail and return NULL. Fixes #61196 Signed-off-by:

Peter Mitsis <peter.mitsis@intel.com>

subsys/portability/cmsis_rtos_v2/msgq.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -55,12 +55,17 @@ osMessageQueueId_t osMessageQueueNew(uint32_t msg_count, uint32_t msg_size,
		CONFIG_CMSIS_V2_MSGQ_MAX_DYNAMIC_SIZE,
		"message queue size exceeds dynamic maximum");

		#if (CONFIG_HEAP_MEM_POOL_SIZE > 0)
		msgq->pool = k_calloc(msg_count, msg_size);
		if (msgq->pool == NULL) {
		k_mem_slab_free(&cv2_msgq_slab, (void *)msgq);
		return NULL;
		}
		msgq->is_dynamic_allocation = TRUE;
		#else
		k_mem_slab_free(&cv2_msgq_slab, (void *)msgq);
		return NULL;
		#endif
		} else {
		msgq->pool = attr->mq_mem;
		msgq->is_dynamic_allocation = FALSE;

Admin message