From c202bfe5569c4a8cf9ed06116c24ae5b02cd547a Mon Sep 17 00:00:00 2001
From: hathach <thachha@live.com>
Date: Mon, 29 Apr 2013 20:43:16 +0700
Subject: move ngx4330 to ngx folder in boards

---
 demos/bsp/boards/board.h             |   4 +-
 demos/bsp/boards/board_ngx4330.c     | 116 -----------------------------------
 demos/bsp/boards/board_ngx4330.h     |  76 -----------------------
 demos/bsp/boards/ngx/board_ngx4330.c | 116 +++++++++++++++++++++++++++++++++++
 demos/bsp/boards/ngx/board_ngx4330.h |  76 +++++++++++++++++++++++
 demos/host/host_os_none/.cproject    |   4 +-
 6 files changed, 196 insertions(+), 196 deletions(-)
 delete mode 100644 demos/bsp/boards/board_ngx4330.c
 delete mode 100644 demos/bsp/boards/board_ngx4330.h
 create mode 100644 demos/bsp/boards/ngx/board_ngx4330.c
 create mode 100644 demos/bsp/boards/ngx/board_ngx4330.h

diff --git a/demos/bsp/boards/board.h b/demos/bsp/boards/board.h
index 13f2e436e..80cb653b7 100644
--- a/demos/bsp/boards/board.h
+++ b/demos/bsp/boards/board.h
@@ -73,13 +73,13 @@
 #if BOARD == 0
   #error BOARD is not defined or supported yet
 #elif BOARD == BOARD_NGX4330
-  #include "board_ngx4330.h"
+  #include "ngx/board_ngx4330.h"
 #elif BOARD == BOARD_LPCXPRESSO1347
   #include "board_lpcxpresso1347.h"
 #elif BOARD == BOARD_AT86RF2XX
   #include "board_at86rf2xx.h"
 #elif BOARD == BOARD_EA4357
-  #include "embedded_artists\board_ea4357.h"
+  #include "embedded_artists/board_ea4357.h"
 #else
   #error BOARD is not defined or supported yet
 #endif
