fix configure file

fix test_fifo.c

2 files changed, 11 insertions, 48 deletions

diff --git a/tests/lpc18xx_43xx/test/test_fifo.c b/tests/lpc18xx_43xx/test/test_fifo.c
index f9ae2c59f..2729644ff 100644
--- a/tests/lpc18xx_43xx/test/test_fifo.c
+++ b/tests/lpc18xx_43xx/test/test_fifo.c
@@ -40,23 +40,15 @@
 #include "fifo.h"
 
 #define FIFO_SIZE 10
-static fifo_t ff;
-static uint8_t buffer[FIFO_SIZE];
+FIFO_DEF(ff, FIFO_SIZE, uint8_t, false);
 
 void setUp(void)
 {
-  fifo_init(&ff, buffer, FIFO_SIZE, 0);
+  fifo_clear(&ff);
 }
 
 void tearDown(void)
 {
-  memset(&ff, 0, sizeof(fifo_t));
-}
-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) );
-  TEST_ASSERT_TRUE( fifo_init(&ff, buffer, 1, 0) );
 }
 
 void test_normal(void)
@@ -65,7 +57,7 @@ void test_normal(void)
 
   for(i=0; i < FIFO_SIZE; i++)
   {
-    fifo_write(&ff, i);
+    fifo_write(&ff, &i);
   }
 
   for(i=0; i < FIFO_SIZE; i++)
@@ -78,8 +70,9 @@ void test_normal(void)
 
 void test_is_empty(void)
 {
+  uint8_t temp;
   TEST_ASSERT_TRUE(fifo_is_empty(&ff));
-  fifo_write(&ff, 1);
+  fifo_write(&ff, &temp);
   TEST_ASSERT_FALSE(fifo_is_empty(&ff));
 }
 
@@ -91,7 +84,7 @@ void test_is_full(void)
 
   for(i=0; i < FIFO_SIZE; i++)
   {
-    fifo_write(&ff, i);
+    fifo_write(&ff, &i);
   }
 
   TEST_ASSERT_TRUE(fifo_is_full(&ff));
diff --git a/tests/support/tusb_config.h b/tests/support/tusb_config.h
index ba001eb58..14d049e9f 100644
--- a/tests/support/tusb_config.h
+++ b/tests/support/tusb_config.h
@@ -36,19 +36,6 @@
 */

 /**************************************************************************/

 

-/** \file

- *  \brief TBD

- *

- *  \note TBD

- */

-

-/** \ingroup TBD

- *  \defgroup TBD

- *  \brief TBD

- *

- *  @{

- */

-

 #ifndef _TUSB_TUSB_CONFIG_H_

 #define _TUSB_TUSB_CONFIG_H_

 

@@ -65,11 +52,7 @@
 //--------------------------------------------------------------------+

 // HOST CONFIGURATION

 //--------------------------------------------------------------------+

-//------------- CORE -------------//

-#define TUSB_CFG_HOST_DEVICE_MAX                 2

-#define TUSB_CFG_CONFIGURATION_MAX               1

-

-#define TUSB_CFG_HOST_ENUM_BUFFER_SIZE           255

+#define TUSB_CFG_HOST_DEVICE_MAX                5 // TODO be a part of HUB config

 

 //------------- CLASS -------------//

 #define TUSB_CFG_HOST_HUB                        1

@@ -79,10 +62,6 @@
 #define TUSB_CFG_HOST_CDC                        1

 #define TUSB_CFG_HOST_CDC_RNDIS                  1

 

-#define HOST_HCD_XFER_INTERRUPT

-#define HOST_HCD_XFER_BULK

-//#define HOST_HCD_XFER_ISOCHRONOUS

-

 // Test support

 #define TEST_CONTROLLER_HOST_START_INDEX \

  ( ((CONTROLLER_HOST_NUMBER == 1) && (TUSB_CFG_CONTROLLER_1_MODE & TUSB_MODE_HOST)) ? 1 : 0)

@@ -90,23 +69,14 @@
 //--------------------------------------------------------------------+

 // DEVICE CONFIGURATION

 //--------------------------------------------------------------------+

-#define TUSB_CFG_DEVICE_USE_ROM_DRIVER  1

-

-//------------- descriptors -------------//

-#define TUSB_CFG_DEVICE_STRING_MANUFACTURER   "tinyusb.org"

-#define TUSB_CFG_DEVICE_STRING_PRODUCT        "Device Example"

-#define TUSB_CFG_DEVICE_STRING_SERIAL         "1234"

-#define TUSB_CFG_DEVICE_VENDORID              0x1FC9 // NXP

-//#define TUSB_CFG_DEVICE_PRODUCTID           0x4567

-

-#define TUSB_CFG_DEVICE_CONTROL_PACKET_SIZE   64

+#define TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE   64

 

 //------------- CLASS -------------//

 #define TUSB_CFG_DEVICE_HID_KEYBOARD  1

 #define TUSB_CFG_DEVICE_HID_MOUSE     1

 #define TUSB_CFG_DEVICE_HID_GENERIC   0

-#define TUSB_CFG_DEVICE_MSC           0

-#define TUSB_CFG_DEVICE_CDC           0

+#define TUSB_CFG_DEVICE_MSC           1

+#define TUSB_CFG_DEVICE_CDC           1

 

 

 //--------------------------------------------------------------------+

@@ -116,7 +86,7 @@
 #define TUSB_CFG_DEBUG 3

 

 #define TUSB_CFG_OS TUSB_OS_NONE

-#define TUSB_CFG_OS_TICKS_PER_SECOND 1000 // 1 ms tick

+#define TUSB_CFG_TICKS_HZ 1000 // 1 ms tick

 #define TUSB_CFG_ATTR_USBRAM

 

 #ifdef __cplusplus