You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/12/25 20:07:16 UTC

[incubator-nuttx] branch master updated (e1c53ea -> f508d80)

This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.


    from e1c53ea  arch/sim/include/irq.h: Make 32-bit xcpt_reg_t unsigned
     new b83ae99  rpmsg_uart: fix compile break when enable rptun
     new f508d80  signal: fix compile break in c++

The 2 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/sim/src/sim/up_rptun.c | 2 ++
 include/nuttx/signal.h      | 9 +++++++++
 2 files changed, 11 insertions(+)


[incubator-nuttx] 02/02: signal: fix compile break in c++

Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit f508d80c3dcfd85b157b0f0350ec7c42244984ed
Author: dongjiuzhu <do...@xiaomi.com>
AuthorDate: Fri Nov 27 15:39:10 2020 +0800

    signal: fix compile break in c++
    
    nuttx.rel: In function `__metal_sleep_usec':
    nuttx/include/metal/system/nuttx/sleep.h:27: undefined reference to `nxsig_usleep(unsigned int)'
    collect2: error: ld returned 1 exit status
    
    Change-Id: I9dd2ed0a72d144bb152dc3753e7f9a6695dfb2d4
    Signed-off-by: dongjiuzhu <do...@xiaomi.com>
---
 include/nuttx/signal.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/nuttx/signal.h b/include/nuttx/signal.h
index f8f80d3..04e38ca 100644
--- a/include/nuttx/signal.h
+++ b/include/nuttx/signal.h
@@ -54,6 +54,11 @@ struct sigwork_s
   sigev_notify_function_t func; /* Notification function */
 };
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
@@ -556,4 +561,8 @@ void nxsig_cancel_notification(FAR struct sigwork_s *work);
   #define nxsig_cancel_notification(work) (void)(work)
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __INCLUDE_NUTTX_SIGNAL_H */


[incubator-nuttx] 01/02: rpmsg_uart: fix compile break when enable rptun

Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit b83ae99456fd704b7c6acd8ead9be5ad6e3ecf31
Author: dongjiuzhu <do...@xiaomi.com>
AuthorDate: Fri Dec 25 10:44:40 2020 +0800

    rpmsg_uart: fix compile break when enable rptun
    
    nuttx.rel: In function `rpmsg_serialinit':
    nuttx/arch/sim/src/sim/up_rptun.c:257: undefined reference to `uart_rpmsg_init'
    collect2: error: ld returned 1 exit status
    Makefile:310: recipe for target 'nuttx' failed
    
    Change-Id: I93a20941bc07f749165dc8f012da46ddb7b02b00
    Signed-off-by: dongjiuzhu <do...@xiaomi.com>
---
 arch/sim/src/sim/up_rptun.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/sim/src/sim/up_rptun.c b/arch/sim/src/sim/up_rptun.c
index fd9ab2a..57c3ff5 100644
--- a/arch/sim/src/sim/up_rptun.c
+++ b/arch/sim/src/sim/up_rptun.c
@@ -248,6 +248,7 @@ int up_rptun_init(void)
   return 0;
 }
 
+#if CONFIG_RPMSG_UART
 void rpmsg_serialinit(void)
 {
 #if CONFIG_SIM_RPTUN_MASTER
@@ -256,3 +257,4 @@ void rpmsg_serialinit(void)
   uart_rpmsg_init("server", "proxy", 4096, true);
 #endif
 }
+#endif