diff --git a/demos/bsp/boards/board_ngx4330.c b/demos/bsp/boards/board_ngx4330.c
deleted file mode 100644
index d42159d3a..000000000
--- a/demos/bsp/boards/board_ngx4330.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * board_ngx4330.c
- *
- *  Created on: Dec 4, 2012
- *      Author: hathach
- */
-
-/*
- * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 tiny usb stack.
- */
-
-#include "board.h"
-
-#if BOARD == BOARD_NGX4330
-
-#include "lpc43xx_uart.h"
-#include "lpc43xx_scu.h"
-#include "lpc43xx_cgu.h"
-#include "lpc43xx_gpio.h"
-#include "lpc43xx_timer.h"
-#include "lpc43xx_i2c.h"
-#include "lpc43xx_gpdma.h"
-#include "lpc43xx_i2s.h"
-#include "lpc43xx_emc.h"
-
-#define BOARD_MAX_LEDS  2
-const static struct {
-  uint8_t port;
-  uint8_t pin;
-}leds[BOARD_MAX_LEDS] = { {1, 11}, {1,12} };
-
-void board_init(void)
-{
-  SystemInit();
-  CGU_Init();
-	SysTick_Config( CGU_GetPCLKFrequency(CGU_PERIPHERAL_M4CORE)/CFG_TICKS_PER_SECOND );	/* 1 ms Timer */
-
-	//------------- USB Bus power HOST ONLY-------------//
-	scu_pinmux(0x1, 7, MD_PUP | MD_EZI, FUNC4);	// P1_7 USB0_PWR_EN, USB0 VBus function Xplorer
-
-	scu_pinmux(0x2, 5, MD_PLN | MD_EZI | MD_ZI, FUNC2);	// USB1_VBUS monitor presence, must be high for bus reset occur
-	scu_pinmux(0x2, 6, MD_PUP | MD_EZI, FUNC4); // P2_6 is configured as GPIO5[6] for USB1_PWR_EN
-	GPIO_SetDir   (5, BIT_(6), 1);              // GPIO5[6] is output
-	GPIO_SetValue (5, BIT_(6));                 // GPIO5[6] output high
-
-	// Leds Init
-	for (uint8_t i=0; i<BOARD_MAX_LEDS; i++)
-	{
-	  scu_pinmux(leds[i].port, leds[i].pin, MD_PUP|MD_EZI|MD_ZI, FUNC0);
-	  GPIO_SetDir(leds[i].port, BIT_(leds[i].pin), 1); // output
-	}
-
-#if CFG_UART_ENABLE
-	//------------- UART init -------------//
-	UART_CFG_Type UARTConfigStruct;
-
-	scu_pinmux(0x6 ,4, MD_PDN|MD_EZI, FUNC2); 	// UART0_TXD
-	scu_pinmux(0x6 ,5, MD_PDN|MD_EZI, FUNC2); 	// UART0_RXD
-
-	UART_ConfigStructInit(&UARTConfigStruct);                   // default: baud = 9600, 8 bit data, 1 stop bit, no parity
-	UARTConfigStruct.Baud_rate = CFG_UART_BAUDRATE;             // Re-configure baudrate
-
-	UART_Init((LPC_USARTn_Type*) LPC_USART0, &UARTConfigStruct); // Initialize UART port
-	UART_TxCmd((LPC_USARTn_Type*) LPC_USART0, ENABLE);           // Enable UART
-#endif
-
-}
-
-void board_leds(uint32_t mask, uint32_t state)
-{
-  for(uint8_t i=0; i<BOARD_MAX_LEDS; i++)
-  {
-    if ( mask & BIT_(i) )
-    {
-      (mask & state) ? GPIO_SetValue(leds[i].port, BIT_(leds[i].pin)) : GPIO_ClearValue(leds[i].port, BIT_(leds[i].pin)) ;
-    }
-  }
-}
-
-uint32_t board_uart_send(uint8_t *p_buffer, uint32_t length)
-{
-  return UART_Send((LPC_USARTn_Type*) LPC_USART0, p_buffer, length, BLOCKING);
-}
-
-uint32_t board_uart_recv(uint8_t *p_buffer, uint32_t length)
-{
-  return UART_Receive((LPC_USARTn_Type*) LPC_USART0, p_buffer, length, BLOCKING);
-}
-
-#endif
diff --git a/demos/bsp/boards/board_ngx4330.h b/demos/bsp/boards/board_ngx4330.h
deleted file mode 100644
index 6eee34f47..000000000
--- a/demos/bsp/boards/board_ngx4330.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * board_ngx4330.h
- *
- *  Created on: Jan 17, 2013
- *      Author: hathach
- */
-
-/*
- * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 tiny usb stack.
- */
-
-/** \file
- *  \brief TBD
- *
- *  \note TBD
- */
-
-/** \ingroup TBD
- *  \defgroup TBD
- *  \brief TBD
- *
- *  @{
- */
-
-#ifndef _TUSB_BOARD_NGX4330_H_
-#define _TUSB_BOARD_NGX4330_H_
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-#include "LPC43xx.h"
-#include "lpc43xx_scu.h"
-#include "lpc43xx_cgu.h"
-#include "lpc43xx_gpio.h"
-#include "lpc43xx_uart.h"
-
-#define CFG_LED_NUMBER  0
-#define CFG_LED_ON               (1)
-#define CFG_LED_OFF              (0)
-
-#define CFG_PRINTF_TARGET       PRINTF_TARGET_DEBUG_CONSOLE
-
-#ifdef __cplusplus
- }
-#endif
-
-#endif /* _TUSB_BOARD_NGX4330_H_ */
-
-/** @} */
diff --git a/demos/bsp/boards/ngx/board_ngx4330.c b/demos/bsp/boards/ngx/board_ngx4330.c
new file mode 100644
index 000000000..b9dffabbc
--- /dev/null
+++ b/demos/bsp/boards/ngx/board_ngx4330.c
@@ -0,0 +1,116 @@
+/*
+ * board_ngx4330.c
+ *
+ *  Created on: Dec 4, 2012
+ *      Author: hathach
+ */
+
+/*
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 tiny usb stack.
+ */
+
+#include "../board.h"
+
+#if BOARD == BOARD_NGX4330
+
+#include "lpc43xx_uart.h"
+#include "lpc43xx_scu.h"
+#include "lpc43xx_cgu.h"
+#include "lpc43xx_gpio.h"
+#include "lpc43xx_timer.h"
+#include "lpc43xx_i2c.h"
+#include "lpc43xx_gpdma.h"
+#include "lpc43xx_i2s.h"
+#include "lpc43xx_emc.h"
+
+#define BOARD_MAX_LEDS  2
+const static struct {
+  uint8_t port;
+  uint8_t pin;
+}leds[BOARD_MAX_LEDS] = { {1, 11}, {1,12} };
+
+void board_init(void)
+{
+  SystemInit();
+  CGU_Init();
+	SysTick_Config( CGU_GetPCLKFrequency(CGU_PERIPHERAL_M4CORE)/CFG_TICKS_PER_SECOND );	/* 1 ms Timer */
+
+	//------------- USB Bus power HOST ONLY-------------//
+	scu_pinmux(0x1, 7, MD_PUP | MD_EZI, FUNC4);	// P1_7 USB0_PWR_EN, USB0 VBus function Xplorer
+
+	scu_pinmux(0x2, 5, MD_PLN | MD_EZI | MD_ZI, FUNC2);	// USB1_VBUS monitor presence, must be high for bus reset occur
+	scu_pinmux(0x2, 6, MD_PUP | MD_EZI, FUNC4); // P2_6 is configured as GPIO5[6] for USB1_PWR_EN
+	GPIO_SetDir   (5, BIT_(6), 1);              // GPIO5[6] is output
+	GPIO_SetValue (5, BIT_(6));                 // GPIO5[6] output high
+
+	// Leds Init
+	for (uint8_t i=0; i<BOARD_MAX_LEDS; i++)
+	{
+	  scu_pinmux(leds[i].port, leds[i].pin, MD_PUP|MD_EZI|MD_ZI, FUNC0);
+	  GPIO_SetDir(leds[i].port, BIT_(leds[i].pin), 1); // output
+	}
+
+#if CFG_UART_ENABLE
+	//------------- UART init -------------//
+	UART_CFG_Type UARTConfigStruct;
+
+	scu_pinmux(0x6 ,4, MD_PDN|MD_EZI, FUNC2); 	// UART0_TXD
+	scu_pinmux(0x6 ,5, MD_PDN|MD_EZI, FUNC2); 	// UART0_RXD
+
+	UART_ConfigStructInit(&UARTConfigStruct);                   // default: baud = 9600, 8 bit data, 1 stop bit, no parity
+	UARTConfigStruct.Baud_rate = CFG_UART_BAUDRATE;             // Re-configure baudrate
+
+	UART_Init((LPC_USARTn_Type*) LPC_USART0, &UARTConfigStruct); // Initialize UART port
+	UART_TxCmd((LPC_USARTn_Type*) LPC_USART0, ENABLE);           // Enable UART
+#endif
+
+}
+
+void board_leds(uint32_t mask, uint32_t state)
+{
+  for(uint8_t i=0; i<BOARD_MAX_LEDS; i++)
+  {
+    if ( mask & BIT_(i) )
+    {
+      (mask & state) ? GPIO_SetValue(leds[i].port, BIT_(leds[i].pin)) : GPIO_ClearValue(leds[i].port, BIT_(leds[i].pin)) ;
+    }
+  }
+}
+
+uint32_t board_uart_send(uint8_t *p_buffer, uint32_t length)
+{
+  return UART_Send((LPC_USARTn_Type*) LPC_USART0, p_buffer, length, BLOCKING);
+}
+
+uint32_t board_uart_recv(uint8_t *p_buffer, uint32_t length)
+{
+  return UART_Receive((LPC_USARTn_Type*) LPC_USART0, p_buffer, length, BLOCKING);
+}
+
+#endif
diff --git a/demos/bsp/boards/ngx/board_ngx4330.h b/demos/bsp/boards/ngx/board_ngx4330.h
new file mode 100644
index 000000000..6eee34f47
--- /dev/null
+++ b/demos/bsp/boards/ngx/board_ngx4330.h
@@ -0,0 +1,76 @@
+/*
+ * board_ngx4330.h
+ *
+ *  Created on: Jan 17, 2013
+ *      Author: hathach
+ */
+
+/*
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 tiny usb stack.
+ */
+
+/** \file
+ *  \brief TBD
+ *
+ *  \note TBD
+ */
+
+/** \ingroup TBD
+ *  \defgroup TBD
+ *  \brief TBD
+ *
+ *  @{
+ */
+
+#ifndef _TUSB_BOARD_NGX4330_H_
+#define _TUSB_BOARD_NGX4330_H_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+#include "LPC43xx.h"
+#include "lpc43xx_scu.h"
+#include "lpc43xx_cgu.h"
+#include "lpc43xx_gpio.h"
+#include "lpc43xx_uart.h"
+
+#define CFG_LED_NUMBER  0
+#define CFG_LED_ON               (1)
+#define CFG_LED_OFF              (0)
+
+#define CFG_PRINTF_TARGET       PRINTF_TARGET_DEBUG_CONSOLE
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* _TUSB_BOARD_NGX4330_H_ */
+
+/** @} */
diff --git a/demos/host/host_os_none/.cproject b/demos/host/host_os_none/.cproject
index afcf871aa..485840d93 100644
--- a/demos/host/host_os_none/.cproject
+++ b/demos/host/host_os_none/.cproject
@@ -85,7 +85,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="bsp/boards/embedded_artists|bsp/boards/embedded_artists/oem_base_board/uda1380.c|bsp/boards/embedded_artists/oem_base_board/norflash.c|bsp/boards/embedded_artists/oem_base_board/memreg.c|bsp/boards/embedded_artists/oem_base_board/lm75a.c|bsp/boards/embedded_artists/oem_base_board/joystick.c|bsp/boards/embedded_artists/oem_base_board/base_eeprom.c|bsp/boards/embedded_artists/oem_base_board/acc.c|bsp/lpc11uxx|NGX|bsp/lpc13uxx" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
+						<entry excluding="bsp/boards/embedded_artists/oem_base_board/acc.c|bsp/boards/embedded_artists/oem_base_board/base_eeprom.c|ngx|bsp/boards/embedded_artists/oem_base_board/joystick.c|bsp/boards/embedded_artists|bsp/lpc11uxx|bsp/boards/embedded_artists/oem_base_board/lm75a.c|bsp/boards/embedded_artists/oem_base_board/uda1380.c|bsp/lpc13uxx|bsp/boards/embedded_artists/oem_base_board/memreg.c|bsp/boards/embedded_artists/oem_base_board/norflash.c" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -1196,7 +1196,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="bsp/boards/embedded_artists/oem_base_board/uda1380.c|bsp/boards/embedded_artists/oem_base_board/norflash.c|bsp/boards/embedded_artists/oem_base_board/memreg.c|bsp/boards/embedded_artists/oem_base_board/lm75a.c|bsp/boards/embedded_artists/oem_base_board/joystick.c|bsp/boards/embedded_artists/oem_base_board/base_eeprom.c|bsp/boards/embedded_artists/oem_base_board/acc.c|bsp/lpc11uxx|NGX|bsp/lpc13uxx" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
+						<entry excluding="bsp/boards/embedded_artists/oem_base_board/acc.c|bsp/boards/embedded_artists/oem_base_board/base_eeprom.c|ngx|bsp/boards/embedded_artists/oem_base_board/joystick.c|bsp/lpc11uxx|bsp/boards/embedded_artists/oem_base_board/lm75a.c|bsp/boards/embedded_artists/oem_base_board/uda1380.c|bsp/lpc13uxx|bsp/boards/embedded_artists/oem_base_board/memreg.c|bsp/boards/embedded_artists/oem_base_board/norflash.c" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
-- 
cgit v1.3.1