From a5b29c5d333fc5fe3bcd01de145e130765ed1d48 Mon Sep 17 00:00:00 2001
From: hathach <thachha@live.com>
Date: Mon, 4 Feb 2013 13:13:07 +0700
Subject: [PATCH] refractor include chain with following policies - header file
 only include what it needs for its declarations.

---
 tests/test/test_fifo.c         |  6 +++---
 tinyusb/common/binary.h        |  2 +-
 tinyusb/common/common.h        |  9 +++++++--
 tinyusb/common/errors.h        |  2 +-
 tinyusb/common/fifo.c          | 12 ++++++------
 tinyusb/common/fifo.h          |  4 ++--
 tinyusb/core/std_descriptors.h |  5 ++++-
 tinyusb/core/std_request.h     |  5 ++++-
 tinyusb/core/tusb_types.h      |  5 +++++
 tinyusb/hal/hal.h              |  2 +-
 tinyusb/hal/hal_lpc43xx.h      |  2 +-
 11 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/tests/test/test_fifo.c b/tests/test/test_fifo.c
index 4a2ba41c0..b5dd74bba 100644
--- a/tests/test/test_fifo.c
+++ b/tests/test/test_fifo.c
@@ -44,7 +44,7 @@ static uint8_t buffer[FIFO_SIZE];
 
 void setUp(void)
 {
-  fifo_init(&ff, buffer, FIFO_SIZE, 0, 0);
+  fifo_init(&ff, buffer, FIFO_SIZE, 0);
 }
 
 void tearDown(void)
@@ -54,8 +54,8 @@ void tearDown(void)
 void test_create_null(void)
 {
   memset(&ff, 0, sizeof(fifo_t)); // clear fifo to test null created
-  TEST_ASSERT_FALSE( fifo_init(&ff, buffer, 0, 0, 0) );
-  TEST_ASSERT_TRUE( fifo_init(&ff, buffer, 1, 0, 0) );
+  TEST_ASSERT_FALSE( fifo_init(&ff, buffer, 0, 0) );
+  TEST_ASSERT_TRUE( fifo_init(&ff, buffer, 1, 0) );
 }
 
 void test_normal(void)
