This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new d612fd3 Squashed commit of the following:
d612fd3 is described below
commit d612fd3dc594c4a6759a156981794e8f82fa25b2
Author: Xiang Xiao <[email protected]>
AuthorDate: Fri Jan 3 11:34:44 2020 -0300
Squashed commit of the following:
Author: Alan Carvalho de Assis <[email protected]>
Run all .h and .c files modified in last PR through nxstyle.
Author: Xiang Xiao <[email protected]>
Fix stm32l4_otgfshost.c: error: 'ret' undeclared (#32)
result by commit 6a3c2aded683e8284e793eb3ee8793d2960ae000
Change-Id: I68ba79417d8da102da8d91c74496961aef242dd9
Signed-off-by: Xiang Xiao <[email protected]>
---
arch/arm/src/lc823450/lc823450_usbdev.c | 10 ++++-
arch/arm/src/sama5/sam_tsd.c | 7 ++--
arch/arm/src/stm32/stm32_adc.c | 63 ++++++++++++++++++++------------
arch/arm/src/stm32l4/stm32l4_otgfshost.c | 6 +++
drivers/input/ads7843e.c | 21 +++++------
drivers/usbhost/usbhost_hidmouse.c | 27 +++++++-------
6 files changed, 78 insertions(+), 56 deletions(-)
diff --git a/arch/arm/src/lc823450/lc823450_usbdev.c
b/arch/arm/src/lc823450/lc823450_usbdev.c
index ef26dab..4798ba3 100644
--- a/arch/arm/src/lc823450/lc823450_usbdev.c
+++ b/arch/arm/src/lc823450/lc823450_usbdev.c
@@ -917,6 +917,7 @@ int lc823450_usbpullup(struct usbdev_s *dev, bool enable)
{
modifyreg32(USB_DEVC, 0 , USB_DEVC_DISCON);
}
+
return 0;
}
@@ -956,6 +957,7 @@ static void usb_suspend_work_func(void *arg)
g_usbsuspend = 1;
wake_unlock(&priv->wlock);
}
+
spin_unlock_irqrestore(flags);
}
#endif
@@ -1151,7 +1153,6 @@ static void subintr_ep0(void)
case USB_REQ_RECIPIENT_INTERFACE:
resp[0] = 0; /* reserved */
break;
-
}
epbuf_write(0, &resp, 2);
@@ -1242,6 +1243,7 @@ static void subintr_ep0(void)
{
break;
}
+
up_udelay(10);
}
while (tout--);
@@ -1290,6 +1292,7 @@ static void subintr_epin(uint8_t epnum, struct
lc823450_ep_s *privep)
req = &container_of(q_ent, struct lc823450_req_s, q_ent)->req;
/* Write to TX FIFO */
+
/* int clear!! before epbuf write */
epcmd_write(epnum, USB_EPCMD_EMPTY_CLR);
@@ -1925,7 +1928,7 @@ int usbdev_msc_epread(void *buf, int len)
CONFIG_USBMSC_EPBULKOUT << USB_DMAC_DMAEP_SHIFT |
USB_DMAC_START,
USB_DMAC1);
- nxsem_wait(&dma_wait);
+ nxsem_wait(&dma_wait);
return 0;
}
@@ -1944,6 +1947,7 @@ void usbdev_msc_stop(void)
* return value : 0 : charger was not detected.
* !0 : charger was detected.
****************************************************************************/
+
int usbdev_is_usbcharger(void)
{
return g_usbdev.charger;
@@ -1971,11 +1975,13 @@ static void usbdev_pmnotify(struct pm_callback_s *cb,
enum pm_state_e pmstate)
{
CLASS_RESUME(g_usbdev.driver, &g_usbdev.usbdev);
}
+
break;
default:
break;
}
+
spin_unlock_irqrestore(flags);
}
#endif
diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c
index bd45d34..7d2952a 100644
--- a/arch/arm/src/sama5/sam_tsd.c
+++ b/arch/arm/src/sama5/sam_tsd.c
@@ -81,7 +81,9 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
+
/* Driver support ***********************************************************/
+
/* This format is used to construct the /dev/input[n] device driver path. It
* defined here so that it will be used consistently in all places.
*/
@@ -378,10 +380,6 @@ static int sam_tsd_waitsample(struct sam_tsd_s *priv,
struct sam_sample_s *sampl
if (ret < 0)
{
- /* If we are awakened by a signal, then we need to return
- * the failure now.
- */
-
ierr("ERROR: nxsem_wait: %d\n", ret);
goto errout;
}
@@ -752,6 +750,7 @@ static void sam_tsd_bottomhalf(void *arg)
/* Exit, re-enabling touchscreen interrupts */
ignored:
+
/* Re-enable touchscreen interrupts as appropriate. */
sam_adc_putreg(priv->adc, SAM_ADC_IER, ier);
diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index e792760..a903eec 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -140,6 +140,7 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
+
/* RCC reset ****************************************************************/
#if defined(HAVE_IP_ADC_V1)
@@ -198,6 +199,7 @@
#endif
/* ADC Channels/DMA ********************************************************/
+
/* The maximum number of channels that can be sampled. If DMA support is
* not enabled, then only a single channel can be sampled. Otherwise,
* data overruns would occur.
@@ -1169,7 +1171,7 @@ static uint32_t adccmn_getreg(FAR struct stm32_dev_s
*priv, uint32_t offset)
/* Return register value */
- return getreg32(base+offset);
+ return getreg32(base + offset);
}
# endif
#endif /* HAVE_ADC_CMN_REGS */
@@ -1457,7 +1459,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
/* Set the reload and prescaler values */
- tim_putreg(priv, STM32_GTIM_PSC_OFFSET, prescaler-1);
+ tim_putreg(priv, STM32_GTIM_PSC_OFFSET, prescaler - 1);
tim_putreg(priv, STM32_GTIM_ARR_OFFSET, reload);
/* Clear the advanced timers repetition counter in TIM1 */
@@ -1564,6 +1566,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
case 4: /* TimerX TRGO event */
{
/* TODO: TRGO support not yet implemented */
+
/* Set the event TRGO */
ccenable = 0;
@@ -1645,7 +1648,8 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
# if defined(HAVE_GTIM_CCXNP)
else
{
- ccer &= ~(GTIM_CCER_CC1NP | GTIM_CCER_CC2NP | GTIM_CCER_CC3NP |
GTIM_CCER_CC4NP);
+ ccer &= ~(GTIM_CCER_CC1NP | GTIM_CCER_CC2NP | GTIM_CCER_CC3NP |
+ GTIM_CCER_CC4NP);
}
# endif
@@ -1775,7 +1779,6 @@ static void adc_reg_startconv(FAR struct stm32_dev_s
*priv, bool enable)
}
#endif
-
#ifdef ADC_HAVE_INJECTED
/****************************************************************************
@@ -1854,7 +1857,7 @@ static void adc_inj_startconv(FAR struct stm32_dev_s
*priv, bool enable)
#ifdef HAVE_ADC_CMN_DATA
static int adccmn_lock(FAR struct stm32_dev_s *priv, bool lock)
{
- int ret = OK;
+ int ret;
if (lock)
{
@@ -1862,7 +1865,7 @@ static int adccmn_lock(FAR struct stm32_dev_s *priv, bool
lock)
}
else
{
- nxsem_post(&priv->cmn->lock);
+ ret = nxsem_post(&priv->cmn->lock);
}
return ret;
@@ -1902,6 +1905,7 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv,
bool reset)
adcbit = RCC_RSTR_ADC1RST;
break;
}
+
#endif
#ifdef CONFIG_STM32_ADC2
case 2:
@@ -1909,6 +1913,7 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv,
bool reset)
adcbit = RCC_RSTR_ADC2RST;
break;
}
+
#endif
#ifdef CONFIG_STM32_ADC3
case 3:
@@ -1916,6 +1921,7 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv,
bool reset)
adcbit = RCC_RSTR_ADC3RST;
break;
}
+
#endif
#ifdef CONFIG_STM32_ADC4
case 4:
@@ -1923,6 +1929,7 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv,
bool reset)
adcbit = RCC_RSTR_ADC4RST;
break;
}
+
#endif
default:
{
@@ -2003,6 +2010,7 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv,
bool reset)
adcbit = RCC_RSTR_ADC12RST;
break;
}
+
#endif
#if defined(CONFIG_STM32_ADC3) || defined(CONFIG_STM32_ADC4)
case 3:
@@ -2011,6 +2019,7 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv,
bool reset)
adcbit = RCC_RSTR_ADC34RST;
break;
}
+
#endif
default:
{
@@ -2664,29 +2673,29 @@ static void adc_dma_cfg(FAR struct stm32_dev_s *priv)
uint32_t setbits = 0;
#ifdef ADC_HAVE_DMACFG
- /* Set DMA mode */
+ /* Set DMA mode */
- if (priv->dmacfg == 0)
- {
- /* One Shot Mode */
+ if (priv->dmacfg == 0)
+ {
+ /* One Shot Mode */
- clrbits |= ADC_CR2_DDS;
- }
- else
- {
- /* Circular Mode */
+ clrbits |= ADC_CR2_DDS;
+ }
+ else
+ {
+ /* Circular Mode */
- setbits |= ADC_CR2_DDS;
- }
+ setbits |= ADC_CR2_DDS;
+ }
#endif
- /* Enable DMA */
+ /* Enable DMA */
- setbits |= ADC_CR2_DMA;
+ setbits |= ADC_CR2_DMA;
- /* Modify CR2 configuration */
+ /* Modify CR2 configuration */
- adc_modifyreg(priv, STM32_ADC_CR2_OFFSET, clrbits, setbits);
+ adc_modifyreg(priv, STM32_ADC_CR2_OFFSET, clrbits, setbits);
}
#endif
@@ -4320,14 +4329,15 @@ static uint32_t adc_injget(FAR struct stm32_adc_dev_s
*dev, uint8_t chan)
FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
uint32_t regval = 0;
- if (chan > priv->cj_channels-1)
+ if (chan > (priv->cj_channels - 1))
{
/* REVISIT: return valute with MSB set to indicate error ? */
goto errout;
}
- regval = adc_getreg(priv, STM32_ADC_JDR1_OFFSET+4*(chan)) &
ADC_JDR_JDATA_MASK;
+ regval = adc_getreg(priv, STM32_ADC_JDR1_OFFSET + 4 * (chan)) &
+ ADC_JDR_JDATA_MASK;
errout:
return regval;
@@ -4466,7 +4476,8 @@ void adc_sampletime_set(FAR struct stm32_adc_dev_s *dev,
uint8_t i;
/* Check if user wants to assign the same value for all channels
- * or just wants to change sample time values for certain channels */
+ * or just wants to change sample time values for certain channels
+ */
if (time_samples->all_same)
{
@@ -4582,6 +4593,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const
uint8_t *chanlist,
# endif
break;
}
+
#endif /* CONFIG_STM32_ADC1 */
#ifdef CONFIG_STM32_ADC2
case 2:
@@ -4598,6 +4610,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const
uint8_t *chanlist,
# endif
break;
}
+
#endif /* CONFIG_STM32_ADC2 */
#ifdef CONFIG_STM32_ADC3
case 3:
@@ -4614,6 +4627,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const
uint8_t *chanlist,
# endif
break;
}
+
#endif /* CONFIG_STM32_ADC3 */
#ifdef CONFIG_STM32_ADC4
case 4:
@@ -4630,6 +4644,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const
uint8_t *chanlist,
# endif
break;
}
+
#endif /* CONFIG_STM32_ADC4 */
default:
{
diff --git a/arch/arm/src/stm32l4/stm32l4_otgfshost.c
b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
index 247a737..b667505 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfshost.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
@@ -1079,6 +1079,7 @@ static int stm32l4_chan_wait(FAR struct stm32l4_usbhost_s
*priv,
FAR struct stm32l4_chan_s *chan)
{
irqstate_t flags;
+ int ret;
/* Disable interrupts so that the following operations will be atomic. On
* the OTG FS global interrupt needs to be disabled. However, here we
disable
@@ -4235,6 +4236,7 @@ static int stm32l4_epfree(FAR struct usbhost_driver_s
*drvr, usbhost_ep_t ep)
* - Never called from an interrupt handler.
*
****************************************************************************/
+
#warning this function name is too generic
static int stm32l4_alloc(FAR struct usbhost_driver_s *drvr,
FAR uint8_t **buffer, FAR size_t *maxlen)
@@ -4280,6 +4282,7 @@ static int stm32l4_alloc(FAR struct usbhost_driver_s
*drvr,
* - Never called from an interrupt handler.
*
****************************************************************************/
+
#warning this function name is too generic
static int stm32l4_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
{
@@ -4316,6 +4319,7 @@ static int stm32l4_free(FAR struct usbhost_driver_s
*drvr, FAR uint8_t *buffer)
* This function will *not* be called from an interrupt handler.
*
************************************************************************************/
+
#warning this function name is too generic
static int stm32l4_ioalloc(FAR struct usbhost_driver_s *drvr,
FAR uint8_t **buffer, size_t buflen)
@@ -4360,6 +4364,7 @@ static int stm32l4_ioalloc(FAR struct usbhost_driver_s
*drvr,
* This function will *not* be called from an interrupt handler.
*
************************************************************************************/
+
#warning this function name is too generic
static int stm32l4_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t
*buffer)
{
@@ -4884,6 +4889,7 @@ static void stm32l4_disconnect(FAR struct
usbhost_driver_s *drvr,
/****************************************************************************
* Initialization
****************************************************************************/
+
/****************************************************************************
* Name: stm32l4_portreset
*
diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c
index 10cb507..d07b59b 100644
--- a/drivers/input/ads7843e.c
+++ b/drivers/input/ads7843e.c
@@ -96,6 +96,7 @@
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
+
/* Low-level SPI helpers */
static void ads7843e_lock(FAR struct spi_dev_s *spi);
@@ -268,7 +269,7 @@ static uint16_t ads7843e_sendcmd(FAR struct ads7843e_dev_s
*priv, uint8_t cmd)
/* Wait a tiny amount to make sure that the acquisition time is complete */
- up_udelay(3); /* 3 microseconds */
+ up_udelay(3); /* 3 microseconds */
/* Read the 12-bit data (LS 4 bits will be padded with zero) */
@@ -361,11 +362,11 @@ static int ads7843e_sample(FAR struct ads7843e_dev_s
*priv,
priv->id++;
}
else if (sample->contact == CONTACT_DOWN)
- {
+ {
/* First report -- next report will be a movement */
- priv->sample.contact = CONTACT_MOVE;
- }
+ priv->sample.contact = CONTACT_MOVE;
+ }
priv->penchange = false;
ret = OK;
@@ -418,10 +419,6 @@ static int ads7843e_waitsample(FAR struct ads7843e_dev_s
*priv,
if (ret < 0)
{
- /* If we are awakened by a signal, then we need to return
- * the failure now.
- */
-
ierr("ERROR: nxsem_wait: %d\n", ret);
goto errout;
}
@@ -588,9 +585,9 @@ static void ads7843e_worker(FAR void *arg)
* later.
*/
- wd_start(priv->wdog, ADS7843E_WDOG_DELAY, ads7843e_wdog, 1,
- (uint32_t)priv);
- goto ignored;
+ wd_start(priv->wdog, ADS7843E_WDOG_DELAY, ads7843e_wdog, 1,
+ (uint32_t)priv);
+ goto ignored;
}
else
{
@@ -877,7 +874,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR
char *buffer, size_t le
{
ret = -EAGAIN;
goto errout;
- }
+ }
/* Wait for sample data */
diff --git a/drivers/usbhost/usbhost_hidmouse.c
b/drivers/usbhost/usbhost_hidmouse.c
index a1601ab..283b79f 100644
--- a/drivers/usbhost/usbhost_hidmouse.c
+++ b/drivers/usbhost/usbhost_hidmouse.c
@@ -936,9 +936,9 @@ static bool usbhost_threshold(FAR struct usbhost_state_s
*priv)
diff = pos - priv->xlast;
}
else
- {
+ {
diff = priv->xlast - pos;
- }
+ }
/* Check if the X difference exceeds the report threshold */
@@ -973,9 +973,9 @@ static bool usbhost_threshold(FAR struct usbhost_state_s
*priv)
diff = pos - priv->wlast;
}
else
- {
+ {
diff = priv->wlast - pos;
- }
+ }
/* Check if the X difference exceeds the report threshold */
@@ -1286,11 +1286,12 @@ static int usbhost_sample(FAR struct usbhost_state_s
*priv,
priv->sample.valid = false;
}
else if (sample->event == BUTTON_PRESSED)
- {
+ {
/* First report -- next report will be a movement */
- priv->sample.event = BUTTON_MOVE;
- }
+ priv->sample.event = BUTTON_MOVE;
+ }
+
#endif
/* The sample has been reported and is no longer valid */
@@ -1354,10 +1355,6 @@ static int usbhost_waitsample(FAR struct usbhost_state_s
*priv,
if (ret < 0)
{
- /* If we are awakened by a signal, then we need to return
- * the failure now.
- */
-
ierr("ERROR: nxsem_wait: %d\n", ret);
goto errout;
}
@@ -1778,7 +1775,7 @@ static void usbhost_putle32(uint8_t *dest, uint32_t val)
/* Little endian means LS halfword first in byte stream */
usbhost_putle16(dest, (uint16_t)(val & 0xffff));
- usbhost_putle16(dest+2, (uint16_t)(val >> 16));
+ usbhost_putle16(dest + 2, (uint16_t)(val >> 16));
}
#endif
@@ -1889,7 +1886,7 @@ static FAR struct usbhost_class_s *
if (usbhost_allocdevno(priv) == OK)
{
- /* Initialize class method function pointers */
+ /* Initialize class method function pointers */
priv->usbclass.hport = hport;
priv->usbclass.connect = usbhost_connect;
@@ -1931,6 +1928,7 @@ static FAR struct usbhost_class_s *
/****************************************************************************
* struct usbhost_class_s methods
****************************************************************************/
+
/****************************************************************************
* Name: usbhost_connect
*
@@ -2083,6 +2081,7 @@ static int usbhost_disconnected(struct usbhost_class_s
*usbclass)
/****************************************************************************
* Character driver methods
****************************************************************************/
+
/****************************************************************************
* Name: usbhost_open
*
@@ -2207,7 +2206,7 @@ static int usbhost_close(FAR struct file *filep)
* but there is still an outstanding open reference.
*/
- if (priv->crefs == 0 || (priv->crefs == 1 && priv->polling))
+ if (priv->crefs == 0 || (priv->crefs == 1 && priv->polling))
{
/* Yes.. In either case, then the driver is no longer open */
