mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 08:36:24 +08:00
Make sure that there is one space after for
This commit is contained in:
@@ -195,7 +195,7 @@ void open1788_sdram_initialize(void)
|
|||||||
|
|
||||||
/* Wait 128 AHB clock cycles */
|
/* Wait 128 AHB clock cycles */
|
||||||
|
|
||||||
for(i = 0; i < 128; i++);
|
for (i = 0; i < 128; i++);
|
||||||
|
|
||||||
/* 64ms/8192 = 7.8125us, nx16x8.33ns < 7.8125us, n < 58.6*/
|
/* 64ms/8192 = 7.8125us, nx16x8.33ns < 7.8125us, n < 58.6*/
|
||||||
|
|
||||||
|
|||||||
@@ -665,7 +665,7 @@ int main(int argc, char **argv, char **envp)
|
|||||||
|
|
||||||
/* Loopo until control-C */
|
/* Loopo until control-C */
|
||||||
|
|
||||||
for(;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
/* Read characters from the console, and echo them to the target tty */
|
/* Read characters from the console, and echo them to the target tty */
|
||||||
|
|
||||||
|
|||||||
@@ -104,5 +104,5 @@ void board_power_off(void)
|
|||||||
|
|
||||||
// trigger shutdown with pull-up resistor (not push-pull!) and wait.
|
// trigger shutdown with pull-up resistor (not push-pull!) and wait.
|
||||||
stm32_gpiowrite(GPIO_PCLR, true);
|
stm32_gpiowrite(GPIO_PCLR, true);
|
||||||
for(;;);
|
for (;;);
|
||||||
}
|
}
|
||||||
|
|||||||
+17
-45
@@ -190,38 +190,33 @@ struct vsn_sif_s {
|
|||||||
sem_t exclusive_access;
|
sem_t exclusive_access;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Private data
|
* Private data
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
struct vsn_sif_s vsn_sif;
|
struct vsn_sif_s vsn_sif;
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Semaphores
|
* Semaphores
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void sif_sem_wait(void)
|
void sif_sem_wait(void)
|
||||||
{
|
{
|
||||||
while (sem_wait( &vsn_sif.exclusive_access ) != 0)
|
while (sem_wait(&vsn_sif.exclusive_access) != 0)
|
||||||
{
|
{
|
||||||
ASSERT(errno == EINTR);
|
ASSERT(errno == EINTR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void inline sif_sem_post(void)
|
void inline sif_sem_post(void)
|
||||||
{
|
{
|
||||||
sem_post( &vsn_sif.exclusive_access );
|
sem_post(&vsn_sif.exclusive_access);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* GPIOs and Alternative Functions
|
* GPIOs and Alternative Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
void sif_gpios_reset(void)
|
void sif_gpios_reset(void)
|
||||||
{
|
{
|
||||||
vsn_sif.gpio[0] = vsn_sif.gpio[1] = VSN_SIF_GPIO_HIGHZ;
|
vsn_sif.gpio[0] = vsn_sif.gpio[1] = VSN_SIF_GPIO_HIGHZ;
|
||||||
@@ -230,7 +225,6 @@ void sif_gpios_reset(void)
|
|||||||
stm32_configgpio(GPIO_GP2_HIZ);
|
stm32_configgpio(GPIO_GP2_HIZ);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void sif_gpio1_update(void)
|
void sif_gpio1_update(void)
|
||||||
{
|
{
|
||||||
uint32_t val;
|
uint32_t val;
|
||||||
@@ -246,12 +240,11 @@ void sif_gpio1_update(void)
|
|||||||
if (stm32_configgpio(val) == ERROR)
|
if (stm32_configgpio(val) == ERROR)
|
||||||
printf("Error updating1\n");
|
printf("Error updating1\n");
|
||||||
|
|
||||||
if ( stm32_gpioread(val) )
|
if (stm32_gpioread(val))
|
||||||
vsn_sif.gpio[0] |= VSN_SIF_GPIO_READ_MASK;
|
vsn_sif.gpio[0] |= VSN_SIF_GPIO_READ_MASK;
|
||||||
else vsn_sif.gpio[0] &= ~VSN_SIF_GPIO_READ_MASK;
|
else vsn_sif.gpio[0] &= ~VSN_SIF_GPIO_READ_MASK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void sif_gpio2_update(void)
|
void sif_gpio2_update(void)
|
||||||
{
|
{
|
||||||
uint32_t val;
|
uint32_t val;
|
||||||
@@ -267,12 +260,11 @@ void sif_gpio2_update(void)
|
|||||||
if (stm32_configgpio(val) == ERROR)
|
if (stm32_configgpio(val) == ERROR)
|
||||||
printf("Error updating2\n");
|
printf("Error updating2\n");
|
||||||
|
|
||||||
if ( stm32_gpioread(val) )
|
if (stm32_gpioread(val))
|
||||||
vsn_sif.gpio[1] |= VSN_SIF_GPIO_READ_MASK;
|
vsn_sif.gpio[1] |= VSN_SIF_GPIO_READ_MASK;
|
||||||
else vsn_sif.gpio[1] &= ~VSN_SIF_GPIO_READ_MASK;
|
else vsn_sif.gpio[1] &= ~VSN_SIF_GPIO_READ_MASK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int sif_gpios_lock(vsn_sif_state_t peripheral)
|
int sif_gpios_lock(vsn_sif_state_t peripheral)
|
||||||
{
|
{
|
||||||
return ERROR;
|
return ERROR;
|
||||||
@@ -284,16 +276,12 @@ int sif_gpios_unlock(vsn_sif_state_t peripheral)
|
|||||||
return ERROR;
|
return ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Analog Outputs
|
* Analog Outputs
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
static volatile int test = 0, teirq;
|
static volatile int test = 0, teirq;
|
||||||
|
|
||||||
|
|
||||||
static int sif_anout_isr(int irq, void *context)
|
static int sif_anout_isr(int irq, void *context)
|
||||||
{
|
{
|
||||||
STM32_TIM_ACKINT(vsn_sif.tim8, 0);
|
STM32_TIM_ACKINT(vsn_sif.tim8, 0);
|
||||||
@@ -304,7 +292,6 @@ static int sif_anout_isr(int irq, void *context)
|
|||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int sif_anout_init(void)
|
int sif_anout_init(void)
|
||||||
{
|
{
|
||||||
vsn_sif.tim3 = stm32_tim_init(3);
|
vsn_sif.tim3 = stm32_tim_init(3);
|
||||||
@@ -346,23 +333,19 @@ void sif_anout_update(void)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void sif_anout_callback(void)
|
void sif_anout_callback(void)
|
||||||
{
|
{
|
||||||
// called at rate of PWM interrupt
|
// called at rate of PWM interrupt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Analog Input Reference Tap
|
* Analog Input Reference Tap
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
void sif_anref_init(void)
|
void sif_anref_init(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Analog Input Sampler Unit
|
* Analog Input Sampler Unit
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@@ -434,13 +417,11 @@ int sif_anin_setgain(int gain)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
int sif_anin_reset(void)
|
int sif_anin_reset(void)
|
||||||
{
|
{
|
||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Device driver functions
|
* Device driver functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@@ -456,7 +437,6 @@ int devsif_open(FAR struct file *filep)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int devsif_close(FAR struct file *filep)
|
int devsif_close(FAR struct file *filep)
|
||||||
{
|
{
|
||||||
sif_sem_wait();
|
sif_sem_wait();
|
||||||
@@ -475,7 +455,6 @@ int devsif_close(FAR struct file *filep)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static ssize_t devsif_read(FAR struct file *filep, FAR char *buffer, size_t len)
|
static ssize_t devsif_read(FAR struct file *filep, FAR char *buffer, size_t len)
|
||||||
{
|
{
|
||||||
sif_sem_wait();
|
sif_sem_wait();
|
||||||
@@ -484,16 +463,14 @@ static ssize_t devsif_read(FAR struct file *filep, FAR char *buffer, size_t len)
|
|||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static ssize_t devsif_write(FAR struct file *filep, FAR const char *buffer, size_t len)
|
static ssize_t devsif_write(FAR struct file *filep, FAR const char *buffer, size_t len)
|
||||||
{
|
{
|
||||||
sif_sem_wait();
|
sif_sem_wait();
|
||||||
printf("getpid: %d\n", getpid() );
|
printf("getpid: %d\n", getpid());
|
||||||
sif_sem_post();
|
sif_sem_post();
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifndef CONFIG_DISABLE_POLL
|
#ifndef CONFIG_DISABLE_POLL
|
||||||
static int devsif_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
static int devsif_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
||||||
bool setup)
|
bool setup)
|
||||||
@@ -509,7 +486,6 @@ static int devsif_poll(FAR struct file *filep, FAR struct pollfd *fds,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
int devsif_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
int devsif_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
sif_sem_wait();
|
sif_sem_wait();
|
||||||
@@ -517,12 +493,10 @@ int devsif_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
static const struct file_operations devsif_fops = {
|
static const struct file_operations devsif_fops = {
|
||||||
devsif_open, /* open */
|
devsif_open, /* open */
|
||||||
devsif_close, /* close */
|
devsif_close, /* close */
|
||||||
@@ -535,7 +509,6 @@ static const struct file_operations devsif_fops = {
|
|||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/** Bring up the Sensor Interface by initializing all of the desired
|
/** Bring up the Sensor Interface by initializing all of the desired
|
||||||
* hardware components.
|
* hardware components.
|
||||||
**/
|
**/
|
||||||
@@ -551,8 +524,8 @@ int sif_init(void)
|
|||||||
/* Initialize hardware */
|
/* Initialize hardware */
|
||||||
|
|
||||||
sif_gpios_reset();
|
sif_gpios_reset();
|
||||||
if ( sif_anout_init() != OK ) return -1;
|
if (sif_anout_init() != OK) return -1;
|
||||||
if ( sif_anin_reset() != OK ) return -1;
|
if (sif_anin_reset() != OK) return -1;
|
||||||
|
|
||||||
/* If everything is okay, register the driver */
|
/* If everything is okay, register the driver */
|
||||||
|
|
||||||
@@ -560,7 +533,6 @@ int sif_init(void)
|
|||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/** SIF Utility
|
/** SIF Utility
|
||||||
*
|
*
|
||||||
* Provides direct access to the sensor connector, readings, and diagnostic.
|
* Provides direct access to the sensor connector, readings, and diagnostic.
|
||||||
@@ -579,7 +551,7 @@ int sif_main(int argc, char *argv[])
|
|||||||
vsn_sif.gpio[1] = atoi(argv[3]);
|
vsn_sif.gpio[1] = atoi(argv[3]);
|
||||||
sif_gpio1_update();
|
sif_gpio1_update();
|
||||||
sif_gpio2_update();
|
sif_gpio2_update();
|
||||||
printf("GPIO States: %2x %2x\n", vsn_sif.gpio[0], vsn_sif.gpio[1] );
|
printf("GPIO States: %2x %2x\n", vsn_sif.gpio[0], vsn_sif.gpio[1]);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
else if (!strcmp(argv[1], "pwr") && argc == 3) {
|
else if (!strcmp(argv[1], "pwr") && argc == 3) {
|
||||||
@@ -593,7 +565,7 @@ int sif_main(int argc, char *argv[])
|
|||||||
t_set.tv_sec = atoi(argv[2]);
|
t_set.tv_sec = atoi(argv[2]);
|
||||||
clock_settime(CLOCK_REALTIME, &t_set);
|
clock_settime(CLOCK_REALTIME, &t_set);
|
||||||
}
|
}
|
||||||
else if (!strcmp(argv[1], "free") ) {
|
else if (!strcmp(argv[1], "free")) {
|
||||||
uint16_t page = 0, stpage = 0xFFFF;
|
uint16_t page = 0, stpage = 0xFFFF;
|
||||||
int status;
|
int status;
|
||||||
do {
|
do {
|
||||||
@@ -613,17 +585,17 @@ int sif_main(int argc, char *argv[])
|
|||||||
while (status >= 0);
|
while (status >= 0);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
else if (!strcmp(argv[1], "erase") && argc == 3 ) {
|
else if (!strcmp(argv[1], "erase") && argc == 3) {
|
||||||
int page = atoi(argv[2]);
|
int page = atoi(argv[2]);
|
||||||
printf("Erase result: %d\n", up_progmem_erasepage(page) );
|
printf("Erase result: %d\n", up_progmem_erasepage(page));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
else if (!strcmp(argv[1], "flash") && argc == 3 ) {
|
else if (!strcmp(argv[1], "flash") && argc == 3) {
|
||||||
uint16_t page = atoi(argv[2]);
|
uint16_t page = atoi(argv[2]);
|
||||||
uint32_t addr = page * up_progmem_pagesize(page);
|
uint32_t addr = page * up_progmem_pagesize(page);
|
||||||
|
|
||||||
printf("Write result: %d (writing to address %xh)\n",
|
printf("Write result: %d (writing to address %xh)\n",
|
||||||
up_progmem_write( addr, "Test", 4 ), addr);
|
up_progmem_write(addr, "Test", 4), addr);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
else if (!strcmp(argv[1], "i2c") && argc == 3) {
|
else if (!strcmp(argv[1], "i2c") && argc == 3) {
|
||||||
@@ -644,8 +616,8 @@ int sif_main(int argc, char *argv[])
|
|||||||
|
|
||||||
/* Sample some values */
|
/* Sample some values */
|
||||||
|
|
||||||
for (i=0; i<1000; ) {
|
for (i=0; i<1000;) {
|
||||||
if ( (a = lis331dl_getreadings(lis)) ) {
|
if ((a = lis331dl_getreadings(lis))) {
|
||||||
i++;
|
i++;
|
||||||
printf("%d %d %d\n", a->x, a->y, a->z);
|
printf("%d %d %d\n", a->x, a->y, a->z);
|
||||||
}
|
}
|
||||||
@@ -717,6 +689,6 @@ int sif_main(int argc, char *argv[])
|
|||||||
|
|
||||||
fprintf(stderr, "rtc time = %u, active = %u / %u, time / systick = %u / %u\n",
|
fprintf(stderr, "rtc time = %u, active = %u / %u, time / systick = %u / %u\n",
|
||||||
up_rtc_time(), t_active.tv_sec, t_active.tv_nsec,
|
up_rtc_time(), t_active.tv_sec, t_active.tv_nsec,
|
||||||
time(NULL), clock_systimer() );
|
time(NULL), clock_systimer());
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user