diff --git a/tinyusb/common/binary.h b/tinyusb/common/binary.h
index ef994ddb0..ea0f590e9 100644
--- a/tinyusb/common/binary.h
+++ b/tinyusb/common/binary.h
@@ -55,7 +55,7 @@
  extern "C" {
 #endif
 
-#include <stdint.h>
+#include "primitive_types.h"
 
 /// n-th Bit
 #define BIT_(n) (1 << (n))
diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h
index 09a82a217..a56de956e 100644
--- a/tinyusb/common/common.h
+++ b/tinyusb/common/common.h
@@ -56,18 +56,23 @@
  extern "C" {
 #endif
 
+//------------- Standard Header -------------//
 #include "primitive_types.h"
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 
+//------------- TUSB Option Header -------------//
+#include "tusb_option.h"
+
+//------------- General Header -------------//
 #include "compiler/compiler.h"
 #include "assertion.h"
 #include "binary.h"
 #include "errors.h"
 
-#include "tusb_option.h"
-#include "hal/hal.h"
+//------------- TUSB Header -------------//
+//#include "hal/hal.h"
 #include "core/tusb_types.h"
 #include "core/std_descriptors.h"
 #include "core/std_request.h"
diff --git a/tinyusb/common/errors.h b/tinyusb/common/errors.h
index f885362e7..9839f42f4 100644
--- a/tinyusb/common/errors.h
+++ b/tinyusb/common/errors.h
@@ -49,7 +49,7 @@
 #ifndef _TUSB_ERRORS_H_
 #define _TUSB_ERRORS_H_
 
-#include <stdint.h>
+#include "primitive_types.h"
 #include "../tusb_option.h"
 
 #ifdef __cplusplus
diff --git a/tinyusb/common/fifo.c b/tinyusb/common/fifo.c
index ccb2c60fc..b968d9574 100644
--- a/tinyusb/common/fifo.c
+++ b/tinyusb/common/fifo.c
@@ -48,8 +48,8 @@
 /**************************************************************************/
 static inline void mutex_lock (fifo_t* f)
 {
-  if (f->irq > 0)
-    NVIC_DisableIRQ(f->irq);
+//  if (f->irq > 0)
+//    NVIC_DisableIRQ(f->irq);
 }
 
 /**************************************************************************/
@@ -62,8 +62,8 @@ static inline void mutex_lock (fifo_t* f)
 /**************************************************************************/
 static inline void mutex_unlock (fifo_t* f)
 {
-  if (f->irq > 0)
-    NVIC_EnableIRQ(f->irq);
+//  if (f->irq > 0)
+//    NVIC_EnableIRQ(f->irq);
 }
 
 /**************************************************************************/
@@ -84,7 +84,7 @@ static inline void mutex_unlock (fifo_t* f)
                 Set the -1 if not required.
 */
 /**************************************************************************/
-bool fifo_init(fifo_t* f, uint8_t* buffer, uint16_t size, bool overwritable, IRQn_Type irq)
+bool fifo_init(fifo_t* f, uint8_t* buffer, uint16_t size, bool overwritable) //, IRQn_Type irq)
 {
   ASSERT(size > 0, false);
 
@@ -92,7 +92,7 @@ bool fifo_init(fifo_t* f, uint8_t* buffer, uint16_t size, bool overwritable, IRQ
   f->size = size;
   f->rd_ptr = f->wr_ptr = f->len = 0;
   f->overwritable = overwritable;
-  f->irq = irq;
+//  f->irq = irq;
 
   return true;
 }
diff --git a/tinyusb/common/fifo.h b/tinyusb/common/fifo.h
index 08d1305f3..7295ae88a 100644
--- a/tinyusb/common/fifo.h
+++ b/tinyusb/common/fifo.h
@@ -66,10 +66,10 @@ typedef struct _fifo_t
   volatile uint16_t wr_ptr       ; ///< write pointer
   volatile uint16_t rd_ptr       ; ///< read pointer
            bool     overwritable ; ///< allow overwrite data when full
-           IRQn_Type irq         ; ///< TODO (abstract later) interrupt used to lock fifo
+//           IRQn_Type irq         ; ///< TODO (abstract later) interrupt used to lock fifo
 } fifo_t;
 
-bool fifo_init(fifo_t* f, uint8_t* buffer, uint16_t size, bool overwritable, IRQn_Type irq);
+bool 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);
 bool fifo_read(fifo_t* f, uint8_t *data);
 uint16_t fifo_read_n(fifo_t* f, uint8_t * rx, uint16_t maxlen);
diff --git a/tinyusb/core/std_descriptors.h b/tinyusb/core/std_descriptors.h
index dc43bce76..b21a4ec95 100644
--- a/tinyusb/core/std_descriptors.h
+++ b/tinyusb/core/std_descriptors.h
@@ -52,7 +52,10 @@
  extern "C" {
 #endif
 
-#include "common/common.h"
+#include "tusb_option.h"
+#include "common/primitive_types.h"
+#include "common/compiler/compiler.h"
+#include "common/binary.h"
 
 //--------------------------------------------------------------------+
 // STANDARD DESCRIPTORS
diff --git a/tinyusb/core/std_request.h b/tinyusb/core/std_request.h
index 7b95fed8d..327bc85b7 100644
--- a/tinyusb/core/std_request.h
+++ b/tinyusb/core/std_request.h
@@ -55,7 +55,10 @@
  extern "C" {
 #endif
 
-#include "common/common.h"
+#include "tusb_option.h"
+#include "common/primitive_types.h"
+#include "common/compiler/compiler.h"
+#include "common/binary.h"
 
 typedef ATTR_PREPACKED struct ATTR_PACKED {
   struct {
diff --git a/tinyusb/core/tusb_types.h b/tinyusb/core/tusb_types.h
index b683b35c9..8198d3ceb 100644
--- a/tinyusb/core/tusb_types.h
+++ b/tinyusb/core/tusb_types.h
@@ -53,6 +53,11 @@
  extern "C" {
 #endif
 
+#include "tusb_option.h"
+#include "common/primitive_types.h"
+#include "common/compiler/compiler.h"
+#include "common/binary.h"
+
 /// defined base on EHCI specs value for Endpoint Speed
 typedef enum {
   TUSB_SPEED_FULL = 0,
diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h
index 80e1e0712..7bc038877 100644
--- a/tinyusb/hal/hal.h
+++ b/tinyusb/hal/hal.h
@@ -55,8 +55,8 @@
  extern "C" {
 #endif
 
+#include "tusb_option.h"
 #include "common/compiler/compiler.h"
-#include "common/errors.h"
 
 #define MCU_LPC13UXX 1
 #define MCU_LPC11UXX 2
diff --git a/tinyusb/hal/hal_lpc43xx.h b/tinyusb/hal/hal_lpc43xx.h
index 0935b4bbf..f1aa82ef7 100644
--- a/tinyusb/hal/hal_lpc43xx.h
+++ b/tinyusb/hal/hal_lpc43xx.h
@@ -52,7 +52,7 @@
 #define _TUSB_HAL_LPC43XX_H_
 
 #include "LPC43xx.h"
-#include "lpc43xx_cgu.h"
+//#include "lpc43xx_cgu.h"
 
 #ifdef __cplusplus
  extern "C" {