You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2023/02/08 15:12:24 UTC
[mynewt-nimble] branch master updated (674eeafa -> 69c0d323)
This is an automated email from the ASF dual-hosted git repository.
janc pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
from 674eeafa nimble/ports: Refresh syscfg
new 65e774e1 nimble/transport: Fix compilation warning in socket transpor
new 69c0d323 porting: Fix SYSINIT_PANIC_ASSERT_MSG refinition warning
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:
nimble/transport/socket/src/ble_hci_socket.c | 2 +-
porting/npl/linux/include/nimble/nimble_npl_os.h | 7 -------
porting/npl/nuttx/include/nimble/nimble_npl_os.h | 7 -------
3 files changed, 1 insertion(+), 15 deletions(-)
[mynewt-nimble] 01/02: nimble/transport: Fix compilation warning in socket transpor
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 65e774e1040edba8dc95662424ab5832253b1a70
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon Feb 6 16:33:06 2023 +0800
nimble/transport: Fix compilation warning in socket transpor
ble_hci_socket.c:359:5: warning: implicit declaration of function ‘ble_hci_trans_buf_free’
change ble_hci_trans_buf_free to ble_transport_free
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
nimble/transport/socket/src/ble_hci_socket.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nimble/transport/socket/src/ble_hci_socket.c b/nimble/transport/socket/src/ble_hci_socket.c
index 5dd1d17d..059bf4a9 100644
--- a/nimble/transport/socket/src/ble_hci_socket.c
+++ b/nimble/transport/socket/src/ble_hci_socket.c
@@ -356,7 +356,7 @@ ble_hci_sock_cmdevt_tx(uint8_t *hci_ev, uint8_t h4_type)
(struct sockaddr *)&addr, sizeof(struct sockaddr_hci));
free(buf);
- ble_hci_trans_buf_free(hci_ev);
+ ble_transport_free(hci_ev);
if (i != len + 1) {
if (i < 0) {
dprintf(1, "sendto() failed : %d\n", errno);
[mynewt-nimble] 02/02: porting: Fix SYSINIT_PANIC_ASSERT_MSG refinition warning
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 69c0d323a9e85d19d523c67c7addaa9bee778dac
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon Feb 6 16:51:03 2023 +0800
porting: Fix SYSINIT_PANIC_ASSERT_MSG refinition warning
porting/npl/nuttx/include/nimble/nimble_npl_os.h:40: warning: "SYSINIT_PANIC_ASSERT_MSG" redefined
40 | #define SYSINIT_PANIC_ASSERT_MSG(rc, msg) do \
|
nimble/host/services/tps/src/ble_svc_tps.c:22:
porting/nimble/include/sysinit/sysinit.h:32: note: this is the location of the previous definition
32 | #define SYSINIT_PANIC_ASSERT_MSG(rc, msg) assert(rc)
|
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
porting/npl/linux/include/nimble/nimble_npl_os.h | 7 -------
porting/npl/nuttx/include/nimble/nimble_npl_os.h | 7 -------
2 files changed, 14 deletions(-)
diff --git a/porting/npl/linux/include/nimble/nimble_npl_os.h b/porting/npl/linux/include/nimble/nimble_npl_os.h
index 585d3785..17e61b22 100644
--- a/porting/npl/linux/include/nimble/nimble_npl_os.h
+++ b/porting/npl/linux/include/nimble/nimble_npl_os.h
@@ -37,13 +37,6 @@ extern "C" {
#define SYSINIT_PANIC_MSG(msg) __assert_fail(msg, __FILE__, __LINE__, __func__)
-#define SYSINIT_PANIC_ASSERT_MSG(rc, msg) do \
-{ \
- if (!(rc)) { \
- SYSINIT_PANIC_MSG(msg); \
- } \
-} while (0)
-
#ifdef __cplusplus
}
#endif
diff --git a/porting/npl/nuttx/include/nimble/nimble_npl_os.h b/porting/npl/nuttx/include/nimble/nimble_npl_os.h
index 0f765f5a..a2fcbc42 100644
--- a/porting/npl/nuttx/include/nimble/nimble_npl_os.h
+++ b/porting/npl/nuttx/include/nimble/nimble_npl_os.h
@@ -37,13 +37,6 @@ extern "C" {
#define SYSINIT_PANIC_MSG(msg) { fprintf(stderr, "%s\n", msg); abort(); }
-#define SYSINIT_PANIC_ASSERT_MSG(rc, msg) do \
-{ \
- if (!(rc)) { \
- SYSINIT_PANIC_MSG(msg); \
- } \
-} while (0)
-
#ifdef __cplusplus
}
#endif