Spark configuration updated by David Sidrane

This commit is contained in:
Gregory Nutt 2013-10-30 10:29:51 -06:00
parent 717ef07b8c
commit 0d766ccd68
3 changed files with 38 additions and 32 deletions

View File

@ -202,7 +202,7 @@ CONFIG_STM32_MEDIUMDENSITY=y
# CONFIG_STM32_CAN1 is not set
CONFIG_STM32_CRC=y
CONFIG_STM32_DMA1=y
CONFIG_STM32_DMA2=y
# CONFIG_STM32_DMA2 is not set
# CONFIG_STM32_DAC1 is not set
# CONFIG_STM32_DAC2 is not set
# CONFIG_STM32_I2C1 is not set
@ -287,7 +287,7 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
CONFIG_BOARD_LOOPSPERMSEC=5483
# CONFIG_ARCH_CALIBRATION is not set
CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
CONFIG_ARCH_INTERRUPTSTACK=0
CONFIG_ARCH_INTERRUPTSTACK=156
#
# Boot options
@ -374,19 +374,19 @@ CONFIG_NPTHREAD_KEYS=0
CONFIG_NFILE_DESCRIPTORS=5
CONFIG_NFILE_STREAMS=5
CONFIG_NAME_MAX=8
CONFIG_PREALLOC_MQ_MSGS=2
CONFIG_PREALLOC_MQ_MSGS=1
CONFIG_MQ_MAXMSGSIZE=132
CONFIG_MAX_WDOGPARMS=2
CONFIG_PREALLOC_WDOGS=4
CONFIG_PREALLOC_TIMERS=4
CONFIG_PREALLOC_WDOGS=2
CONFIG_PREALLOC_TIMERS=2
#
# Stack and heap information
#
CONFIG_IDLETHREAD_STACKSIZE=512
CONFIG_USERMAIN_STACKSIZE=1008
CONFIG_IDLETHREAD_STACKSIZE=128
CONFIG_USERMAIN_STACKSIZE=880
CONFIG_PTHREAD_STACK_MIN=256
CONFIG_PTHREAD_STACK_DEFAULT=600
CONFIG_PTHREAD_STACK_DEFAULT=464
#
# Device Drivers
@ -465,8 +465,8 @@ CONFIG_USART2_SERIAL_CONSOLE=y
#
# USART2 Configuration
#
CONFIG_USART2_RXBUFSIZE=64
CONFIG_USART2_TXBUFSIZE=64
CONFIG_USART2_RXBUFSIZE=32
CONFIG_USART2_TXBUFSIZE=32
CONFIG_USART2_BAUD=115200
CONFIG_USART2_BITS=8
CONFIG_USART2_PARITY=0
@ -660,11 +660,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=0
# Non-standard Library Support
#
# CONFIG_SCHED_WORKQUEUE is not set
# CONFIG_SCHED_HPWORK is not set
# CONFIG_SCHED_WORKPRIORITY is not set
# CONFIG_SCHED_WORKPERIOD is not set
# CONFIG_SCHED_WORKSTACKSIZE is not set
# CONFIG_SCHED_LPWORK is not set
# CONFIG_LIB_KBDCODEC is not set
# CONFIG_LIB_SLCDCODEC is not set

View File

@ -189,8 +189,6 @@ int nsh_archinitialize(void)
}
#ifndef CONFIG_SPARK_FLASH_PART
char partname[16];
char mntpoint[16];
/* Use the FTL layer to wrap the MTD driver as a block driver */
@ -201,6 +199,10 @@ int nsh_archinitialize(void)
return ret;
}
#if CONFIG_SPARK_MOUNT_FLASH
char partname[16];
char mntpoint[16];
/* mount -t vfat /dev/mtdblock0 /mnt/p0 */
snprintf(partname, sizeof(partname), "/dev/mtdblock%d",
@ -217,6 +219,7 @@ int nsh_archinitialize(void)
return ret;
}
#endif
#else
{
int partno;

View File

@ -120,7 +120,9 @@ static void wl_clear_irq(FAR struct cc3000_config_s *state);
static void wl_select(FAR struct cc3000_config_s *state, bool enable);
static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable);
static bool wl_read_irq(FAR struct cc3000_config_s *state);
#ifdef CONFIG_CC3000_PROBES
static bool probe(FAR struct cc3000_config_s *state,int n, bool s);
#endif
/****************************************************************************
* Private Data
@ -147,7 +149,9 @@ static struct stm32_config_s g_cc3000_info =
.dev.power_enable = wl_enable_power,
.dev.chip_chip_select = wl_select,
.dev.irq_read = wl_read_irq,
#ifdef CONFIG_CC3000_PROBES
.dev.probe = probe, /* This is used for debugging */
#endif
.handler = NULL,
};
@ -230,6 +234,23 @@ static bool wl_read_irq(FAR struct cc3000_config_s *state)
return stm32_gpioread(GPIO_WIFI_INT) ? false : true;
}
#ifdef CONFIG_CC3000_PROBES
static bool probe(FAR struct cc3000_config_s *state,int n, bool s)
{
if (n == 0)
{
stm32_gpiowrite(GPIO_D0, s);
}
if (n == 1)
{
stm32_gpiowrite(GPIO_D1, s);
}
return true;
}
#endif
/****************************************************************************
* Public Functions
****************************************************************************/
@ -259,10 +280,12 @@ int wireless_archinitialize(void)
idbg("minor %d\n", minor);
DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0);
#ifdef CONFIG_CC3000_PROBES
stm32_configgpio(GPIO_D0);
stm32_configgpio(GPIO_D1);
stm32_gpiowrite(GPIO_D0, 1);
stm32_gpiowrite(GPIO_D1, 1);
#endif
/* Get an instance of the SPI interface */
@ -285,21 +308,6 @@ int wireless_archinitialize(void)
return OK;
}
static bool probe(FAR struct cc3000_config_s *state,int n, bool s)
{
if (n == 0)
{
stm32_gpiowrite(GPIO_D0, s);
}
if (n == 1)
{
stm32_gpiowrite(GPIO_D1, s);
}
return true;
}
/*****************************************************************************
* Name: C3000_wlan_init
*