Spark configuration updated by David Sidrane

This commit is contained in:
Gregory Nutt
2013-10-30 10:29:51 -06:00
parent d9f16bba82
commit 8c5fc5fa88
4 changed files with 42 additions and 32 deletions
+5 -2
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;
+23 -15
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
*