From 68f5c004d836a6d15dfe651de3333c7ab0cc7e5f Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Fri, 30 Mar 2018 18:39:35 +0700
Subject: [PATCH] remove osal_common.h

---
 tinyusb/osal/osal.h          |  7 ++++
 tinyusb/osal/osal_common.h   | 64 ------------------------------------
 tinyusb/osal/osal_freeRTOS.h |  2 --
 tinyusb/osal/osal_none.h     |  1 -
 4 files changed, 7 insertions(+), 67 deletions(-)
 delete mode 100644 tinyusb/osal/osal_common.h

diff --git a/tinyusb/osal/osal.h b/tinyusb/osal/osal.h
index f072ceae..cd165aa3 100644
--- a/tinyusb/osal/osal.h
+++ b/tinyusb/osal/osal.h
@@ -56,6 +56,13 @@
 #include "tusb_option.h"
 #include "common/tusb_common.h"
 
+enum
+{
+  OSAL_TIMEOUT_NOTIMEOUT    = 0,    //  return immediately
+  OSAL_TIMEOUT_NORMAL       = 10*5, // default is 10 msec, FIXME [CMSIS-RTX] easily timeout with 10 msec
+  OSAL_TIMEOUT_WAIT_FOREVER = 0xFFFFFFFFUL
+};
+
 
 #if TUSB_CFG_OS == TUSB_OS_NONE
   #include "osal_none.h"
diff --git a/tinyusb/osal/osal_common.h b/tinyusb/osal/osal_common.h
deleted file mode 100644
index be8c59d6..00000000
--- a/tinyusb/osal/osal_common.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/**************************************************************************/
-/*!
-    @file     osal_common.h
-    @author   hathach (tinyusb.org)
-
-    @section LICENSE
-
-    Software License Agreement (BSD License)
-
-    Copyright (c) 2013, hathach (tinyusb.org)
-    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. Neither the name of the copyright holders nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 COPYRIGHT HOLDER 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 tinyusb stack.
-*/
-/**************************************************************************/
-
-/** \ingroup group_osal
- *  @{ */
-
-#ifndef _TUSB_OSAL_COMMON_H_
-#define _TUSB_OSAL_COMMON_H_
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-#include <common/tusb_common.h>
-
-enum
-{
-  OSAL_TIMEOUT_NOTIMEOUT    = 0,  // for use within ISR,  return immediately
-  OSAL_TIMEOUT_NORMAL       = 10*5, // default is 10 msec, FIXME [CMSIS-RTX] easily timeout with 10 msec
-  OSAL_TIMEOUT_WAIT_FOREVER = 0xFFFFFFFFUL
-};
-
-#ifdef __cplusplus
- }
-#endif
-
-#endif /* _TUSB_OSAL_COMMON_H_ */
-
-/** @} */
diff --git a/tinyusb/osal/osal_freeRTOS.h b/tinyusb/osal/osal_freeRTOS.h
index f8098131..2eef4949 100644
--- a/tinyusb/osal/osal_freeRTOS.h
+++ b/tinyusb/osal/osal_freeRTOS.h
@@ -44,8 +44,6 @@
 #ifndef _TUSB_OSAL_FREERTOS_H_
 #define _TUSB_OSAL_FREERTOS_H_
 
-#include "osal_common.h"
-
 //------------- FreeRTOS Headers -------------//
 #include "FreeRTOS.h"
 #include "semphr.h"
diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h
index 9cdfdcb2..8500638f 100644
--- a/tinyusb/osal/osal_none.h
+++ b/tinyusb/osal/osal_none.h
@@ -43,7 +43,6 @@
 #ifndef _TUSB_OSAL_NONE_H_
 #define _TUSB_OSAL_NONE_H_
 
-#include "osal_common.h"
 #include "common/tusb_fifo.h"
 
 #ifdef __cplusplus