You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/11/28 05:38:53 UTC
[incubator-nuttx] branch master updated (946f997 -> 4b6d117)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 946f997 net/wireless: add country code control support
new 32950a2 arch/arm/src/stm32/stm32_otghsdev.c: Fix syslog formats
new c696ccf arch/arm/src/stm32/stm32_adc.c: Fix syslog formats
new 751f465 boards/arm/stm32/stm32f334-disco/src/stm32_smps.c: Fix syslog formats
new 73e82ed boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_backpack.c: Fix a syslog format
new b22ad6f arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c: Fix syslog formats
new cad0486 arch/arm/src/nrf52/nrf52_pwm.c: Fix syslog formats
new 080879f arch/arm/src/nrf52/nrf52_spi.c: Fix syslog formats
new b9b9734 arch/arm/src/lpc54xx/lpc54_i2c_master.c: Fix syslog formats
new a77b402 arch/arm/src/lpc54xx/lpc54_lcd.c: Appease nxstyle
new c5062fc arch/arm/src/lpc54xx/lpc54_lcd.c: Fix syslog formats
new 485b84f arch/arm/src/lpc54xx/lpc54_ethernet.c: Fix a syslog format
new 32e6784 arch/arm/src/lpc43xx/lpc43_serial.c: Fix syslog formats
new ab87669 arch/arm/src/lpc43xx/lpc43_timer.c: Appease nxstyle
new a4d37f7 arch/arm/src/lpc43xx/lpc43_timer.c: Fix syslog formats
new 6a9a3d0 drivers/sensors/max31855.c: Appease nxstyle
new 53a3d65 drivers/sensors/max31855.c: Fix a syslog format
new d056df9 arch/arm/src/lpc43xx/lpc43_ssp.c: Fix syslog formats
new 2d7e25e boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c: Appease nxstyle
new 9689720 boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c: Fix a missing semicolon
new 18bfb39 arch/arm/src/arm/arm_dataabort.c: Fix syslog formats
new b15da3b arch/arm/src/arm/arm_prefetchabort.c: Fix a syslog format
new 571f31c boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c: Fix syslog formats
new a2f3ad5 boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c: Fix syslog formats
new 4b6d117 boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c: Fix syslog formats
The 24 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/arm/arm_dataabort.c | 3 +-
arch/arm/src/arm/arm_prefetchabort.c | 3 +-
arch/arm/src/lpc43xx/lpc43_serial.c | 7 +--
arch/arm/src/lpc43xx/lpc43_ssp.c | 11 ++---
arch/arm/src/lpc43xx/lpc43_timer.c | 46 ++++++++++---------
arch/arm/src/lpc54xx/lpc54_ethernet.c | 6 ++-
arch/arm/src/lpc54xx/lpc54_i2c_master.c | 7 +--
arch/arm/src/lpc54xx/lpc54_lcd.c | 51 +++++++++++++---------
arch/arm/src/nrf52/nrf52_pwm.c | 6 ++-
arch/arm/src/nrf52/nrf52_spi.c | 7 +--
arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c | 13 +++---
arch/arm/src/stm32/stm32_adc.c | 4 +-
arch/arm/src/stm32/stm32_otghsdev.c | 7 +--
.../arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c | 10 +++--
boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c | 23 ++++++----
.../lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c | 6 ++-
boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c | 5 ++-
.../stm32f103-minimum/src/stm32_lcd_backpack.c | 2 +-
boards/arm/stm32/stm32f334-disco/src/stm32_smps.c | 7 ++-
drivers/sensors/max31855.c | 9 ++--
20 files changed, 138 insertions(+), 95 deletions(-)
[incubator-nuttx] 13/24: arch/arm/src/lpc43xx/lpc43_timer.c:
Appease nxstyle
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ab876691331c145e722c800c54b9e325cace5499
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:52:24 2020 +0900
arch/arm/src/lpc43xx/lpc43_timer.c: Appease nxstyle
---
arch/arm/src/lpc43xx/lpc43_timer.c | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/arch/arm/src/lpc43xx/lpc43_timer.c b/arch/arm/src/lpc43xx/lpc43_timer.c
index de4633f..8b6109a 100644
--- a/arch/arm/src/lpc43xx/lpc43_timer.c
+++ b/arch/arm/src/lpc43xx/lpc43_timer.c
@@ -61,6 +61,7 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
+
/* Configuration ************************************************************/
#ifndef CONFIG_DEBUG_TIMER_INFO
@@ -77,6 +78,7 @@
/****************************************************************************
* Private Types
****************************************************************************/
+
/* This structure provides the private representation of the "lower-half"
* driver state structure. This structure must be cast-compatible with the
* timer_lowerhalf_s structure.
@@ -101,6 +103,7 @@ struct lpc43_lowerhalf_s
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
+
/* Register operations ******************************************************/
#ifdef CONFIG_LPC43_TMR_REGDEBUG
@@ -202,7 +205,7 @@ static uint32_t lpc43_getreg(uint32_t addr)
{
/* Yes.. then show how many times the value repeated */
- tmrinfo("[repeats %d more times]\n", count-3);
+ tmrinfo("[repeats %d more times]\n", count - 3);
}
/* Save the new address, value, and count */
@@ -339,7 +342,7 @@ void tmr_clk_disable(uint16_t tmrid)
static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg)
{
uint8_t chan_int = 0x0f;
- FAR struct lpc43_lowerhalf_s *priv = &g_tmrdevs[irq-LPC43M4_IRQ_TIMER0];
+ FAR struct lpc43_lowerhalf_s *priv = &g_tmrdevs[irq - LPC43M4_IRQ_TIMER0];
tmrinfo("Entry\n");
DEBUGASSERT((irq >= LPC43M4_IRQ_TIMER0) && (irq <= LPC43M4_IRQ_TIMER3));
@@ -358,7 +361,7 @@ static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg)
{
/* Calculate new ticks / dither adjustment */
- priv->clkticks =((uint64_t)(priv->adjustment + priv->timeout)) *
+ priv->clkticks = ((uint64_t)(priv->adjustment + priv->timeout)) *
TMR_FCLK / 1000000;
/* Set next interval interval. TODO: make sure the interval is not
@@ -398,8 +401,8 @@ static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg)
* Start the timer, resetting the time to the current timeout,
*
* Input Parameters:
- * lower - A pointer the publicly visible representation of the "lower-half"
- * driver state structure.
+ * lower - A pointer the publicly visible representation of the
+ * "lower-half" driver state structure.
*
* Returned Value:
* Zero on success; a negated errno value on failure.
@@ -462,8 +465,8 @@ static int lpc43_start(FAR struct timer_lowerhalf_s *lower)
* Stop the timer
*
* Input Parameters:
- * lower - A pointer the publicly visible representation of the "lower-half"
- * driver state structure.
+ * lower - A pointer the publicly visible representation of the
+ * "lower-half" driver state structure.
*
* Returned Value:
* Zero on success; a negated errno value on failure.
@@ -541,6 +544,7 @@ static int lpc43_getstatus(FAR struct timer_lowerhalf_s *lower,
status->timeout = priv->timeout;
/* Get the time remaining until the timer expires (in microseconds) */
+
/* TODO - check on the +1 in the time left calculation */
elapsed = lpc43_getreg(priv->base + LPC43_TMR_TC_OFFSET);
@@ -621,8 +625,8 @@ static int lpc43_settimeout(FAR struct timer_lowerhalf_s *lower,
* Call this user provided timeout callback.
*
* Input Parameters:
- * lower - A pointer the publicly visible representation of the "lower-half"
- * driver state structure.
+ * lower - A pointer the publicly visible representation of the
+ * "lower-half" driver state structure.
* newcallback - The new timer expiration function pointer. If this
* function pointer is NULL, then the reset-on-expiration
* behavior is restored,
@@ -646,8 +650,8 @@ static void lpc43_setcallback(FAR struct timer_lowerhalf_s *lower,
/* Save the new callback and its argument */
- priv->callback = callback;
- priv->arg = arg;
+ priv->callback = callback;
+ priv->arg = arg;
leave_critical_section(flags);
}
@@ -660,8 +664,8 @@ static void lpc43_setcallback(FAR struct timer_lowerhalf_s *lower,
* are forwarded to the lower half driver through this method.
*
* Input Parameters:
- * lower - A pointer the publicly visible representation of the "lower-half"
- * driver state structure.
+ * lower - A pointer the publicly visible representation of the
+ * "lower-half" driver state structure.
* cmd - The ioctl command value
* arg - The optional argument that accompanies the 'cmd'. The
* interpretation of this argument depends on the particular
@@ -707,7 +711,7 @@ static int lpc43_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd,
void lpc43_tmrinitialize(FAR const char *devpath, int irq)
{
- FAR struct lpc43_lowerhalf_s *priv = &g_tmrdevs[irq-LPC43M4_IRQ_TIMER0];
+ FAR struct lpc43_lowerhalf_s *priv = &g_tmrdevs[irq - LPC43M4_IRQ_TIMER0];
tmrinfo("Entry: devpath=%s\n", devpath);
DEBUGASSERT((irq >= LPC43M4_IRQ_TIMER0) && (irq <= LPC43M4_IRQ_TIMER3));
[incubator-nuttx] 04/24:
boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_backpack.c: Fix a syslog
format
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 73e82edfb902c7aeb01ec24e6823aa7fd4080c64
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Nov 27 21:44:56 2020 +0900
boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_backpack.c: Fix a syslog format
---
boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_backpack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_backpack.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_backpack.c
index b648404..5a3fb13 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_backpack.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_backpack.c
@@ -105,7 +105,7 @@ int stm32_lcd_backpack_init(FAR const char *devpath)
ret = i2c_register(i2c, LCDBP_I2C_PORTNO);
if (ret < 0)
{
- rtcerr("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+ rtcerr("ERROR: Failed to register I2C driver: %d\n", ret);
return -ENODEV;
}
#endif
[incubator-nuttx] 17/24: arch/arm/src/lpc43xx/lpc43_ssp.c: Fix
syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d056df9f1798382a8133fdbc664a465b330bb050
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 10:00:56 2020 +0900
arch/arm/src/lpc43xx/lpc43_ssp.c: Fix syslog formats
---
arch/arm/src/lpc43xx/lpc43_ssp.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c
index fc1d53c..328922e 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -40,6 +40,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
+#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
#include <errno.h>
@@ -358,7 +359,7 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev,
priv->frequency = frequency;
priv->actual = actual;
- spiinfo("Frequency %d->%d\n", frequency, actual);
+ spiinfo("Frequency %" PRId32 "->%" PRId32 "\n", frequency, actual);
return actual;
}
@@ -459,7 +460,7 @@ static void ssp_setbits(FAR struct spi_dev_s *dev, int nbits)
regval |= ((nbits - 1) << SSP_CR0_DSS_SHIFT);
ssp_putreg(priv, LPC43_SSP_CR0_OFFSET, regval);
spiinfo("SSP Control Register 0 (CR0) after setting"
- "DSS: 0x%08X.\n", regval);
+ "DSS: 0x%08" PRIX32 ".\n", regval);
/* Save the selection so that subsequent re-configurations will be
* faster.
@@ -505,7 +506,7 @@ static uint32_t ssp_send(FAR struct spi_dev_s *dev, uint32_t wd)
/* Get the value from the RX FIFO and return it */
regval = ssp_getreg(priv, LPC43_SSP_DR_OFFSET);
- spiinfo("%04x->%04x\n", wd, regval);
+ spiinfo("%04" PRIx32 "->%04" PRIx32 "\n", wd, regval);
return regval;
}
@@ -568,7 +569,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
* and (3) there are more bytes to be sent.
*/
- spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
+ spiinfo("TX: rxpending: %" PRId32 " nwords: %d\n", rxpending, nwords);
while ((ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_TNF) &&
(rxpending < LPC43_SSP_FIFOSZ) && nwords)
{
@@ -593,7 +594,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
* empty.
*/
- spiinfo("RX: rxpending: %d\n", rxpending);
+ spiinfo("RX: rxpending: %" PRId32 "\n", rxpending);
while (ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_RNE)
{
data = ssp_getreg(priv, LPC43_SSP_DR_OFFSET);
[incubator-nuttx] 09/24: arch/arm/src/lpc54xx/lpc54_lcd.c: Appease
nxstyle
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit a77b402f386ad31d6665c86d82067c26f35808cc
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:37:16 2020 +0900
arch/arm/src/lpc54xx/lpc54_lcd.c: Appease nxstyle
---
arch/arm/src/lpc54xx/lpc54_lcd.c | 43 ++++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/arch/arm/src/lpc54xx/lpc54_lcd.c b/arch/arm/src/lpc54xx/lpc54_lcd.c
index 0351650..dd68b88 100644
--- a/arch/arm/src/lpc54xx/lpc54_lcd.c
+++ b/arch/arm/src/lpc54xx/lpc54_lcd.c
@@ -275,11 +275,11 @@ static int lpc54_getcmap(FAR struct fb_vtable_s *vtable,
{
/* Save the even palette value */
- cmap->red[i+1] = (rgb & LCD_PAL_R1_MASK) >> LCD_PAL_R1_SHIFT;
- cmap->green[i+1] = (rgb & LCD_PAL_G1_MASK) >> LCD_PAL_G1_SHIFT;
- cmap->blue[i+1] = (rgb & LCD_PAL_B1_MASK) >> LCD_PAL_B1_SHIFT;
+ cmap->red[i + 1] = (rgb & LCD_PAL_R1_MASK) >> LCD_PAL_R1_SHIFT;
+ cmap->green[i + 1] = (rgb & LCD_PAL_G1_MASK) >> LCD_PAL_G1_SHIFT;
+ cmap->blue[i + 1] = (rgb & LCD_PAL_B1_MASK) >> LCD_PAL_B1_SHIFT;
#ifdef CONFIG_FB_TRANSPARENCY
- cmap->transp[i+1] = 0;
+ cmap->transp[i + 1] = 0;
#endif
}
}
@@ -316,7 +316,8 @@ static int lpc54_putcmap(FAR struct fb_vtable_s *vtable,
if ((i & 1) != 0)
{
rgb0 = *pal;
- rgb0 &= (LCD_PAL_R0_MASK | LCD_PAL_G0_MASK | LCD_PAL_B0_MASK | LCD_PAL_I0);
+ rgb0 &= (LCD_PAL_R0_MASK | LCD_PAL_G0_MASK | LCD_PAL_B0_MASK |
+ LCD_PAL_I0);
rgb1 |= ((uint32_t)cmap->red[i] << LCD_PAL_R0_SHIFT |
(uint32_t)cmap->green[i] << LCD_PAL_G0_SHIFT |
(uint32_t)cmap->blue[i] << LCD_PAL_B0_SHIFT);
@@ -340,13 +341,14 @@ static int lpc54_putcmap(FAR struct fb_vtable_s *vtable,
if ((i + 1) >= last)
{
rgb1 = *pal;
- rgb1 &= (LCD_PAL_R1_MASK | LCD_PAL_G1_MASK | LCD_PAL_B1_MASK | LCD_PAL_I1);
+ rgb1 &= (LCD_PAL_R1_MASK | LCD_PAL_G1_MASK | LCD_PAL_B1_MASK |
+ LCD_PAL_I1);
}
else
{
- rgb1 = ((uint32_t)cmap->red[i+1] << LCD_PAL_R1_SHIFT |
- (uint32_t)cmap->green[i+1] << LCD_PAL_G1_SHIFT |
- (uint32_t)cmap->blue[i+1] << LCD_PAL_B1_SHIFT);
+ rgb1 = ((uint32_t)cmap->red[i + 1] << LCD_PAL_R1_SHIFT |
+ (uint32_t)cmap->green[i + 1] << LCD_PAL_G1_SHIFT |
+ (uint32_t)cmap->blue[i + 1] << LCD_PAL_B1_SHIFT);
}
/* Save the new palette value */
@@ -408,6 +410,7 @@ static int lpc54_setcursor(FAR struct fb_vtable_s *vtable,
g_cpos = settings->pos;
lcdinfo("pos: (h:%d, w:%d)\n", g_cpos.x, g_cpos.y);
}
+
#ifdef CONFIG_FB_HWCURSORSIZE
if ((flags & FB_CUR_SETSIZE) != 0)
{
@@ -415,6 +418,7 @@ static int lpc54_setcursor(FAR struct fb_vtable_s *vtable,
lcdinfo("size: (h:%d, w:%d)\n", g_csize.h, g_csize.w);
}
#endif
+
#ifdef CONFIG_FB_HWCURSORIMAGE
if ((flags & FB_CUR_SETIMAGE) != 0)
{
@@ -423,6 +427,7 @@ static int lpc54_setcursor(FAR struct fb_vtable_s *vtable,
settings->img.image);
}
#endif
+
return OK;
}
@@ -459,6 +464,7 @@ int up_fbinitialize(int display)
int i;
/* Configure pins */
+
/* LCD panel data. Pins used depend on the panel configuration:
*
* STN 4BPP: VD0-VD3 (single panel)
@@ -468,7 +474,7 @@ int up_fbinitialize(int display)
* TFT 12BPP: VD4-VD7, VD12-VD15, VD20-VD23
* TFT 16BPP: VD3-VD7, VD10-VD15, VD19-VD23
* TFT 24BPP: VD0-VD23
- */
+ */
lcdinfo("Configuring pins\n");
@@ -650,10 +656,10 @@ int up_fbinitialize(int display)
putreg32(0, LPC54_LCD_TIMH);
- regval = (((CONFIG_LPC54_LCD_HWIDTH/16) - 1) << LCD_TIMH_PPL_SHIFT |
- (CONFIG_LPC54_LCD_HPULSE - 1) << LCD_TIMH_HSW_SHIFT |
- (CONFIG_LPC54_LCD_HFRONTPORCH - 1) << LCD_TIMH_HFP_SHIFT |
- (CONFIG_LPC54_LCD_HBACKPORCH - 1) << LCD_TIMH_HBP_SHIFT);
+ regval = (((CONFIG_LPC54_LCD_HWIDTH / 16) - 1) << LCD_TIMH_PPL_SHIFT |
+ (CONFIG_LPC54_LCD_HPULSE - 1) << LCD_TIMH_HSW_SHIFT |
+ (CONFIG_LPC54_LCD_HFRONTPORCH - 1) << LCD_TIMH_HFP_SHIFT |
+ (CONFIG_LPC54_LCD_HBACKPORCH - 1) << LCD_TIMH_HBP_SHIFT);
putreg32(regval, LPC54_LCD_TIMH);
/* Initialize vertical timing */
@@ -800,7 +806,8 @@ int up_fbinitialize(int display)
*
* Description:
* Return a a reference to the framebuffer object for the specified video
- * plane of the specified plane. Many OSDs support multiple planes of video.
+ * plane of the specified plane. Many OSDs support multiple planes of
+ * video.
*
* Input Parameters:
* display - In the case of hardware with multiple displays, this
@@ -897,14 +904,16 @@ void lpc54_lcdclear(nxgl_mxpixel_t color)
lcdinfo("Clearing display: color=%08x VRAM=%08x size=%d\n",
color, CONFIG_LPC54_LCD_VRAMBASE,
- CONFIG_LPC54_LCD_HWIDTH * CONFIG_LPC54_LCD_VHEIGHT * sizeof(uint32_t));
+ CONFIG_LPC54_LCD_HWIDTH * CONFIG_LPC54_LCD_VHEIGHT *
+ sizeof(uint32_t));
#else
uint16_t *dest = (uint16_t *)CONFIG_LPC54_LCD_VRAMBASE;
lcdinfo("Clearing display: color=%08x VRAM=%08x size=%d\n",
color, CONFIG_LPC54_LCD_VRAMBASE,
- CONFIG_LPC54_LCD_HWIDTH * CONFIG_LPC54_LCD_VHEIGHT * sizeof(uint16_t));
+ CONFIG_LPC54_LCD_HWIDTH * CONFIG_LPC54_LCD_VHEIGHT *
+ sizeof(uint16_t));
#endif
for (i = 0; i < (CONFIG_LPC54_LCD_HWIDTH * CONFIG_LPC54_LCD_VHEIGHT); i++)
[incubator-nuttx] 24/24:
boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c: Fix syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4b6d117a937098d56ddc79b1ca1114dfe762f1c1
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 10:28:12 2020 +0900
boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c: Fix syslog formats
---
boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c b/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c
index e31722b..078fe7b 100644
--- a/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c
+++ b/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c
@@ -65,6 +65,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
+#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
#include <assert.h>
@@ -236,7 +237,7 @@ static void spi_select(FAR struct spi_dev_s *dev, uint32_t devid,
/* Enable slave select (low enables) */
putreg32(bit, CS_CLR_REGISTER);
- spiinfo("CS asserted: %08x->%08x\n",
+ spiinfo("CS asserted: %08" PRIx32 "->%08" PRIx32 "\n",
regval, getreg32(CS_PIN_REGISTER));
}
else
@@ -244,7 +245,7 @@ static void spi_select(FAR struct spi_dev_s *dev, uint32_t devid,
/* Disable slave select (low enables) */
putreg32(bit, CS_SET_REGISTER);
- spiinfo("CS de-asserted: %08x->%08x\n", regval,
+ spiinfo("CS de-asserted: %08" PRIx32 "->%08" PRIx32 "\n", regval,
getreg32(CS_PIN_REGISTER));
/* Wait for the TX FIFO not full indication */
@@ -302,7 +303,8 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev,
divisor = (divisor + 1) & ~1;
putreg8(divisor, LPC214X_SPI1_CPSR);
- spiinfo("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor);
+ spiinfo("Frequency %" PRId32 "->%" PRId32 "\n",
+ frequency, (uint32_t)(LPC214X_PCLKFREQ / divisor));
return LPC214X_PCLKFREQ / divisor;
}
@@ -380,14 +382,16 @@ static int spi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
/* L: the inputs at D0 to D7 are transferred to the command registers */
putreg32(bit, CS_CLR_REGISTER);
- spiinfo("Command: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
+ spiinfo("Command: %08" PRIx32 "->%08" PRIx32 "\n",
+ regval, getreg32(CS_PIN_REGISTER));
}
else
{
/* H: the inputs at D0 to D7 are treated as display data. */
putreg32(bit, CS_SET_REGISTER);
- spiinfo("Data: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
+ spiinfo("Data: %08" PRIx32 "->%08" PRIx32 "\n",
+ regval, getreg32(CS_PIN_REGISTER));
}
return OK;
@@ -429,7 +433,7 @@ static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd)
/* Get the value from the RX FIFO and return it */
regval = getreg16(LPC214X_SPI1_DR);
- spiinfo("%04x->%04x\n", wd, regval);
+ spiinfo("%04" PRIx32 "->%04x\n", wd, regval);
return regval;
}
@@ -545,7 +549,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer,
* and (3) there are more bytes to be sent.
*/
- spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
+ spiinfo("TX: rxpending: %" PRId32 " nwords: %d\n", rxpending, nwords);
while ((getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_TNF) &&
(rxpending < LPC214X_SPI1_FIFOSZ) && nwords)
{
@@ -556,7 +560,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer,
/* Now, read RX data from RX FIFO while RX FIFO is not empty */
- spiinfo("RX: rxpending: %d\n", rxpending);
+ spiinfo("RX: rxpending: %" PRId32 "\n", rxpending);
while (getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE)
{
*ptr++ = (uint8_t)getreg16(LPC214X_SPI1_DR);
@@ -636,7 +640,8 @@ FAR struct spi_dev_s *lpc214x_spibus_initialize(int port)
regval32 |= getreg32(CS_DIR_REGISTER);
putreg32(regval32, CS_DIR_REGISTER);
- spiinfo("CS Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n",
+ spiinfo("CS Pin Config: PINSEL1: %08" PRIx32
+ " PIN: %08" PRIx32 " DIR: %08" PRIx32 "\n",
getreg32(LPC214X_PINSEL1), getreg32(CS_PIN_REGISTER),
getreg32(CS_DIR_REGISTER));
[incubator-nuttx] 10/24: arch/arm/src/lpc54xx/lpc54_lcd.c: Fix
syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c5062fc9ab3ba0049e0b4ea132c28a2a2e1fa719
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:35:14 2020 +0900
arch/arm/src/lpc54xx/lpc54_lcd.c: Fix syslog formats
Note: the width of nxgl_mxpixel_t depends on configuration.
---
arch/arm/src/lpc54xx/lpc54_lcd.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/src/lpc54xx/lpc54_lcd.c b/arch/arm/src/lpc54xx/lpc54_lcd.c
index dd68b88..31ebbd7 100644
--- a/arch/arm/src/lpc54xx/lpc54_lcd.c
+++ b/arch/arm/src/lpc54xx/lpc54_lcd.c
@@ -902,16 +902,16 @@ void lpc54_lcdclear(nxgl_mxpixel_t color)
#if LPC54_BPP > 16
uint32_t *dest = (uint32_t *)CONFIG_LPC54_LCD_VRAMBASE;
- lcdinfo("Clearing display: color=%08x VRAM=%08x size=%d\n",
- color, CONFIG_LPC54_LCD_VRAMBASE,
+ lcdinfo("Clearing display: color=%08jx VRAM=%08x size=%d\n",
+ (uintmax_t)color, CONFIG_LPC54_LCD_VRAMBASE,
CONFIG_LPC54_LCD_HWIDTH * CONFIG_LPC54_LCD_VHEIGHT *
sizeof(uint32_t));
#else
uint16_t *dest = (uint16_t *)CONFIG_LPC54_LCD_VRAMBASE;
- lcdinfo("Clearing display: color=%08x VRAM=%08x size=%d\n",
- color, CONFIG_LPC54_LCD_VRAMBASE,
+ lcdinfo("Clearing display: color=%08jx VRAM=%08x size=%d\n",
+ (uintmax_t)color, CONFIG_LPC54_LCD_VRAMBASE,
CONFIG_LPC54_LCD_HWIDTH * CONFIG_LPC54_LCD_VHEIGHT *
sizeof(uint16_t));
#endif
[incubator-nuttx] 19/24:
boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c: Fix a missing semicolon
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 9689720940f592322459493cfa22165001692627
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 10:05:37 2020 +0900
boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c: Fix a missing semicolon
---
boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c
index 34b4b3a..2249cdc 100644
--- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c
+++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c
@@ -82,7 +82,7 @@ void weak_function lpc43_sspdev_initialize(void)
ret = lpc43_gpio_config(GPIO_MAX31855_CS2);
if (ret < 0)
{
- snerr("ERROR: Error configuring chip select GPIO pin\n")
+ snerr("ERROR: Error configuring chip select GPIO pin\n");
}
#endif
}
[incubator-nuttx] 14/24: arch/arm/src/lpc43xx/lpc43_timer.c: Fix
syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit a4d37f788365285361caff2fbcd2c0250e73025d
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:54:29 2020 +0900
arch/arm/src/lpc43xx/lpc43_timer.c: Fix syslog formats
---
arch/arm/src/lpc43xx/lpc43_timer.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/arm/src/lpc43xx/lpc43_timer.c b/arch/arm/src/lpc43xx/lpc43_timer.c
index 8b6109a..3ed0e10 100644
--- a/arch/arm/src/lpc43xx/lpc43_timer.c
+++ b/arch/arm/src/lpc43xx/lpc43_timer.c
@@ -43,6 +43,7 @@
#include <sys/types.h>
+#include <inttypes.h>
#include <stdint.h>
#include <errno.h>
#include <debug.h>
@@ -551,9 +552,9 @@ static int lpc43_getstatus(FAR struct timer_lowerhalf_s *lower,
status->timeleft = ((uint64_t)priv->timeout * elapsed) /
(priv->clkticks + 1);
- tmrinfo(" flags : %08x\n", status->flags);
- tmrinfo(" timeout : %d\n", status->timeout);
- tmrinfo(" timeleft : %d\n", status->timeleft);
+ tmrinfo(" flags : %08" PRIx32 "\n", status->flags);
+ tmrinfo(" timeout : %" PRId32 "\n", status->timeout);
+ tmrinfo(" timeleft : %" PRId32 "\n", status->timeleft);
return OK;
}
@@ -585,13 +586,13 @@ static int lpc43_settimeout(FAR struct timer_lowerhalf_s *lower,
return -EPERM;
}
- tmrinfo("Entry: timeout=%d\n", timeout);
+ tmrinfo("Entry: timeout=%" PRId32 "\n", timeout);
/* Can this timeout be represented? */
if (timeout < 1 || timeout > TMR_MAXTIMEOUT)
{
- tmrerr("ERROR: Cannot represent timeout=%lu > %lu\n",
+ tmrerr("ERROR: Cannot represent timeout=%" PRIu32 " > %llu\n",
timeout, TMR_MAXTIMEOUT);
return -ERANGE;
}
@@ -612,7 +613,8 @@ static int lpc43_settimeout(FAR struct timer_lowerhalf_s *lower,
priv->adjustment = priv->timeout - timeout;
- tmrinfo("fclk=%d clkticks=%d timeout=%d, adjustment=%d\n",
+ tmrinfo("fclk=%d clkticks=%" PRId32
+ " timeout=%" PRId32 ", adjustment=%" PRId32 "\n",
TMR_FCLK, priv->clkticks, priv->timeout, priv->adjustment);
return OK;
[incubator-nuttx] 02/24: arch/arm/src/stm32/stm32_adc.c: Fix syslog
formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c696ccf1deec298802881a0f3b1f7e656a01ca40
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Nov 27 21:40:46 2020 +0900
arch/arm/src/stm32/stm32_adc.c: Fix syslog formats
---
arch/arm/src/stm32/stm32_adc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index 10fe221..7efe5f1 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -3258,7 +3258,7 @@ static int adc_jextcfg_set(FAR struct stm32_dev_s *priv, uint32_t jextcfg)
setbits = (jexten | jextsel);
clrbits = (ADC_JEXTREG_JEXTEN_MASK | ADC_JEXTREG_JEXTSEL_MASK);
- ainfo("Initializing jextsel = 0x%08x\n", jextsel);
+ ainfo("Initializing jextsel = 0x%08" PRIx32 "\n", jextsel);
/* Write register */
@@ -3303,7 +3303,7 @@ static void adc_dumpregs(FAR struct stm32_dev_s *priv)
adc_getreg(priv, STM32_ADC_SMPR2_OFFSET));
#if defined(STM32_ADC_SQR4_OFFSET)
- ainfo("SQR4: 0x%08x\n",
+ ainfo("SQR4: 0x%08" PRIx32 "\n",
adc_getreg(priv, STM32_ADC_SQR4_OFFSET));
#endif
[incubator-nuttx] 22/24:
boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c: Fix syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 571f31c6729fc51d380ce39e7966b03c359b538e
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 10:17:51 2020 +0900
boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c: Fix syslog formats
---
boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c
index 736b012..370e50f 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c
+++ b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c
@@ -64,6 +64,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
+#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
#include <assert.h>
@@ -286,7 +287,8 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev,
divisor = (divisor + 1) & ~1;
putreg8(divisor, LPC214X_SPI1_CPSR);
- spiinfo("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor);
+ spiinfo("Frequency %" PRId32 "->%" PRId32 "\n",
+ frequency, (uint32_t)(LPC214X_PCLKFREQ / divisor));
return LPC214X_PCLKFREQ / divisor;
}
@@ -382,7 +384,7 @@ static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd)
/* Get the value from the RX FIFO and return it */
regval = getreg16(LPC214X_SPI1_DR);
- spiinfo("%04x->%04x\n", wd, regval);
+ spiinfo("%04" PRIx32 "->%04x\n", wd, regval);
return regval;
}
@@ -499,7 +501,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer,
* and (3) there are more bytes to be sent.
*/
- spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
+ spiinfo("TX: rxpending: %" PRId32 " nwords: %d\n", rxpending, nwords);
while ((getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_TNF) &&
(rxpending < LPC214X_SPI1_FIFOSZ) && nwords)
{
@@ -510,7 +512,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer,
/* Now, read RX data from the RX FIFO while RX FIFO is not empty */
- spiinfo("RX: rxpending: %d\n", rxpending);
+ spiinfo("RX: rxpending: %" PRId32 "\n", rxpending);
while (getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE)
{
*ptr++ = (uint8_t)getreg16(LPC214X_SPI1_DR);
[incubator-nuttx] 23/24:
boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c: Fix syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit a2f3ad5d9fa9dc67cea4c4b1c1618146b9645f95
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 10:25:25 2020 +0900
boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c: Fix syslog formats
---
boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c b/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c
index d756e85..e17a7f6 100644
--- a/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c
+++ b/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c
@@ -40,6 +40,7 @@
#include <nuttx/config.h>
#include <debug.h>
+#include <inttypes.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h>
@@ -136,7 +137,8 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
regval32 = getreg32(RESET_DIR_REGISTER);
putreg32(regval32 | bits32, RESET_DIR_REGISTER);
- lcdinfo("RESET Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n",
+ lcdinfo("RESET Pin Config: PINSEL1: %08" PRIx32
+ " PIN: %08" PRIx32 " DIR: %08" PRIx32 "\n",
getreg32(LPC214X_PINSEL1), getreg32(RESET_PIN_REGISTER),
getreg32(RESET_DIR_REGISTER));
@@ -145,7 +147,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
up_mdelay(20);
putreg32(bits32, RESET_SET_REGISTER);
- lcdinfo("RESET release: PIN: %08x DIR: %08x\n",
+ lcdinfo("RESET release: PIN: %08" PRIx32 " DIR: %08" PRIx32 "\n",
getreg32(RESET_PIN_REGISTER), getreg32(RESET_DIR_REGISTER));
/* Get the SPI1 port interface */
[incubator-nuttx] 05/24: arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c:
Fix syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b22ad6fbb868ef6a8c51e0090e5bf28a4b11c378
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:23:17 2020 +0900
arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c: Fix syslog formats
---
arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c b/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c
index 3e540a5..3f454b4 100644
--- a/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c
+++ b/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.c
@@ -41,6 +41,7 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
+#include <inttypes.h>
#include <stdint.h>
#include <errno.h>
#include <debug.h>
@@ -179,7 +180,7 @@ static int nrf52_start(FAR struct watchdog_lowerhalf_s *lower)
(FAR struct nrf52_wdt_lowerhalf_s *)lower;
irqstate_t flags;
- wdinfo("Entry: started=%d\n");
+ wdinfo("Entry: started\n");
DEBUGASSERT(priv);
/* Have we already been started? */
@@ -311,9 +312,9 @@ static int nrf52_getstatus(FAR struct watchdog_lowerhalf_s *lower,
status->timeleft = status->timeout - elapsed;
wdinfo("Status :\n");
- wdinfo(" flags : %08x\n", status->flags);
- wdinfo(" timeout : %d\n", status->timeout);
- wdinfo(" timeleft : %d\n", status->timeleft);
+ wdinfo(" flags : %08" PRIx32 "\n", status->flags);
+ wdinfo(" timeout : %" PRId32 "\n", status->timeout);
+ wdinfo(" timeleft : %" PRId32 "\n", status->timeleft);
return OK;
}
@@ -339,14 +340,14 @@ static int nrf52_settimeout(FAR struct watchdog_lowerhalf_s *lower,
FAR struct nrf52_wdt_lowerhalf_s *priv =
(FAR struct nrf52_wdt_lowerhalf_s *)lower;
- wdinfo("Entry: timeout=%d\n", timeout);
+ wdinfo("Entry: timeout=%" PRId32 "\n", timeout);
DEBUGASSERT(priv);
/* Can this timeout be represented? */
if (timeout < 1 || timeout > WDT_MAXTIMEOUT)
{
- wderr("ERROR: Cannot represent timeout=%d > %d\n",
+ wderr("ERROR: Cannot represent timeout=%" PRId32 " > %d\n",
timeout, WDT_MAXTIMEOUT);
return -ERANGE;
}
[incubator-nuttx] 12/24: arch/arm/src/lpc43xx/lpc43_serial.c: Fix
syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 32e678468349cc492f6d55c73d6b3cd533b64fe0
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:50:07 2020 +0900
arch/arm/src/lpc43xx/lpc43_serial.c: Fix syslog formats
---
arch/arm/src/lpc43xx/lpc43_serial.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c
index da1d4f2..2d291b3 100644
--- a/arch/arm/src/lpc43xx/lpc43_serial.c
+++ b/arch/arm/src/lpc43xx/lpc43_serial.c
@@ -40,6 +40,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
+#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
@@ -770,7 +771,7 @@ static int up_interrupt(int irq, void *context, void *arg)
/* Read the modem status register (MSR) to clear */
status = up_serialin(priv, LPC43_UART_MSR_OFFSET);
- _info("MSR: %02x\n", status);
+ _info("MSR: %02" PRIx32 "\n", status);
break;
}
@@ -781,7 +782,7 @@ static int up_interrupt(int irq, void *context, void *arg)
/* Read the line status register (LSR) to clear */
status = up_serialin(priv, LPC43_UART_LSR_OFFSET);
- _info("LSR: %02x\n", status);
+ _info("LSR: %02" PRIx32 "\n", status);
break;
}
@@ -789,7 +790,7 @@ static int up_interrupt(int irq, void *context, void *arg)
default:
{
- _err("ERROR: Unexpected IIR: %02x\n", status);
+ _err("ERROR: Unexpected IIR: %02" PRIx32 "\n", status);
break;
}
}
[incubator-nuttx] 08/24: arch/arm/src/lpc54xx/lpc54_i2c_master.c:
Fix syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b9b97348b2cb0d897dd119113dbee5799b90d76d
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:33:33 2020 +0900
arch/arm/src/lpc54xx/lpc54_i2c_master.c: Fix syslog formats
---
arch/arm/src/lpc54xx/lpc54_i2c_master.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/lpc54xx/lpc54_i2c_master.c b/arch/arm/src/lpc54xx/lpc54_i2c_master.c
index 37f94ca..20236da 100644
--- a/arch/arm/src/lpc54xx/lpc54_i2c_master.c
+++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.c
@@ -46,6 +46,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
+#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -541,7 +542,7 @@ static bool lpc54_i2c_statemachine(struct lpc54_i2cdev_s *priv)
/* Get the state of the I2C module */
mstate = (status & I2C_STAT_MSTSTATE_MASK) >> I2C_STAT_MSTSTATE_SHIFT;
- i2cinfo("mstate=%u\n", mstate);
+ i2cinfo("mstate=%" PRIu32 "\n", mstate);
if ((mstate == I2C_MASTER_STATE_ADDRNAK) ||
(mstate == I2C_MASTER_STATE_DATANAK))
@@ -595,7 +596,7 @@ static bool lpc54_i2c_statemachine(struct lpc54_i2cdev_s *priv)
{
if (mstate != I2C_MASTER_STATE_TXOK)
{
- i2cerr("ERROR bad state=%u, expected %u\n",
+ i2cerr("ERROR bad state=%" PRIu32 ", expected %u\n",
mstate, I2C_MASTER_STATE_TXOK);
priv->result = -EINVAL;
@@ -621,7 +622,7 @@ static bool lpc54_i2c_statemachine(struct lpc54_i2cdev_s *priv)
{
if (mstate != I2C_MASTER_STATE_RXAVAIL)
{
- i2cerr("ERROR bad state=%u, expected %u\n",
+ i2cerr("ERROR bad state=%" PRIu32 ", expected %u\n",
mstate, I2C_MASTER_STATE_RXAVAIL);
priv->result = -EINVAL;
[incubator-nuttx] 15/24: drivers/sensors/max31855.c: Appease nxstyle
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6a9a3d05d8168bc561c7351b6f1117267783be2b
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:58:06 2020 +0900
drivers/sensors/max31855.c: Appease nxstyle
---
drivers/sensors/max31855.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/sensors/max31855.c b/drivers/sensors/max31855.c
index 3762a18..a5da993 100644
--- a/drivers/sensors/max31855.c
+++ b/drivers/sensors/max31855.c
@@ -195,7 +195,8 @@ static ssize_t max31855_read(FAR struct file *filep, FAR char *buffer,
if (buflen != 2)
{
- snerr("ERROR: You can't read something other than 16 bits (2 bytes)\n");
+ snerr("ERROR: You can't read something other than 16 bits "
+ "(2 bytes)\n");
return -EINVAL;
}
@@ -320,7 +321,8 @@ int max31855_register(FAR const char *devpath, FAR struct spi_dev_s *spi,
/* Initialize the MAX31855 device structure */
- priv = (FAR struct max31855_dev_s *)kmm_malloc(sizeof(struct max31855_dev_s));
+ priv = (FAR struct max31855_dev_s *)
+ kmm_malloc(sizeof(struct max31855_dev_s));
if (priv == NULL)
{
snerr("ERROR: Failed to allocate instance\n");
[incubator-nuttx] 11/24: arch/arm/src/lpc54xx/lpc54_ethernet.c: Fix
a syslog format
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 485b84f418a27383dea8bba505f458ffaae031ed
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:41:17 2020 +0900
arch/arm/src/lpc54xx/lpc54_ethernet.c: Fix a syslog format
---
arch/arm/src/lpc54xx/lpc54_ethernet.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c
index 5b85ef6..3565a48 100644
--- a/arch/arm/src/lpc54xx/lpc54_ethernet.c
+++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c
@@ -1919,8 +1919,10 @@ static int lpc54_eth_ifup(struct net_driver_s *dev)
#ifdef CONFIG_NET_IPv4
ninfo("Bringing up: %d.%d.%d.%d\n",
- dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
- (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+ (int)(dev->d_ipaddr & 0xff),
+ (int)((dev->d_ipaddr >> 8) & 0xff),
+ (int)((dev->d_ipaddr >> 16) & 0xff),
+ (int)(dev->d_ipaddr >> 24));
#endif
#ifdef CONFIG_NET_IPv6
ninfo("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
[incubator-nuttx] 20/24: arch/arm/src/arm/arm_dataabort.c: Fix
syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 18bfb3955217437e3d4b9bbbc359a00d1de791aa
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 10:12:02 2020 +0900
arch/arm/src/arm/arm_dataabort.c: Fix syslog formats
---
arch/arm/src/arm/arm_dataabort.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/src/arm/arm_dataabort.c b/arch/arm/src/arm/arm_dataabort.c
index 9bc5862..4af3ee7 100644
--- a/arch/arm/src/arm/arm_dataabort.c
+++ b/arch/arm/src/arm/arm_dataabort.c
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
+#include <inttypes.h>
#include <stdint.h>
#include <debug.h>
@@ -92,7 +93,7 @@ void arm_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr)
* fatal error.
*/
- pginfo("FSR: %08x FAR: %08x\n", fsr, far);
+ pginfo("FSR: %08" PRIx32 " FAR: %08" PRIx32 "\n", fsr, far);
if ((fsr & FSR_MASK) != FSR_PAGE)
{
goto segfault;
[incubator-nuttx] 01/24: arch/arm/src/stm32/stm32_otghsdev.c: Fix
syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 32950a262336bd9964b693b57fe93d992482d5d3
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Nov 27 21:37:46 2020 +0900
arch/arm/src/stm32/stm32_otghsdev.c: Fix syslog formats
---
arch/arm/src/stm32/stm32_otghsdev.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_otghsdev.c b/arch/arm/src/stm32/stm32_otghsdev.c
index 4275f16..e30671f 100644
--- a/arch/arm/src/stm32/stm32_otghsdev.c
+++ b/arch/arm/src/stm32/stm32_otghsdev.c
@@ -40,6 +40,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
+#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -2679,7 +2680,7 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
if ((daint & 1) != 0)
{
regval = stm32_getreg(STM32_OTGHS_DOEPINT(epno));
- uinfo("DOEPINT(%d) = %08x\n", epno, regval);
+ uinfo("DOEPINT(%d) = %08" PRIx32 "\n", epno, regval);
stm32_putreg(0xff, STM32_OTGHS_DOEPINT(epno));
}
@@ -2917,7 +2918,7 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
{
if ((daint & 1) != 0)
{
- uinfo("DIEPINT(%d) = %08x\n",
+ uinfo("DIEPINT(%d) = %08" PRIx32 "\n",
epno, stm32_getreg(STM32_OTGHS_DIEPINT(epno)));
stm32_putreg(0xff, STM32_OTGHS_DIEPINT(epno));
}
@@ -5553,7 +5554,7 @@ void arm_usbinitialize(void)
ret = irq_attach(STM32_IRQ_OTGHS, stm32_usbinterrupt, NULL);
if (ret < 0)
{
- uerr("ERROR: irq_attach failed\n", ret);
+ uerr("ERROR: irq_attach failed: %d\n", ret);
goto errout;
}
[incubator-nuttx] 21/24: arch/arm/src/arm/arm_prefetchabort.c: Fix
a syslog format
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b15da3b18de6597183ccce61ac7d56b340a5b825
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 10:12:50 2020 +0900
arch/arm/src/arm/arm_prefetchabort.c: Fix a syslog format
---
arch/arm/src/arm/arm_prefetchabort.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/src/arm/arm_prefetchabort.c b/arch/arm/src/arm/arm_prefetchabort.c
index 64f1cc0..9737561 100644
--- a/arch/arm/src/arm/arm_prefetchabort.c
+++ b/arch/arm/src/arm/arm_prefetchabort.c
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
+#include <inttypes.h>
#include <stdint.h>
#include <debug.h>
@@ -84,7 +85,7 @@ void arm_prefetchabort(uint32_t *regs)
* virtual addresses.
*/
- pginfo("VADDR: %08x VBASE: %08x VEND: %08x\n",
+ pginfo("VADDR: %08" PRIx32 " VBASE: %08x VEND: %08x\n",
regs[REG_PC], PG_PAGED_VBASE, PG_PAGED_VEND);
if (regs[REG_R15] >= PG_PAGED_VBASE && regs[REG_R15] < PG_PAGED_VEND)
[incubator-nuttx] 06/24: arch/arm/src/nrf52/nrf52_pwm.c: Fix syslog
formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit cad04863421a01eb6e8a4d12ec8fc5a5793ce53f
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:28:32 2020 +0900
arch/arm/src/nrf52/nrf52_pwm.c: Fix syslog formats
---
arch/arm/src/nrf52/nrf52_pwm.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/nrf52/nrf52_pwm.c b/arch/arm/src/nrf52/nrf52_pwm.c
index f489613..97fa421 100644
--- a/arch/arm/src/nrf52/nrf52_pwm.c
+++ b/arch/arm/src/nrf52/nrf52_pwm.c
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
+#include <inttypes.h>
#include <stdint.h>
#include <stdio.h>
#include <assert.h>
@@ -298,7 +299,7 @@ static int nrf52_pwm_duty(FAR struct nrf52_pwm_s *priv, uint8_t chan,
DEBUGASSERT(priv);
- pwminfo("PWM channel: %d duty: %d\n", chan, duty);
+ pwminfo("PWM channel: %d duty: %" PRId32 "\n", chan, duty);
/* Get compare
*
@@ -407,7 +408,8 @@ static int nrf52_pwm_freq(FAR struct nrf52_pwm_s *priv, uint32_t freq)
priv->cntrtop = top;
- pwminfo("PWM frequency: %d pwm_clk: %d pwm_prescaler: %d top: %d\n",
+ pwminfo("PWM frequency: %" PRId32 " pwm_clk: %" PRId32
+ " pwm_prescaler: %" PRId32 " top: %" PRId32 "\n",
freq, pwm_clk, prescaler, top);
return ret;
[incubator-nuttx] 03/24:
boards/arm/stm32/stm32f334-disco/src/stm32_smps.c: Fix syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 751f465b16c2dbe6cbb9a3bb20141db73a608395
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Nov 27 21:42:52 2020 +0900
boards/arm/stm32/stm32f334-disco/src/stm32_smps.c: Fix syslog formats
---
boards/arm/stm32/stm32f334-disco/src/stm32_smps.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c b/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c
index 1960452..05297e3 100644
--- a/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c
+++ b/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c
@@ -28,6 +28,7 @@
#include <sys/ioctl.h>
#include <sys/types.h>
+#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -438,7 +439,8 @@ static int smps_start(FAR struct smps_dev_s *dev)
per = fclk / TIMA_PWM_FREQ;
if (per > HRTIM_PER_MAX)
{
- pwrerr("ERROR: Can not achieve tima pwm freq=%u if fclk=%llu\n",
+ pwrerr("ERROR: Can not achieve tima pwm "
+ "freq=%" PRIu32 " if fclk=%" PRIu64 "\n",
(uint32_t)TIMA_PWM_FREQ, (uint64_t)fclk);
ret = -EINVAL;
goto errout;
@@ -454,7 +456,8 @@ static int smps_start(FAR struct smps_dev_s *dev)
per = fclk / TIMB_PWM_FREQ;
if (per > HRTIM_PER_MAX)
{
- pwrerr("ERROR: Can not achieve timb pwm freq=%u if fclk=%llu\n",
+ pwrerr("ERROR: Can not achieve timb pwm "
+ "freq=%" PRIu32 " if fclk=%" PRIu64 "\n",
(uint32_t)TIMB_PWM_FREQ, (uint64_t)fclk);
ret = -EINVAL;
goto errout;
[incubator-nuttx] 16/24: drivers/sensors/max31855.c: Fix a syslog
format
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 53a3d652b5a0dd29cf386a7413d51aaea952fadc
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:58:38 2020 +0900
drivers/sensors/max31855.c: Fix a syslog format
---
drivers/sensors/max31855.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/sensors/max31855.c b/drivers/sensors/max31855.c
index a5da993..e1c11de 100644
--- a/drivers/sensors/max31855.c
+++ b/drivers/sensors/max31855.c
@@ -45,6 +45,7 @@
#include <nuttx/config.h>
+#include <inttypes.h>
#include <stdlib.h>
#include <fixedmath.h>
#include <errno.h>
@@ -228,7 +229,7 @@ static ssize_t max31855_read(FAR struct file *filep, FAR char *buffer,
regval |= (regmsb & 0xff00) << 8;
regval |= (regmsb & 0xff) << 24;
- sninfo("Read from MAX31855 = 0x%08X\n", regval);
+ sninfo("Read from MAX31855 = 0x%08" PRIX32 "\n", regval);
/* Feed sensor data to entropy pool */
[incubator-nuttx] 07/24: arch/arm/src/nrf52/nrf52_spi.c: Fix syslog
formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 080879ffefc750e417d4e7632f1a5f0cbc188a69
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 09:30:29 2020 +0900
arch/arm/src/nrf52/nrf52_spi.c: Fix syslog formats
---
arch/arm/src/nrf52/nrf52_spi.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/nrf52/nrf52_spi.c b/arch/arm/src/nrf52/nrf52_spi.c
index 57f836b..84eee94 100644
--- a/arch/arm/src/nrf52/nrf52_spi.c
+++ b/arch/arm/src/nrf52/nrf52_spi.c
@@ -26,6 +26,7 @@
#include <errno.h>
#include <debug.h>
+#include <inttypes.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
@@ -771,7 +772,7 @@ static uint32_t nrf52_spi_setfrequency(FAR struct spi_dev_s *dev,
default:
{
- spierr("Frequency unsupported %d\n", frequency);
+ spierr("Frequency unsupported %" PRId32 "\n", frequency);
goto errout;
}
}
@@ -784,7 +785,7 @@ static uint32_t nrf52_spi_setfrequency(FAR struct spi_dev_s *dev,
priv->frequency = frequency;
- spiinfo("Frequency %d\n", frequency);
+ spiinfo("Frequency %" PRId32 "\n", frequency);
errout:
return priv->frequency;
@@ -1153,7 +1154,7 @@ static void nrf52_spi_exchange(FAR struct spi_dev_s *dev,
if (nrf52_spi_getreg(priv, NRF52_SPIM_TXDAMOUNT_OFFSET) !=
transfer_size)
{
- spierr("Incomplete transfer wrote %d expected %d\n",
+ spierr("Incomplete transfer wrote %" PRId32 " expected %d\n",
regval, nwords);
}
[incubator-nuttx] 18/24:
boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c: Appease nxstyle
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2d7e25e7e06a9080f2df956951a2baefab6fbc32
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Sat Nov 28 10:06:26 2020 +0900
boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c: Appease nxstyle
---
boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c
index 265cec0..34b4b3a 100644
--- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c
+++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c
@@ -63,7 +63,8 @@
* Name: lpc43_sspdev_initialize
*
* Description:
- * Called to configure SPI chip select GPIO pins for the Bambino-200e board.
+ * Called to configure SPI chip select GPIO pins for the Bambino-200e
+ * board.
*
****************************************************************************/