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

add primitive_types.h for portable with uint8,16,32_t, and bool 

add osal_common.h to ease the complaint of MISRA 19.1
implement OSAL_NONE Task loop, semaphore wait/post and its test code
This commit is contained in:
hathach 2013-01-30 11:35:37 +07:00
parent 6db8af2023
commit 07048b943e
8 changed files with 297 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cproject
View File

@ -41,6 +41,9 @@
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base.1796109719" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base"/>
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="tests/build" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
@ -715,4 +718,5 @@
</target>
</buildTargets>
</storageModule>
<storageModule moduleId="refreshScope"/>
</cproject>

1
tests/test/host/test_usbd_host.c
View File

@ -67,6 +67,7 @@ void test_usbh_init_checkmem(void)
void test_usbh_init_queue_create_fail(void)
{
TEST_IGNORE();
osal_queue_create_IgnoreAndReturn(TUSB_ERROR_OSAL_QUEUE_FAILED);
TEST_ASSERT_EQUAL(TUSB_ERROR_OSAL_QUEUE_FAILED, usbh_init());
}

86
tests/test/test_osal_none.c
View File

@ -35,12 +35,23 @@
* This file is part of the tiny usb stack.
*/
#ifdef TUSB_CFG_OS
#undef TUSB_CFG_OS
#endif
#define TUSB_CFG_OS TUSB_OS_NONE
#include "unity.h"
#include "osal_none.h"
#include "osal.h"
uint32_t statements[10];
osal_semaphore_t sem;
osal_semaphore_handle_t sem_hdl;
void setUp(void)
{
memset(statements, 0, sizeof(statements));
sem = 0;
sem_hdl = osal_semaphore_create(&sem);
}
void tearDown(void)
@ -48,9 +59,78 @@ void tearDown(void)
}
void test_queue_put_invalid_para(void)
//--------------------------------------------------------------------+
// Semaphore
//--------------------------------------------------------------------+
void test_semaphore_create(void)
{
TEST_ASSERT_EQUAL_PTR(&sem, sem_hdl);
TEST_ASSERT_EQUAL(0, sem);
}
void test_semaphore_post(void)
{
osal_semaphore_post(sem_hdl);
TEST_ASSERT_EQUAL(1, sem);
}
//--------------------------------------------------------------------+
// Queue
//--------------------------------------------------------------------+
void test_queue_create(void)
{
TEST_IGNORE();
// osal_queue_put();
}
//--------------------------------------------------------------------+
// TASK
//--------------------------------------------------------------------+
void sample_task_semaphore(void)
{
OSAL_TASK_LOOP
{
OSAL_TASK_LOOP_BEGIN
statements[0]++;
osal_semaphore_wait(sem_hdl, OSAL_TIMEOUT_WAIT_FOREVER);
statements[1]++;
osal_semaphore_wait(sem_hdl, OSAL_TIMEOUT_WAIT_FOREVER);
statements[2]++;
osal_semaphore_wait(sem_hdl, OSAL_TIMEOUT_WAIT_FOREVER);
statements[3]++;
OSAL_TASK_LOOP_END
}
}
void test_task_with_semaphore(void)
{
uint32_t i;
// several invoke before sempahore is available
for(i=0; i<10; i++)
sample_task_semaphore();
TEST_ASSERT_EQUAL(1, statements[0]);
// several invoke after posting semaphore
osal_semaphore_post(sem_hdl);
sample_task_semaphore();
TEST_ASSERT_EQUAL(1, statements[1]);
osal_semaphore_post(sem_hdl);
osal_semaphore_post(sem_hdl);
sample_task_semaphore();
TEST_ASSERT_EQUAL(1, statements[2]);
TEST_ASSERT_EQUAL(1, statements[3]);
// reach end of task loop, back to beginning
sample_task_semaphore();
TEST_ASSERT_EQUAL(2, statements[0]);
}

4
tinyusb/common/common.h
View File

