sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Trivial changes from review of last PR.

Browse Source
This commit is contained in:
Gregory Nutt 2017-09-14 14:55:50 -06:00
parent e4f089ea79
commit 0f04816b37
3 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configs/stm32f4discovery/src/stm32_bringup.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* config/stm32f4discovery/src/stm32_bringup.c * config/stm32f4discovery/src/stm32_bringup.c
* *
* Copyright (C) 2012, 2014-2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2014-2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -77,10 +77,6 @@
# include "stm32_rtc.h" # include "stm32_rtc.h"
#endif #endif
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@ -266,10 +262,18 @@ int stm32_bringup(void)
#ifdef CONFIG_SENSORS_MAX31855 #ifdef CONFIG_SENSORS_MAX31855
ret = stm32_max31855initialize("/dev/temp0"); ret = stm32_max31855initialize("/dev/temp0");
if (ret < 0)
{
serr("ERROR: stm32_max31855initialize failed: %d\n", ret);
}
#endif #endif
#ifdef CONFIG_SENSORS_MAX6675 #ifdef CONFIG_SENSORS_MAX6675
ret = stm32_max6675initialize("/dev/temp0"); ret = stm32_max6675initialize("/dev/temp0");
if (ret < 0)
{
serr("ERROR: stm32_max6675initialize failed: %d\n", ret);
}
#endif #endif
#ifdef CONFIG_FS_PROCFS #ifdef CONFIG_FS_PROCFS
@ -285,9 +289,12 @@ int stm32_bringup(void)
#ifdef CONFIG_SENSORS_XEN1210 #ifdef CONFIG_SENSORS_XEN1210
ret = xen1210_archinitialize(0); ret = xen1210_archinitialize(0);
if (ret < 0)
{
serr("ERROR: xen1210_archinitialize failed: %d\n", ret);
}
#endif #endif
#ifdef CONFIG_STM32F4DISCO_LIS3DSH #ifdef CONFIG_STM32F4DISCO_LIS3DSH
/* Create a lis3dsh driver instance fitting the chip built into stm32f4discovery */ /* Create a lis3dsh driver instance fitting the chip built into stm32f4discovery */
@ -298,6 +305,5 @@ int stm32_bringup(void)
} }
#endif #endif
return ret; return ret;
} }

7
drivers/sensors/lis3dsh.c
View File

@ -310,7 +310,12 @@ static int lis3dsh_interrupt_handler(int irq, FAR void *context)
/* Find out which device caused the interrupt */ /* Find out which device caused the interrupt */
for (priv = g_lis3dsh_list; priv && priv->config->irq != irq; priv = priv->flink); for (priv = g_lis3dsh_list;
priv && priv->config->irq != irq;
priv = priv->flink);
{
}
DEBUGASSERT(priv != NULL); DEBUGASSERT(priv != NULL);
/* Task the worker with retrieving the latest sensor data. We should not do /* Task the worker with retrieving the latest sensor data. We should not do