kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mocking osal api using ifdef 

start to add task_create macro API for osal_none
This commit is contained in:
hathach 2013-01-30 12:55:44 +07:00
parent 07048b943e
commit 9c9fa182d4
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cproject
View File

@ -42,7 +42,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="tests/build" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="tests/build/test/runners|tests/build/test/results|tests/build/test/preprocess|tests/build/test/out|tests/build/test/dependencies|tests/build/test/cache" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>

1
tests/project.yml
View File

@ -71,7 +71,6 @@
:mock_prefix: mock_
:when_no_prototypes: :warn
:enforce_strict_ordering: TRUE
# :callback_include_count: FALSE
:plugins:
- :ignore
- :callback

3
tests/test/test_osal_none.c
View File

@ -39,9 +39,8 @@
#undef TUSB_CFG_OS
#endif
#define TUSB_CFG_OS TUSB_OS_NONE
#include "unity.h"
#include "osal.h"
#include "osal_none.h"
uint32_t statements[10];
osal_semaphore_t sem;

4
tinyusb/host/usbd_host.c
View File

@ -59,8 +59,8 @@
STATIC_ usbh_device_info_t device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
#define ENUM_DEPTH 2
STATIC_ osal_queue_t queue_enumerate;
STATIC_ uint8_t queue_enumerate_buffer[ENUM_DEPTH*sizeof(usbh_enumerate_t)];
//STATIC_ osal_queue_t queue_enumerate;
//STATIC_ uint8_t queue_enumerate_buffer[ENUM_DEPTH*sizeof(usbh_enumerate_t)];
//--------------------------------------------------------------------+
// PUBLIC API (Parameter Verification is required)

28
tinyusb/osal/osal.h
View File

@ -62,27 +62,33 @@
#define TUSB_OS_FREERTOS 3
#define TUSB_OS_UCOS 4
#ifndef _TEST_
#if TUSB_CFG_OS == TUSB_OS_NONE
#include "osal_none.h"
#else
#error TUSB_CFG_OS is not defined or OS is not supported yet
#endif
//--------------------------------------------------------------------+
// SEMAPHORE API
//--------------------------------------------------------------------+
#else // OSAL API for cmock
//--------------------------------------------------------------------+
// QUEUE API
//--------------------------------------------------------------------+
typedef uint32_t osal_queue_id_t;
////osal_queue_id_t osal_queue_create(osal_queue_t *queue, uint8_t *buffer);
osal_queue_id_t osal_queue_create(osal_queue_id_t *queue, uint8_t *buffer);
//tusb_error_t osal_queue_put(osal_queue_id_t qid, uint32_t data, osal_timeout_t msec);
//tusb_error_t osal_queue_get(osal_queue_id_t qid, uint32_t *data, osal_timeout_t msec);
#include "osal_common.h"
typedef uint32_t osal_timeout_t;
//------------- Semaphore -------------//
typedef uint32_t osal_semaphore_t;
typedef void* osal_semaphore_handle_t;
osal_semaphore_handle_t osal_semaphore_create(osal_semaphore_t * const sem);
tusb_error_t osal_semaphore_wait(osal_semaphore_handle_t const sem_hdl, osal_timeout_t msec);
tusb_error_t osal_semaphore_post(osal_semaphore_handle_t const sem_hdl);
//------------- Queue -------------//
typedef uint32_t osal_queue_t;
typedef void* osal_queue_handle_t;
osal_queue_handle_t osal_queue_create(osal_queue_t *queue, uint8_t *buffer);
#endif
#ifdef __cplusplus
}

2
tinyusb/osal/osal_none.h
View File

@ -73,6 +73,8 @@ typedef uint32_t osal_timeout_t;
// OSAL_TASK_LOOP_ENG
// }
//--------------------------------------------------------------------+
#define osal_task_create(code, name, stack_depth, parameters, prio)
#define OSAL_TASK_LOOP \
static uint16_t state = 0;\
switch(state)\