@ -56,8 +56,7 @@
extern "C" {
#endif
#include <stdbool.h>
#include <stdint.h>
#include "primitive_types.h"
#include <stddef.h>
#include <string.h>
#include <stdio.h>
@ -71,7 +70,6 @@
#include "hal/hal.h"
#include "core/tusb_types.h"
#include "core/std_descriptors.h"
#include "osal/osal.h"
// TODO try to manipulate gcc cmd option instead
#ifndef _TEST_

67
tinyusb/common/primitive_types.h Normal file
View File

@ -0,0 +1,67 @@
/*
* primitive_types.h
*
* Created on: Jan 29, 2013
* Author: hathach
*/
/*
* Software License Agreement (BSD License)
* Copyright (c) 2012, hathach (tinyusb.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
* This file is part of the tiny usb stack.
*/
/** \file
* \brief TBD
*
* \note TBD
*/
/** \ingroup TBD
* \defgroup TBD
* \brief TBD
*
* @{
*/
#ifndef _TUSB_PRIMITIVE_TYPES_H_
#define _TUSB_PRIMITIVE_TYPES_H_
#ifdef __cplusplus
extern "C" {
#endif
#include <stdbool.h>
#include <stdint.h>
#ifdef __cplusplus
}
#endif
#endif /* _TUSB_PRIMITIVE_TYPES_H_ */
/** @} */

21
tinyusb/osal/osal.h
View File

@ -55,7 +55,7 @@
extern "C" {
#endif
#include "common/common.h"
#include "tusb_option.h"
#define TUSB_OS_NONE 1
#define TUSB_OS_CMSIS 2
@ -68,22 +68,21 @@
#error TUSB_CFG_OS is not defined or OS is not supported yet
#endif
typedef uint32_t osal_status_t; // TODO OSAL port
typedef uint32_t osal_timeout_t; // TODO OSAL port
enum
{
OSAL_TIMEOUT_WAIT_FOREVER = 0
};
//--------------------------------------------------------------------+
// SEMAPHORE API
//--------------------------------------------------------------------+
//--------------------------------------------------------------------+
// 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_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);
//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);
#ifdef __cplusplus
}

72
tinyusb/osal/osal_common.h Normal file
View File

@ -0,0 +1,72 @@
/*
* osal_common.h
*
* Created on: Jan 30, 2013
* Author: hathach
*/
/*
* Software License Agreement (BSD License)
* Copyright (c) 2012, hathach (tinyusb.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
* This file is part of the tiny usb stack.
*/
/** \file
* \brief TBD
*
* \note TBD
*/
/** \ingroup TBD
* \defgroup TBD
* \brief TBD
*
* @{
*/
#ifndef _TUSB_OSAL_COMMON_H_
#define _TUSB_OSAL_COMMON_H_
#ifdef __cplusplus
extern "C" {
#endif
#include "common/common.h"
enum
{
OSAL_TIMEOUT_NOTIMEOUT = 0, // for use within ISR, return immediately
OSAL_TIMEOUT_WAIT_FOREVER = 1
};
#ifdef __cplusplus
}
#endif
#endif /* _TUSB_OSAL_COMMON_H_ */
/** @} */

61
tinyusb/osal/osal_none.h
View File

@ -55,7 +55,63 @@
extern "C" {
#endif
#include "osal.h"
#include "osal_common.h"
typedef uint32_t osal_timeout_t;
//--------------------------------------------------------------------+
// TASK API
// NOTES: Each blocking OSAL_NONE services such as semaphore wait,
// queue receive embedded return statement, therefore local variable
// retain value before/after such services needed to declare as static
// OSAL_TASK_LOOP
// {
// OSAL_TASK_LOOP_BEGIN
//
// task body statements
//
// OSAL_TASK_LOOP_ENG
// }
//--------------------------------------------------------------------+
#define OSAL_TASK_LOOP \
static uint16_t state = 0;\
switch(state)\
#define OSAL_TASK_LOOP_BEGIN \
case 0:
#define OSAL_TASK_LOOP_END \
default:\
state = 0;
//--------------------------------------------------------------------+
// Semaphore API
//--------------------------------------------------------------------+
typedef uint8_t osal_semaphore_t;
typedef osal_semaphore_t * osal_semaphore_handle_t;
static inline osal_semaphore_handle_t osal_semaphore_create(osal_semaphore_t * const sem) ATTR_CONST ATTR_ALWAYS_INLINE;
static inline osal_semaphore_handle_t osal_semaphore_create(osal_semaphore_t * const sem)
{
(*sem) = 0;
return (osal_semaphore_handle_t) sem;
}
static inline tusb_error_t osal_semaphore_post(osal_semaphore_handle_t const sem_hdl) ATTR_ALWAYS_INLINE;
static inline tusb_error_t osal_semaphore_post(osal_semaphore_handle_t const sem_hdl)
{
(*sem_hdl)++;
return TUSB_ERROR_NONE;
}
#define osal_semaphore_wait(sem_hdl, msec) \
do {\
state = __LINE__; case __LINE__:\
if( (*sem_hdl) == 0 ) \
return;\
else\
(*sem_hdl)--;\
}while(0)
//--------------------------------------------------------------------+
// QUEUE API
@ -68,8 +124,9 @@ typedef struct{
volatile uint16_t rd_ptr ; ///< read pointer
} osal_queue_t;
//typedef osal_queue_t osal_queue_id_t*;
typedef osal_queue_t * osal_queue_handle_t;
// queue_send, queue_receive
#define OSAL_DEF_QUEUE(name, size)\
osal_queue_t name;\
uint8_t buffer_##name[size]