You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/11/06 20:18:38 UTC
[incubator-nuttx] branch master updated (12f57bd9b2 -> d5fe952b17)
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from 12f57bd9b2 tools:fix some error use of shell command in Windows native build
new 819eeefc60 Fix chip/lc823450_sdc.c:282:33: error: format specifies type 'long' but the argument has type 'uint32_t' (aka 'unsigned int')
new 206e2a8eec arm/lc823450: Fix error: unknown pragma ignored
new bc04edecc1 Fix undefined reference to `tmp' in function `load_kernel.constprop.0':
new 7c88ef1e6a Fix lc823450_i2s.c:277:7: error: variable 'n' is used uninitialized whenever switch default is taken
new 6063749a3c Fix Error: chip/lpc43_usb0dev.c:905:20: error: unused function 'lpc43_abortrequest'
new 69dea8d329 Fix Error: chip/lpc43_usb0dev.c:905:20: error: unused function 'lpc43_abortrequest'
new 27a7ff41b5 Fix Error: chip/lpc54_serial.c:1199:24: error: use of logical '&&' with constant operand
new d5fe952b17 Fix Error: chip/lpc54_emc.c:421:12: error: explicitly assigning value of variable of type 'uint32_t' (aka 'unsigned int') to itself
The 8 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/lc823450/lc823450_cpustart.c | 2 --
arch/arm/src/lc823450/lc823450_i2s.c | 6 +++---
arch/arm/src/lc823450/lc823450_ipl2.c | 13 ++++---------
arch/arm/src/lc823450/lc823450_sdc.c | 6 +++---
arch/arm/src/lpc43xx/lpc43_serial.c | 2 ++
arch/arm/src/lpc43xx/lpc43_usb0dev.c | 26 --------------------------
arch/arm/src/lpc54xx/lpc54_emc.c | 4 ++--
arch/arm/src/lpc54xx/lpc54_serial.c | 2 +-
8 files changed, 15 insertions(+), 46 deletions(-)
[incubator-nuttx] 07/08: Fix Error: chip/lpc54_serial.c:1199:24: error: use of logical '&&' with constant operand
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 27a7ff41b525f7d699e6d62d417554d8b50ba637
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Nov 4 18:20:05 2022 +0800
Fix Error: chip/lpc54_serial.c:1199:24: error: use of logical '&&' with constant operand
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/lpc54xx/lpc54_serial.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/lpc54xx/lpc54_serial.c b/arch/arm/src/lpc54xx/lpc54_serial.c
index 5c0de41abf..82145c0399 100644
--- a/arch/arm/src/lpc54xx/lpc54_serial.c
+++ b/arch/arm/src/lpc54xx/lpc54_serial.c
@@ -1196,7 +1196,7 @@ static int lpc54_receive(struct uart_dev_s *dev, unsigned int *status)
if (status)
{
- *status = fiford && ~USART_FIFORD_RXDATA_MASK;
+ *status = fiford & ~USART_FIFORD_RXDATA_MASK;
}
/* Then return the actual received data. */
[incubator-nuttx] 01/08: Fix chip/lc823450_sdc.c:282:33: error: format specifies type 'long' but the argument has type 'uint32_t' (aka 'unsigned int')
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 819eeefc60c9ce557612818ead41b8542303a819
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Nov 4 18:08:42 2022 +0800
Fix chip/lc823450_sdc.c:282:33: error: format specifies type 'long' but the argument has type 'uint32_t' (aka 'unsigned int')
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/lc823450/lc823450_sdc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/lc823450/lc823450_sdc.c b/arch/arm/src/lc823450/lc823450_sdc.c
index 81238c20a8..7396903e02 100644
--- a/arch/arm/src/lc823450/lc823450_sdc.c
+++ b/arch/arm/src/lc823450/lc823450_sdc.c
@@ -279,7 +279,7 @@ int lc823450_sdc_finalize(uint32_t ch)
{
int ret;
- mcinfo("++++ start ch=%ld\n", ch);
+ mcinfo("++++ start ch=%" PRId32 "\n", ch);
ret = nxmutex_lock(&_sdc_lock[ch]);
if (ret >= 0)
@@ -331,8 +331,8 @@ int lc823450_sdc_setclock(uint32_t ch, uint32_t limitclk, uint32_t sysclk)
{
int ret;
- mcinfo("++++ start ch=%ld limitClk=%ld sysClk=%ld\n",
- ch, limitclk, sysclk);
+ mcinfo("++++ start ch=%" PRId32 " limitClk=%" PRId32
+ " sysClk=%" PRId32 "\n", ch, limitclk, sysclk);
ret = nxmutex_lock(&_sdc_lock[ch]);
if (ret >= 0)
[incubator-nuttx] 04/08: Fix lc823450_i2s.c:277:7: error: variable 'n' is used uninitialized whenever switch default is taken
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 7c88ef1e6ae8a5540bfc99fb2d7a3289bd6cb8a0
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Nov 4 18:14:05 2022 +0800
Fix lc823450_i2s.c:277:7: error: variable 'n' is used uninitialized whenever switch default is taken
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/lc823450/lc823450_i2s.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/lc823450/lc823450_i2s.c b/arch/arm/src/lc823450/lc823450_i2s.c
index 7b3f2d770e..48af12ccb1 100644
--- a/arch/arm/src/lc823450/lc823450_i2s.c
+++ b/arch/arm/src/lc823450/lc823450_i2s.c
@@ -257,10 +257,10 @@ extern unsigned int XT1OSC_CLK;
static void _setup_audio_pll(uint32_t freq)
{
- DEBUGASSERT(24000000 == XT1OSC_CLK);
+ uint32_t m = 0;
+ uint32_t n = 0;
- uint32_t m;
- uint32_t n;
+ DEBUGASSERT(24000000 == XT1OSC_CLK);
switch (freq)
{
[incubator-nuttx] 06/08: Fix Error: chip/lpc43_usb0dev.c:905:20: error: unused function 'lpc43_abortrequest'
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 69dea8d329b3c66a37bd34ece8904f6699b65e34
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Nov 4 18:18:42 2022 +0800
Fix Error: chip/lpc43_usb0dev.c:905:20: error: unused function 'lpc43_abortrequest'
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/lpc43xx/lpc43_serial.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c
index 05f7bc6171..13904d2054 100644
--- a/arch/arm/src/lpc43xx/lpc43_serial.c
+++ b/arch/arm/src/lpc43xx/lpc43_serial.c
@@ -443,11 +443,13 @@ static inline void up_disableuartint(struct up_dev_s *priv, uint32_t *ier)
* Name: up_restoreuartint
****************************************************************************/
+#ifdef HAVE_SERIAL_CONSOLE
static inline void up_restoreuartint(struct up_dev_s *priv, uint32_t ier)
{
priv->ier |= ier & UART_IER_ALLIE;
up_serialout(priv, LPC43_UART_IER_OFFSET, priv->ier);
}
+#endif
/****************************************************************************
* Name: up_enablebreaks
[incubator-nuttx] 03/08: Fix undefined reference to `tmp' in function `load_kernel.constprop.0':
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit bc04edecc1f7347d91772d112d1f644ffaf474ce
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Nov 4 23:20:52 2022 +0800
Fix undefined reference to `tmp' in function `load_kernel.constprop.0':
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/lc823450/lc823450_ipl2.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/arch/arm/src/lc823450/lc823450_ipl2.c b/arch/arm/src/lc823450/lc823450_ipl2.c
index 8dbd1635d4..e32c6d9951 100644
--- a/arch/arm/src/lc823450/lc823450_ipl2.c
+++ b/arch/arm/src/lc823450/lc823450_ipl2.c
@@ -109,7 +109,6 @@ static struct
****************************************************************************/
static char copybuf[512];
-static void *tmp;
/****************************************************************************
* Private Functions
@@ -265,8 +264,7 @@ err:
static void load_kernel(const char *name, const char *devname)
{
int i;
-
- tmp = (void *)0x02040000;
+ void *tmp = (void *)0x02040000;
blk_read(tmp, 512 * 1024, devname, 0);
@@ -287,10 +285,9 @@ static void load_kernel(const char *name, const char *devname)
__asm__ __volatile__
(
- "ldr r0, =tmp\n"
- "ldr r1, [r0, #0]\n" /* r1 = 0x02040000 */
- "ldr sp, [r1, #0]\n" /* set sp */
- "ldr pc, [r1, #4]" /* set pc, start nuttx */
+ "ldr sp, [%0, #0]\n" /* set sp */
+ "ldr pc, [%0, #4]" /* set pc, start nuttx */
+ : : "r"(tmp)
);
}
[incubator-nuttx] 08/08: Fix Error: chip/lpc54_emc.c:421:12: error: explicitly assigning value of variable of type 'uint32_t' (aka 'unsigned int') to itself
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d5fe952b1771ef2cd74bc6fdb026a6660816a2f0
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Nov 4 18:41:44 2022 +0800
Fix Error: chip/lpc54_emc.c:421:12: error: explicitly assigning value of variable of type 'uint32_t' (aka 'unsigned int') to itself
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/lpc54xx/lpc54_emc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/lpc54xx/lpc54_emc.c b/arch/arm/src/lpc54xx/lpc54_emc.c
index 85b6183f5c..8cf65d4ad5 100644
--- a/arch/arm/src/lpc54xx/lpc54_emc.c
+++ b/arch/arm/src/lpc54xx/lpc54_emc.c
@@ -418,7 +418,6 @@ void lpc54_emc_sdram_initialize(
/* Set the right mode setting value. */
data = *(volatile uint32_t *)addr;
- data = data;
}
if (config->dyndev)
@@ -445,7 +444,6 @@ void lpc54_emc_sdram_initialize(
/* Set the right mode setting value. */
data = *(volatile uint32_t *)addr;
- data = data;
}
}
@@ -468,6 +466,8 @@ void lpc54_emc_sdram_initialize(
regval |= EMC_DYNCONFIG_B;
putreg32(regval, regaddr);
}
+
+ UNUSED(data);
}
#endif /* CONFIG_LPC54_EMC_DYNAMIC */
[incubator-nuttx] 05/08: Fix Error: chip/lpc43_usb0dev.c:905:20: error: unused function 'lpc43_abortrequest'
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6063749a3ce8fb63515562a257c7eb2a47eef499
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Nov 4 18:16:24 2022 +0800
Fix Error: chip/lpc43_usb0dev.c:905:20: error: unused function 'lpc43_abortrequest'
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/lpc43xx/lpc43_usb0dev.c | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
index 80b85a6902..f43e147c65 100644
--- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c
+++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
@@ -377,8 +377,6 @@ static inline void lpc43_set_address(struct lpc43_usbdev_s *priv,
static void lpc43_flushep(struct lpc43_ep_s *privep);
static int lpc43_progressep(struct lpc43_ep_s *privep);
-static inline void lpc43_abortrequest(struct lpc43_ep_s *privep,
- struct lpc43_req_s *privreq, int16_t result);
static void lpc43_reqcomplete(struct lpc43_ep_s *privep,
struct lpc43_req_s *privreq, int16_t result);
@@ -894,30 +892,6 @@ static int lpc43_progressep(struct lpc43_ep_s *privep)
return OK;
}
-/****************************************************************************
- * Name: lpc43_abortrequest
- *
- * Description:
- * Discard a request
- *
- ****************************************************************************/
-
-static inline void lpc43_abortrequest(struct lpc43_ep_s *privep,
- struct lpc43_req_s *privreq,
- int16_t result)
-{
- usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_REQABORTED),
- (uint16_t)privep->epphy);
-
- /* Save the result in the request structure */
-
- privreq->req.result = result;
-
- /* Callback to the request completion handler */
-
- privreq->req.callback(&privep->ep, &privreq->req);
-}
-
/****************************************************************************
* Name: lpc43_reqcomplete
*
[incubator-nuttx] 02/08: arm/lc823450: Fix error: unknown pragma ignored
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 206e2a8eec2d2f6049c80c25618792d4e44051c9
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Nov 4 18:11:54 2022 +0800
arm/lc823450: Fix error: unknown pragma ignored
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/lc823450/lc823450_cpustart.c | 2 --
arch/arm/src/lc823450/lc823450_ipl2.c | 2 --
2 files changed, 4 deletions(-)
diff --git a/arch/arm/src/lc823450/lc823450_cpustart.c b/arch/arm/src/lc823450/lc823450_cpustart.c
index 5595d72b1c..cdc3575f78 100644
--- a/arch/arm/src/lc823450/lc823450_cpustart.c
+++ b/arch/arm/src/lc823450/lc823450_cpustart.c
@@ -18,8 +18,6 @@
*
****************************************************************************/
-#pragma GCC optimize ("O0")
-
/****************************************************************************
* Included Files
****************************************************************************/
diff --git a/arch/arm/src/lc823450/lc823450_ipl2.c b/arch/arm/src/lc823450/lc823450_ipl2.c
index 3ce9aebc60..8dbd1635d4 100644
--- a/arch/arm/src/lc823450/lc823450_ipl2.c
+++ b/arch/arm/src/lc823450/lc823450_ipl2.c
@@ -85,8 +85,6 @@
# define FORCE_USBBOOT_CHARGER
#endif
-#pragma GCC optimize ("O0")
-
/****************************************************************************
* Private Types
****************************************************************************/