From b36a85ad3625596ce57f1a9fc2ddde2ea98b33d8 Mon Sep 17 00:00:00 2001
From: hathach <thachha@live.com>
Date: Sun, 2 Dec 2012 11:07:59 +0700
Subject: add extern "C" for cpp start to work on hal layer

---
 tinyusb/common/arch/arch_lpc134x.h     | 2 +-
 tinyusb/common/common.h                | 8 ++++++++
 tinyusb/common/compiler/compiler_gcc.h | 8 ++++++++
 tinyusb/common/errors.h                | 8 ++++----
 tinyusb/common/fifo.h                  | 7 ++++---
 5 files changed, 25 insertions(+), 8 deletions(-)

(limited to 'tinyusb/common')

diff --git a/tinyusb/common/arch/arch_lpc134x.h b/tinyusb/common/arch/arch_lpc134x.h
index a1c42ca7e..b43bcea7c 100644
--- a/tinyusb/common/arch/arch_lpc134x.h
+++ b/tinyusb/common/arch/arch_lpc134x.h
@@ -54,7 +54,7 @@
 
 #include "arm_mx.h"
 #include "LPC13Uxx.h"
-
+#include "system_LPC13Uxx.h"
 
 
 #endif /* _TUSB_ARCH_LPC134_X_H_ */
diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h
index b35639574..a0a50896b 100644
--- a/tinyusb/common/common.h
+++ b/tinyusb/common/common.h
@@ -51,6 +51,10 @@
 #ifndef _TUSB_COMMON_H_
 #define _TUSB_COMMON_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #include <stddef.h>
 #include <stdbool.h>
 #include <string.h>
@@ -89,6 +93,10 @@
 
 #define ASSERT_ERROR(sts)		ASSERT_ERROR_MESSAGE(sts, NULL)
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* _TUSB_COMMON_H_ */
 
 /**  @} */
diff --git a/tinyusb/common/compiler/compiler_gcc.h b/tinyusb/common/compiler/compiler_gcc.h
index 787f9f6ae..ee651140b 100644
--- a/tinyusb/common/compiler/compiler_gcc.h
+++ b/tinyusb/common/compiler/compiler_gcc.h
@@ -49,6 +49,10 @@
 #ifndef _TUSB_COMPILER_GCC_H_
 #define _TUSB_COMPILER_GCC_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 /// Normally, the compiler places the objects it generates in sections like data or bss & function in text. Sometimes, however, you need additional sections, or you need certain particular variables to appear in special sections, for example to map to special hardware. The section attribute specifies that a variable (or function) lives in a particular section
 #define ATTR_SECTION(section) 		 __attribute__ ((#section))
 
@@ -117,6 +121,10 @@
 
 /** @} */
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* _TUSB_COMPILER_GCC_H_ */
 
 /// @}
diff --git a/tinyusb/common/errors.h b/tinyusb/common/errors.h
index e9644bb3d..4a33aeb4f 100644
--- a/tinyusb/common/errors.h
+++ b/tinyusb/common/errors.h
@@ -49,6 +49,10 @@
 #ifndef _TUSB_ERRORS_H_
 #define _TUSB_ERRORS_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 /** \enum TUSB_Error_t
  *  \brief Error Code returned
  */
@@ -60,10 +64,6 @@ typedef enum {
   ERROR_COUNT
 }TUSB_Error_t;
 
-#ifdef __cplusplus
- extern "C" {
-#endif
-
 /// Enum to String for debugging purposes. Only available if \ref CFG_TUSB_DEBUG_LEVEL > 0
 extern char const* const TUSB_ErrorStr[];
 
diff --git a/tinyusb/common/fifo.h b/tinyusb/common/fifo.h
index b23c56f0d..6ce602456 100644
--- a/tinyusb/common/fifo.h
+++ b/tinyusb/common/fifo.h
@@ -51,6 +51,10 @@
 
 #include "common/common.h"
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 /** \struct fifo_t
  * \brief Simple Circular FIFO
  */
@@ -65,9 +69,6 @@ typedef struct _fifo_t
   IRQn_Type irq; ///< interrupt used to lock fifo
 } fifo_t;
 
-#ifdef __cplusplus
- extern "C" {
-#endif
 
 void fifo_init(fifo_t* f, uint8_t* buffer, uint16_t size, bool overwritable, IRQn_Type irq);
 bool fifo_write(fifo_t* f, uint8_t data);
-- 
cgit v1.3.1