Updated Spark board configuration from David Sidrane

3 files changed, 26 insertions, 48 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 1aeb41e3f..879d1ac70 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5882,4 +5882,6 @@
 	* include/nuttx/fs/ioctl.h and arch/arm/src/sama5/sam_adc.c:  Add
 	  and ioctl command that can be used to trigger ADC/DAC conversion
 	  (2015-10-25).
+	* configs/spark:  Spark configuration updated by David Sidrane
+	  (2013-10-25).
 
diff --git a/nuttx/configs/spark/nsh/defconfig b/nuttx/configs/spark/nsh/defconfig
index 709aed20d..19b7458f1 100644
--- a/nuttx/configs/spark/nsh/defconfig
+++ b/nuttx/configs/spark/nsh/defconfig
@@ -339,7 +339,7 @@ CONFIG_BOARD_INITIALIZE=y
 CONFIG_MSEC_PER_TICK=10
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
+CONFIG_TASK_NAME_SIZE=8
 # CONFIG_SCHED_HAVE_PARENT is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2009
@@ -385,9 +385,9 @@ CONFIG_PREALLOC_TIMERS=4
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=512
-CONFIG_USERMAIN_STACKSIZE=600
+CONFIG_USERMAIN_STACKSIZE=680
 CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=512
+CONFIG_PTHREAD_STACK_DEFAULT=640
 
 #
 # Device Drivers
@@ -466,8 +466,8 @@ CONFIG_USART2_SERIAL_CONSOLE=y
 #
 # USART2 Configuration
 #
-CONFIG_USART2_RXBUFSIZE=256
-CONFIG_USART2_TXBUFSIZE=256
+CONFIG_USART2_RXBUFSIZE=64
+CONFIG_USART2_TXBUFSIZE=128
 CONFIG_USART2_BAUD=115200
 CONFIG_USART2_BITS=8
 CONFIG_USART2_PARITY=0
diff --git a/nuttx/configs/spark/src/up_wireless.c b/nuttx/configs/spark/src/up_wireless.c
index 08e1a8c82..ea2bcfabe 100644
--- a/nuttx/configs/spark/src/up_wireless.c
+++ b/nuttx/configs/spark/src/up_wireless.c
@@ -106,12 +106,12 @@ struct stm32_config_s
  * indicating that the CC3000 core module is ready to accept data. T2
  * duration is approximately 7 ms.
  *
- *   irq_attach   - Attach the CC3000 interrupt handler to the GPIO interrupt
- *   irq_enable   - Enable or disable the GPIO interrupt
- *   clear_irq    - Acknowledge/clear any pending GPIO interrupt
- *   power_enable - Enable or disable Module enable.
- *   chip_select  - The Chip Select
- *   busy         - Return the state of the interrupt GPIO input
+ *   irq_attach         - Attach the CC3000 interrupt handler to the GPIO interrupt
+ *   irq_enable         - Enable or disable the GPIO interrupt
+ *   clear_irq          - Acknowledge/clear any pending GPIO interrupt
+ *   power_enable       - Enable or disable Module enable.
+ *   chip_chip_select   - The Chip Select
+ *   wl_read_irq        - Return the state of the interrupt GPIO input
  */
 
 static int  wl_attach_irq(FAR struct cc3000_config_s *state, xcpt_t handler);
@@ -138,17 +138,17 @@ static bool probe(FAR struct cc3000_config_s *state,int n, bool s);
 
 static struct stm32_config_s g_cc3000_info =
 {
-  .dev.spi_frequency = CONFIG_CC3000_SPI_FREQUENCY,
-  .dev.spi_mode      = CONFIG_CC3000_SPI_MODE,
-
-  .dev.irq_attach    = wl_attach_irq,
-  .dev.irq_enable    = wl_enable_irq,
-  .dev.irq_clear     = wl_clear_irq,
-  .dev.power_enable  = wl_enable_power,
-  .dev.chip_select   = wl_select,
-  .dev.irq_read      = wl_read_irq,
-  .dev.probe          = probe, /* This is used for debugging */
-  .handler           = NULL,
+  .dev.spi_frequency    = CONFIG_CC3000_SPI_FREQUENCY,
+  .dev.spi_mode         = CONFIG_CC3000_SPI_MODE,
+
+  .dev.irq_attach       = wl_attach_irq,
+  .dev.irq_enable       = wl_enable_irq,
+  .dev.irq_clear        = wl_clear_irq,
+  .dev.power_enable     = wl_enable_power,
+  .dev.chip_chip_select = wl_select,
+  .dev.irq_read         = wl_read_irq,
+  .dev.probe            = probe, /* This is used for debugging */
+  .handler              = NULL,
 };
 
 /****************************************************************************
@@ -230,25 +230,6 @@ static bool wl_read_irq(FAR struct cc3000_config_s *state)
   return  stm32_gpioread(GPIO_WIFI_INT) ? false : true;
 }
 
-static long read_IRQ(void)
-{
-  static long state = 0; /* Start as a 0 */
-  state ^= 1;
-  return state;
-}
-
-void enable_nop(void)
-{
-}
-
-void disable_nop(void)
-{
-}
-
-void power_nop(unsigned char en)
-{
-}
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -358,15 +339,10 @@ static bool probe(FAR struct cc3000_config_s *state,int n, bool s)
  *
  ****************************************************************************/
 
-void CC3000_wlan_init(tWlanCB sWlanCB, tFWPatches sFWPatches, tDriverPatches
+void cc3000_wlan_init(tWlanCB sWlanCB, tFWPatches sFWPatches, tDriverPatches
                       sDriverPatches,  tBootLoaderPatches sBootLoaderPatches)
 {
-  wlan_init(sWlanCB,
-            sFWPatches, sDriverPatches, sBootLoaderPatches,
-            read_IRQ,
-            enable_nop,
-            disable_nop,
-            power_nop);
+  wlan_init(sWlanCB, sFWPatches, sDriverPatches, sBootLoaderPatches);
 }
 
 #endif /* CONFIG_WL_CC3000 */