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 2025/01/13 14:27:07 UTC
(mynewt-nimble) branch master updated (3eacaf562 -> cf947cd5a)
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 3eacaf562 nimble/ll: Use RPA from global local IRK on active scan
new 39b367f00 porting: Add missing include
new cf947cd5a Consistently declare min() macro before using it
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:
apps/blemesh/src/main.c | 4 ++++
apps/blestress/src/rx_stress.c | 4 ++++
apps/btshell/src/cmd.c | 4 ++++
apps/btshell/src/main.c | 4 ++++
apps/bttester/src/btp_mesh.c | 4 ++++
apps/bttester/src/bttester.c | 4 ++++
apps/bttester/src/rtt_pipe.c | 4 ++++
apps/mesh_badge/src/mesh.c | 4 ++++
apps/mesh_badge/src/reel_board.c | 4 ++++
nimble/controller/src/ble_ll_isoal.c | 4 ++++
nimble/drivers/dialog_cmac/src/ble_phy.c | 4 ++++
nimble/drivers/native/src/ble_phy.c | 4 ++++
nimble/drivers/nrf51/src/ble_phy.c | 4 ++++
nimble/drivers/nrf5x/src/ble_phy.c | 4 ++++
nimble/host/src/ble_iso.c | 4 ++++
nimble/host/src/ble_l2cap_coc.c | 4 ++++
nimble/host/test/src/ble_att_svr_test.c | 4 ++++
porting/nimble/src/os_mbuf.c | 2 +-
porting/npl/riot/include/nimble/nimble_npl_os_log.h | 1 +
19 files changed, 70 insertions(+), 1 deletion(-)
(mynewt-nimble) 02/02: Consistently declare min() macro before using it
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 cf947cd5ae3fcab858f6adcc288dd3f2630fb9db
Author: chrysn <ch...@fsfe.org>
AuthorDate: Fri Dec 27 22:48:57 2024 +0100
Consistently declare min() macro before using it
---
apps/blemesh/src/main.c | 4 ++++
apps/blestress/src/rx_stress.c | 4 ++++
apps/btshell/src/cmd.c | 4 ++++
apps/btshell/src/main.c | 4 ++++
apps/bttester/src/btp_mesh.c | 4 ++++
apps/bttester/src/bttester.c | 4 ++++
apps/bttester/src/rtt_pipe.c | 4 ++++
apps/mesh_badge/src/mesh.c | 4 ++++
apps/mesh_badge/src/reel_board.c | 4 ++++
nimble/controller/src/ble_ll_isoal.c | 4 ++++
nimble/drivers/dialog_cmac/src/ble_phy.c | 4 ++++
nimble/drivers/native/src/ble_phy.c | 4 ++++
nimble/drivers/nrf51/src/ble_phy.c | 4 ++++
nimble/drivers/nrf5x/src/ble_phy.c | 4 ++++
nimble/host/src/ble_iso.c | 4 ++++
nimble/host/src/ble_l2cap_coc.c | 4 ++++
nimble/host/test/src/ble_att_svr_test.c | 4 ++++
porting/nimble/src/os_mbuf.c | 2 +-
18 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/apps/blemesh/src/main.c b/apps/blemesh/src/main.c
index e11ceb8f5..1636bdcf1 100644
--- a/apps/blemesh/src/main.c
+++ b/apps/blemesh/src/main.c
@@ -32,6 +32,10 @@
#include "services/gap/ble_svc_gap.h"
#include "mesh/glue.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
/* Company ID */
#define CID_VENDOR 0x05C3
#define STANDARD_TEST_ID 0x00
diff --git a/apps/blestress/src/rx_stress.c b/apps/blestress/src/rx_stress.c
index 32b9ab60b..5e086733c 100644
--- a/apps/blestress/src/rx_stress.c
+++ b/apps/blestress/src/rx_stress.c
@@ -20,6 +20,10 @@
#include <host/ble_gap.h>
#include "rx_stress.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
/* UUID128 of stress test use cases*/
static uint8_t rx_stress_uuid128[STRESS_UUIDS_NUM][16];
diff --git a/apps/btshell/src/cmd.c b/apps/btshell/src/cmd.c
index ba47ee745..3380de754 100644
--- a/apps/btshell/src/cmd.c
+++ b/apps/btshell/src/cmd.c
@@ -45,6 +45,10 @@
#include "cmd_l2cap.h"
#include "cmd_leaudio.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
#define BTSHELL_MODULE "btshell"
int
diff --git a/apps/btshell/src/main.c b/apps/btshell/src/main.c
index 410fb5a45..0db012e98 100644
--- a/apps/btshell/src/main.c
+++ b/apps/btshell/src/main.c
@@ -58,6 +58,10 @@
#include "../src/ble_hs_atomic_priv.h"
#include "../src/ble_hs_priv.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
#if MYNEWT_VAL(BLE_ROLE_CENTRAL)
#define BTSHELL_MAX_SVCS 32
#define BTSHELL_MAX_CHRS 64
diff --git a/apps/bttester/src/btp_mesh.c b/apps/bttester/src/btp_mesh.c
index 2825329aa..aad7eb4ad 100644
--- a/apps/bttester/src/btp_mesh.c
+++ b/apps/bttester/src/btp_mesh.c
@@ -38,6 +38,10 @@
#include "btp/btp.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
extern uint8_t own_addr_type;
#define CONTROLLER_INDEX 0
diff --git a/apps/bttester/src/bttester.c b/apps/bttester/src/bttester.c
index d5e0399a4..fa4a82bb6 100644
--- a/apps/bttester/src/bttester.c
+++ b/apps/bttester/src/bttester.c
@@ -35,6 +35,10 @@
#include "bttester_pipe.h"
#include "btp/btp.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
#define CMD_QUEUED 2
static struct os_eventq avail_queue;
diff --git a/apps/bttester/src/rtt_pipe.c b/apps/bttester/src/rtt_pipe.c
index 4e6677092..d1a8bd4a4 100644
--- a/apps/bttester/src/rtt_pipe.c
+++ b/apps/bttester/src/rtt_pipe.c
@@ -19,6 +19,10 @@
#include "syscfg/syscfg.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
#if MYNEWT_VAL(BTTESTER_PIPE_RTT)
#include "os/mynewt.h"
diff --git a/apps/mesh_badge/src/mesh.c b/apps/mesh_badge/src/mesh.c
index ee999172b..8137ab921 100644
--- a/apps/mesh_badge/src/mesh.c
+++ b/apps/mesh_badge/src/mesh.c
@@ -11,6 +11,10 @@
#include "mesh.h"
#include "board.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
#define BT_COMP_ID_LF 0x05f1
#define MOD_LF 0x0000
diff --git a/apps/mesh_badge/src/reel_board.c b/apps/mesh_badge/src/reel_board.c
index 5e5f6b408..3cf527b9e 100644
--- a/apps/mesh_badge/src/reel_board.c
+++ b/apps/mesh_badge/src/reel_board.c
@@ -20,6 +20,10 @@
#define printk console_printf
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
enum font_size {
FONT_BIG = 0,
FONT_MEDIUM = 1,
diff --git a/nimble/controller/src/ble_ll_isoal.c b/nimble/controller/src/ble_ll_isoal.c
index bed974bb3..d23382c96 100644
--- a/nimble/controller/src/ble_ll_isoal.c
+++ b/nimble/controller/src/ble_ll_isoal.c
@@ -24,6 +24,10 @@
#include <controller/ble_ll_isoal.h>
#include <controller/ble_ll_iso_big.h>
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
#if MYNEWT_VAL(BLE_LL_ISO)
STAILQ_HEAD(ble_ll_iso_tx_q, os_mbuf_pkthdr);
diff --git a/nimble/drivers/dialog_cmac/src/ble_phy.c b/nimble/drivers/dialog_cmac/src/ble_phy.c
index 434aaa969..c077f25ff 100644
--- a/nimble/drivers/dialog_cmac/src/ble_phy.c
+++ b/nimble/drivers/dialog_cmac/src/ble_phy.c
@@ -39,6 +39,10 @@
#error LE Coded PHY cannot be enabled on DA1469x
#endif
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
/* Statistics */
STATS_SECT_START(ble_phy_stats)
STATS_SECT_ENTRY(phy_isrs)
diff --git a/nimble/drivers/native/src/ble_phy.c b/nimble/drivers/native/src/ble_phy.c
index 5969dff1b..e1d2e4aa7 100644
--- a/nimble/drivers/native/src/ble_phy.c
+++ b/nimble/drivers/native/src/ble_phy.c
@@ -28,6 +28,10 @@
#include "controller/ble_phy.h"
#include "controller/ble_ll.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
/* BLE PHY data structure */
struct ble_phy_obj
{
diff --git a/nimble/drivers/nrf51/src/ble_phy.c b/nimble/drivers/nrf51/src/ble_phy.c
index c3a523dce..955db6351 100644
--- a/nimble/drivers/nrf51/src/ble_phy.c
+++ b/nimble/drivers/nrf51/src/ble_phy.c
@@ -47,6 +47,10 @@
#error LE Coded PHY cannot be enabled on nRF51
#endif
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
static uint32_t
ble_phy_mode_pdu_start_off(int phy_mode)
{
diff --git a/nimble/drivers/nrf5x/src/ble_phy.c b/nimble/drivers/nrf5x/src/ble_phy.c
index f556f6502..3deec7dd6 100644
--- a/nimble/drivers/nrf5x/src/ble_phy.c
+++ b/nimble/drivers/nrf5x/src/ble_phy.c
@@ -56,6 +56,10 @@
#include <nrf_erratas.h>
#include "phy_priv.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
#if !MYNEWT_VAL_CHOICE(MCU_TARGET, nRF52840) && \
!MYNEWT_VAL_CHOICE(MCU_TARGET, nRF52811) && \
diff --git a/nimble/host/src/ble_iso.c b/nimble/host/src/ble_iso.c
index 7e78cc960..600e7ed5b 100644
--- a/nimble/host/src/ble_iso.c
+++ b/nimble/host/src/ble_iso.c
@@ -30,6 +30,10 @@
#include "ble_hs_hci_priv.h"
#include "ble_hs_mbuf_priv.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
#define ble_iso_big_conn_handles_init(_big, _handles, _num_handles) \
do { \
struct ble_iso_conn *conn = SLIST_FIRST(&ble_iso_conns); \
diff --git a/nimble/host/src/ble_l2cap_coc.c b/nimble/host/src/ble_l2cap_coc.c
index d4cb15f97..3a483c751 100644
--- a/nimble/host/src/ble_l2cap_coc.c
+++ b/nimble/host/src/ble_l2cap_coc.c
@@ -25,6 +25,10 @@
#include "ble_l2cap_coc_priv.h"
#include "ble_l2cap_sig_priv.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) != 0 && NIMBLE_BLE_CONNECT
#ifndef min
diff --git a/nimble/host/test/src/ble_att_svr_test.c b/nimble/host/test/src/ble_att_svr_test.c
index 84394d6a5..95b5eec67 100644
--- a/nimble/host/test/src/ble_att_svr_test.c
+++ b/nimble/host/test/src/ble_att_svr_test.c
@@ -27,6 +27,10 @@
#include "host/ble_l2cap.h"
#include "ble_hs_test_util.h"
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
static uint8_t *ble_att_svr_test_attr_r_1;
static uint16_t ble_att_svr_test_attr_r_1_len;
static uint8_t *ble_att_svr_test_attr_r_2;
diff --git a/porting/nimble/src/os_mbuf.c b/porting/nimble/src/os_mbuf.c
index 796a85375..6d84be1f4 100644
--- a/porting/nimble/src/os_mbuf.c
+++ b/porting/nimble/src/os_mbuf.c
@@ -1273,4 +1273,4 @@ os_mbuf_pack_chains(struct os_mbuf *m1, struct os_mbuf *m2)
}
return m1;
-}
\ No newline at end of file
+}
(mynewt-nimble) 01/02: porting: Add missing include
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 39b367f0033f852eabf34d44304bea106db86a5b
Author: chrysn <ch...@fsfe.org>
AuthorDate: Tue Dec 24 02:53:56 2024 +0100
porting: Add missing include
---
porting/npl/riot/include/nimble/nimble_npl_os_log.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/porting/npl/riot/include/nimble/nimble_npl_os_log.h b/porting/npl/riot/include/nimble/nimble_npl_os_log.h
index 91c804754..f585070da 100644
--- a/porting/npl/riot/include/nimble/nimble_npl_os_log.h
+++ b/porting/npl/riot/include/nimble/nimble_npl_os_log.h
@@ -21,6 +21,7 @@
#define _NIMBLE_NPL_OS_LOG_H_
#include <stdarg.h>
+#include <stdio.h>
/* Example on how to use macro to generate module logging functions */
#define BLE_NPL_LOG_IMPL(lvl) \