diff options
| author | hathach <[email protected]> | 2018-03-02 18:43:00 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-02 18:50:30 +0700 |
| commit | 7ee801a2095adacaadb5edd88356031160bfb0dd (patch) | |
| tree | 5468436fce78dcb842a00e75f0aa9c232a0d66d2 /tinyusb | |
| parent | 299c92f2fc3845e9a9dbf43374e011c243c88578 (diff) | |
rename hal.h to tusb_hal.h
Diffstat (limited to 'tinyusb')
| -rw-r--r-- | tinyusb/common/assertion.h | 2 | ||||
| -rw-r--r-- | tinyusb/device/dcd_lpc43xx.c | 2 | ||||
| -rw-r--r-- | tinyusb/tusb.h | 2 | ||||
| -rw-r--r-- | tinyusb/tusb_hal.h (renamed from tinyusb/hal/hal.h) | 13 |
4 files changed, 10 insertions, 9 deletions
diff --git a/tinyusb/common/assertion.h b/tinyusb/common/assertion.h index 5d78dcce1..16c9b07e4 100644 --- a/tinyusb/common/assertion.h +++ b/tinyusb/common/assertion.h @@ -54,7 +54,7 @@ extern "C" #include <stdint.h>
#include "compiler/compiler.h"
-#include "hal/hal.h" // TODO find a way to break hal dependency
+#include "tusb_hal.h" // TODO find a way to break hal dependency
#define VOID_RETURN
diff --git a/tinyusb/device/dcd_lpc43xx.c b/tinyusb/device/dcd_lpc43xx.c index a513084c2..3b69b4821 100644 --- a/tinyusb/device/dcd_lpc43xx.c +++ b/tinyusb/device/dcd_lpc43xx.c @@ -45,7 +45,7 @@ // INCLUDE
//--------------------------------------------------------------------+
#include "common/common.h"
-#include "hal/hal.h"
+#include "tusb_hal.h"
#include "osal/osal.h"
#include "common/timeout_timer.h"
diff --git a/tinyusb/tusb.h b/tinyusb/tusb.h index 5eabf0666..84ab07a30 100644 --- a/tinyusb/tusb.h +++ b/tinyusb/tusb.h @@ -47,7 +47,7 @@ // INCLUDE
//--------------------------------------------------------------------+
#include "common/common.h"
-#include "hal/hal.h"
+#include "tusb_hal.h"
#include "osal/osal.h"
//------------- HOST -------------//
diff --git a/tinyusb/hal/hal.h b/tinyusb/tusb_hal.h index ff4c7fca7..a99c58ccd 100644 --- a/tinyusb/hal/hal.h +++ b/tinyusb/tusb_hal.h @@ -39,6 +39,10 @@ #ifndef _TUSB_HAL_H_
#define _TUSB_HAL_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
//--------------------------------------------------------------------+
// INCLUDES
//--------------------------------------------------------------------+
@@ -49,8 +53,8 @@ #include "common/tusb_errors.h"
#include "common/compiler/compiler.h"
-// callback from tusb.h
-void tusb_isr(uint8_t coreid);
+// from mcu port
+#include "hal_mcu.h"
//--------------------------------------------------------------------+
// HAL API
@@ -83,11 +87,8 @@ void hal_usb_int_enable(uint8_t coreid); */
void hal_usb_int_disable(uint8_t coreid);
-#include "hal_mcu.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+
static inline bool hal_debugger_is_attached(void)
{
|