From 301be3203c376dfa5b626019c47e656d6349afbb Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 6 Mar 2014 11:52:21 +0700
Subject: [PATCH] refractor vendor/freertos

---
 demos/host/host_freertos/host_freertos.ewp    |  10 +-
 vendor/freertos/FreeRTOSConfig.h              |  11 +-
 ..._FreeRTOSConfig.h => FreeRTOSConfig_cm0.h} |   0
 ...nfig_lpc175x_6x.h => FreeRTOSConfig_cm3.h} |   2 +-
 ...FreeRTOSConfig.h => FreeRTOSConfig_cm4f.h} |   0
 vendor/freertos/lpc43xx_dualcore_config.h     | 149 ------------------
 6 files changed, 16 insertions(+), 156 deletions(-)
 rename vendor/freertos/{lpc43xx_m0_FreeRTOSConfig.h => FreeRTOSConfig_cm0.h} (100%)
 rename vendor/freertos/{FreeRTOSConfig_lpc175x_6x.h => FreeRTOSConfig_cm3.h} (97%)
 rename vendor/freertos/{lpc43xx_m4_FreeRTOSConfig.h => FreeRTOSConfig_cm4f.h} (100%)
 delete mode 100644 vendor/freertos/lpc43xx_dualcore_config.h

diff --git a/demos/host/host_freertos/host_freertos.ewp b/demos/host/host_freertos/host_freertos.ewp
index 60459446..10746f19 100644
--- a/demos/host/host_freertos/host_freertos.ewp
+++ b/demos/host/host_freertos/host_freertos.ewp
@@ -456,7 +456,11 @@
         </option>
         <option>
           <name>ADefines</name>
-          <state></state>
+          <state>CORE_M4</state>
+          <state>TUSB_CFG_MCU=MCU_LPC43XX</state>
+          <state>BOARD=BOARD_EA4357</state>
+          <state>TUSB_CFG_OS=TUSB_OS_FREERTOS</state>
+          <state>TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5</state>
         </option>
         <option>
           <name>AList</name>
@@ -552,7 +556,9 @@
         </option>
         <option>
           <name>AUserIncludes</name>
-          <state></state>
+          <state>$PROJ_DIR$\..\src</state>
+          <state>$PROJ_DIR$\..\..\..\tinyusb</state>
+          <state>$PROJ_DIR$\..\..\..\vendor\freertos</state>
         </option>
         <option>
           <name>AExtraOptionsCheckV2</name>
diff --git a/vendor/freertos/FreeRTOSConfig.h b/vendor/freertos/FreeRTOSConfig.h
index 12567535..0e54aca9 100644
--- a/vendor/freertos/FreeRTOSConfig.h
+++ b/vendor/freertos/FreeRTOSConfig.h
@@ -4,11 +4,14 @@
 #include "hal/hal.h"
 
 #if __CORTEX_M == 4
-#include "lpc43xx_m4_FreeRTOSConfig.h"
-#elif __CORTEX_M == 0
-	#include "lpc43xx_m0_FreeRTOSConfig.h"
+  #include "FreeRTOSConfig_cm4f.h"
+
 #elif __CORTEX_M == 3
-  #include "FreeRTOSConfig_lpc175x_6x.h"
+  #include "FreeRTOSConfig_cm3.h"
+
+#elif __CORTEX_M == 0
+	#include "FreeRTOSConfig_cm0.h"
+
 #else
 	#error "not yet supported MCU"
 #endif
diff --git a/vendor/freertos/lpc43xx_m0_FreeRTOSConfig.h b/vendor/freertos/FreeRTOSConfig_cm0.h
similarity index 100%
rename from vendor/freertos/lpc43xx_m0_FreeRTOSConfig.h
rename to vendor/freertos/FreeRTOSConfig_cm0.h
diff --git a/vendor/freertos/FreeRTOSConfig_lpc175x_6x.h b/vendor/freertos/FreeRTOSConfig_cm3.h
similarity index 97%
rename from vendor/freertos/FreeRTOSConfig_lpc175x_6x.h
rename to vendor/freertos/FreeRTOSConfig_cm3.h
index 2fa38b34..925f069a 100644
--- a/vendor/freertos/FreeRTOSConfig_lpc175x_6x.h
+++ b/vendor/freertos/FreeRTOSConfig_cm3.h
@@ -55,7 +55,7 @@
 #define FREERTOS_CONFIG_H
 
 #include <stdint.h>
