andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove tusb_hal_millis() usage, less work for porting

Browse Source
This commit is contained in:
hathach
2019-03-24 01:19:32 +07:00
parent 29e075b8b9
commit 18f248b142
36 changed files with 71 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/tusb_timeout.h
View File

@@ -43,6 +43,8 @@ typedef struct {
uint32_t interval;
}tu_timeout_t;
#if 0
extern uint32_t tusb_hal_millis(void);
static inline void tu_timeout_set(tu_timeout_t* tt, uint32_t msec)
@@ -67,6 +69,8 @@ static inline void tu_timeout_restart(tu_timeout_t* tt)
tt->start = tusb_hal_millis();
}
#endif
#ifdef __cplusplus
}
#endif

48
src/osal/osal.c
View File

@@ -1,48 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2018, hathach (tinyusb.org)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* This file is part of the TinyUSB stack.
*/
#include "tusb_option.h"
#include "osal.h"
//--------------------------------------------------------------------+
// TICK API
//--------------------------------------------------------------------+
#if CFG_TUSB_OS == OPT_OS_FREERTOS
uint32_t tusb_hal_millis(void)
{
return ( ( ((uint64_t) xTaskGetTickCount()) * 1000) / configTICK_RATE_HZ );
}
#elif CFG_TUSB_OS == OPT_OS_MYNEWT
uint32_t tusb_hal_millis(void)
{
return os_time_ticks_to_ms32( os_time_get() );
}
#endif

2
src/osal/osal.h
View File

@@ -52,8 +52,6 @@ typedef void (*osal_task_func_t)( void * );
#include "osal_none.h"
#else
/* RTOS Porting API
*
* uint32_t tusb_hal_millis(void)
*
* Task
* void osal_task_delay(uint32_t msec)

9
src/osal/osal_none.h
View File

@@ -27,8 +27,6 @@
#ifndef _TUSB_OSAL_NONE_H_
#define _TUSB_OSAL_NONE_H_
#include "tusb_hal.h"
#ifdef __cplusplus
extern "C" {
#endif
@@ -38,8 +36,11 @@
//--------------------------------------------------------------------+
static inline void osal_task_delay(uint32_t msec)
{
uint32_t start = tusb_hal_millis();
while ( ( tusb_hal_millis() - start ) < msec ) {}
(void) msec;
// TODO only used by Host stack, will implement using SOF
// uint32_t start = tusb_hal_millis();
// while ( ( tusb_hal_millis() - start ) < msec ) {}
}
//--------------------------------------------------------------------+

2
src/portable/nordic/nrf5x/hal_nrf5x.c
View File

@@ -40,8 +40,6 @@
#endif
#include "nrfx_power.h"
#include "tusb_hal.h"
#include "device/dcd.h"
/*------------------------------------------------------------------*/

2
src/portable/nxp/lpc18_43/dcd_lpc18_43.c
View File

@@ -32,8 +32,6 @@
// INCLUDE
//--------------------------------------------------------------------+
#include "common/tusb_common.h"
#include "tusb_hal.h"
#include "device/dcd.h"
#include "dcd_lpc18_43.h"

1
src/tusb.h
View File

@@ -35,7 +35,6 @@
// INCLUDE
//--------------------------------------------------------------------+
#include "common/tusb_common.h"
#include "tusb_hal.h"
#include "osal/osal.h"
#include "common/tusb_fifo.h"

52
src/tusb_hal.h
View File

@@ -1,52 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2018, hathach (tinyusb.org)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* This file is part of the TinyUSB stack.
*/
#ifndef _TUSB_HAL_H_
#define _TUSB_HAL_H_
#ifdef __cplusplus
extern "C" {
#endif
//--------------------------------------------------------------------+
// INCLUDES
//--------------------------------------------------------------------+
#include "common/tusb_common.h"
//--------------------------------------------------------------------+
// HAL API
//--------------------------------------------------------------------+
// Only required to implement if using No RTOS (osal_none)
// TODO could be remove
uint32_t tusb_hal_millis(void);
#ifdef __cplusplus
}
#endif
#endif /* _TUSB_HAL_H_ */