-#include "hal/hal.h"
+
 extern uint32_t SystemCoreClock;
 
 /*-----------------------------------------------------------
diff --git a/vendor/freertos/lpc43xx_m4_FreeRTOSConfig.h b/vendor/freertos/FreeRTOSConfig_cm4f.h
similarity index 100%
rename from vendor/freertos/lpc43xx_m4_FreeRTOSConfig.h
rename to vendor/freertos/FreeRTOSConfig_cm4f.h
diff --git a/vendor/freertos/lpc43xx_dualcore_config.h b/vendor/freertos/lpc43xx_dualcore_config.h
deleted file mode 100644
index a390cef2..00000000
--- a/vendor/freertos/lpc43xx_dualcore_config.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * @brief LPC43xx dual-core example configuration file
- *
- * @note
- * Copyright(C) NXP Semiconductors, 2012
- * All rights reserved.
- *
- * @par
- * Software that is described herein is for illustrative purposes only
- * which provides customers with programming information regarding the
- * LPC products.  This software is supplied "AS IS" without any warranties of
- * any kind, and NXP Semiconductors and its licensor disclaim any and
- * all warranties, express or implied, including all implied warranties of
- * merchantability, fitness for a particular purpose and non-infringement of
- * intellectual property rights.  NXP Semiconductors assumes no responsibility
- * or liability for the use of the software, conveys no license or rights under any
- * patent, copyright, mask work right, or any other intellectual property rights in
- * or to any products. NXP Semiconductors reserves the right to make changes
- * in the software without notification. NXP Semiconductors also makes no
- * representation or warranty that such application will be suitable for the
- * specified use without further testing or modification.
- *
- * @par
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, under NXP Semiconductors' and its
- * licensor's relevant copyrights in the software, without fee, provided that it
- * is used in conjunction with NXP Semiconductors microcontrollers.  This
- * copyright, permission, and disclaimer notice must appear in all copies of
- * this code.
- */
-
-#ifndef __LPC43XX_DUALCORE_CONFIG_H_
-#define __LPC43XX_DUALCORE_CONFIG_H_
-
-#include "board.h"
-
-/*
- * Users can enable any of the following macros so that the examples will be
- * built with that functionality.
- */
-#define EXAMPLE_BLINKY
-#undef  EXAMPLE_USB_DEVICE
-#undef  EXAMPLE_USB_HOST
-#undef  EXAMPLE_LWIP
-#undef  EXAMPLE_EMWIN
-
-/*
- * Users can define any one of the following macros to use the appropriate OS.
- * For standalone executables both the macros should be disabled.
- */
-#define OS_FREE_RTOS
-#undef  OS_UCOS_III
-
-/*
- * The Stack sizes are currently used by Code Red LPCXpresso tool chain
- * only. In future, this will be used by Keil & IAR tool chains also
- */
-#define STACK_SIZE  0x200
-#define HEAP_SIZE   0x4000
-
-/*
- * The following defines are used by the M4 image to locate the M0 image, and
- * one of the below macro must be defined based on your linker definition file.
- * If the linker file is made to generate image in SPIFI area then define
- * TARGET_SPIFI macro (so that M4 image will locate the corresponding M0 in the
- * SPIFI region). If none of them r defined the following defaults will be used
- * For LPC4330 NGX XPLORER BOARD:      TARGET_SPIFI
- * For LPC4357 KEIL MCB BOARD:         TARGET_IFLASH
- * For LPC4350 HITEX EVALUATION BOARD: TARGET_SPIFI
- */
-#undef TARGET_SPIFI     /* SPIFI Flash */
-#undef TARGET_IFLASH    /* Internal Flash */
-#undef TARGET_XFLASH    /* External NOR Flash */
-
-/* Priority of various tasks in dual-core examples */
-/* LWIP thread priority should always be greater than the
- * MAC priority ie., greater than TASK_PRIO_ETHERNET
- */
-#ifdef OS_FREE_RTOS
-/* higher the number higher the priority */
-#define TASK_PRIO_LCD             (tskIDLE_PRIORITY + 0UL)
-#define TASK_PRIO_TOUCHSCREEN     (tskIDLE_PRIORITY + 1UL)
-#define TASK_PRIO_BLINKY_EVENT    (tskIDLE_PRIORITY + 1UL)
-#define TASK_PRIO_ETHERNET        (tskIDLE_PRIORITY + 2UL)
-#define TASK_PRIO_IPC_DISPATCH    (tskIDLE_PRIORITY + 3UL)
-#define TASK_PRIO_USBDEVICE       (tskIDLE_PRIORITY + 4UL)
-#define TASK_PRIO_LWIP_THREAD     (tskIDLE_PRIORITY + 5UL)
-
-#elif defined(OS_UCOS_III)
-/* lower the number higher the priority */
-#define TASK_PRIO_BLINKY_EVENT    14
-#define TASK_PRIO_LCD             14
-#define TASK_PRIO_TOUCHSCREEN     13
-#define TASK_PRIO_ETHERNET        13
-#define TASK_PRIO_IPC_DISPATCH    12
-#define TASK_PRIO_USBDEVICE       11
-#define TASK_PRIO_LWIP_THREAD     10
-#endif
-
-/* Priority of various IRQs used in dual-core examples */
-/* lower the number higher the priority */
-#define IRQ_PRIO_IPC              7
-#define IRQ_PRIO_ETHERNET         6
-#define IRQ_PRIO_USBDEV           5
-
-/* Minimum stack size for UCOS-III Tasks */
-#define UCOS_MIN_STACK_SZ         128
-
-/*
- * Offset of M0 image from the starting of M4 image
- * Usually the size allocated for M0 image in scatter
- * file/ Linker Definition file / Memory configuration
- * in the IDE.
- * ####Don't change this value unless you are sure about what you are doing ####
- */
-#define M0_IMAGE_OFFSET      0x40000
-
-/*
- * Absolute addresses used by both cores.
- * ####Don't change these values unless you are sure about what you are doing ####
- */
-#define SHARED_MEM_M0          0x20000000
-#define SHARED_MEM_M4          0x20000020
-
-/* Size & location of RAM DISK used by FAT Filesystem */
-#define RAMDISK_LOCATION    0x20002000
-#define RAMDISK_SIZE        0x2000
-
-#ifdef CORE_M4
-/* Delay and LED to be blinked by M4 Core */
-#define BLINKY_DEFAULT_DELAY         1000
-#define BLINK_LED                    1
-#endif /* CORE_M4 */
-
-#ifdef CORE_M0
-/* Delay and LED to be blinked by M4 Core */
-#define BLINK_LED                    0
-#define BLINKY_DEFAULT_DELAY         500
-#endif /* CORE_M0 */
-
-/* Base address of various flashes */
-#define SPIFI_BASE_ADDR      0x14000000
-#define XFLASH_BASE_ADDR     0x1C000000
-#define IFLASH_BASE_ADDR     0x1A000000
-
-/* Include Common header here */
-#include "dualcore_common.h"
-
-#endif /* ifndef __LPC43XX_DUALCORE_CONFIG_H_ */