Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Zephyr 4.0.0 and Zblue 3.0.1 rebase #6

Merged
merged 147 commits into from
Jan 13, 2025
Merged

Merge Zephyr 4.0.0 and Zblue 3.0.1 rebase #6

merged 147 commits into from
Jan 13, 2025

Conversation

Frozen935
Copy link
Contributor

Summary

Merge Zephyr 4.0.0 and Zblue 3.0.1 rebase.

Impact

N/A.

Testing

CI.

anchao and others added 30 commits January 10, 2025 16:25
@anchao @Frozen935
zBlue/porting: refine porting layer
74944e6 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
Revert "Bluetooth: host: Fix resume advertiser race condition"
5a324b8 
This reverts commit 52f9c0d.

Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue: full optimization for sim
c373526 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
Bluetooth: Mesh: Fix tx seg buffer with NULL pointer reference
9da2843 
Fix tx seg buffer with NULL pointer reference if enable mesh friendly

Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/port: configurable sample stack size
2ef8e5d 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/port: add fs/settings symbol link
034aad7 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
port/zblue: add zephyr mutex adapter
0520552 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/port: enable bt settings file
0845630 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/port: refine k_poll and fix some minor issues
936551b 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/port: refine k_poll again
690307f 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/port/kernel: fix memory leak
a34e2a0 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/shell: add bluetooth shell support
675b57c 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/shell: add bredr/gatt/l2cap/mesh/rfcomm/ticker into shell list
295a1da 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
external/zblue: remove duplicate file source
a6fc195 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
port/shell: fix build break on custom platform
f27e037 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/port: do symbol link dynamically
d3d659b 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
Revert "Revert "Bluetooth: host: Fix resume advertiser race condition""
5ea8c29 
This reverts commit 1e0f5dd3314570cc15ffc102b75638deaa003c63.
@anchao @Frozen935
zblue/port: sync with mainline change
4d287e8 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/port: sync with mainline change
755a26b 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/port: bluetooth profile tuning suite tester
7d0b096 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
amebaZ/ameba: add some delay before command push
ca4fd14 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/port: add panic handler
ef2e9f2 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/driver: unified the h4 drvier
d3f4d6b 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/port: option to support stack early initialize
bcad9ea 
Signed-off-by: chao.an <anchao@xiaomi.com>
@xiaoxiang781216 @Frozen935
Update the copyright
14dc34f 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
@anchao @Frozen935
zblue/port: remove the export include to avoid conflicts
9d6caa7 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue: add "zblue" to initialize the stack
a7fba9b 
Signed-off-by: chao.an <anchao@xiaomi.com>
@liuguo09 @Frozen935
Add include <sys/time.h> to fix build break
5274d14 
N/A

Signed-off-by: liuhaitao <liuhaitao@xiaomi.com>
@anchao @Frozen935
zblue: fix invalid module define
38fe9fb 
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @Frozen935
zblue/hci: add option BT_QUIRK_NO_RESET into Kconfig
d727876 
Signed-off-by: chao.an <anchao@xiaomi.com>
Yuanjiawei1234 and others added 24 commits January 10, 2025 16:34
@Yuanjiawei1234 @Frozen935
add mible timer men
d80a2a0 
Signed-off-by: yuanjiawei <yuanjiawei@xiaomi.com>
@LingaoM @Frozen935
Bluetooth: Mesh: Discard iv update 1 0 --> 1 1
2ceb0dc 
According spec, for the same iv index, iv update flag
should trans to false, when iv update procedure complete.

When local environment has attack-node
to store old network beacon(1,1), and re-send same
network beacon(1,1) after 192hours, will cause whole
bluetooth mesh network broke.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
@Frozen935
fix ci compile worring
3b1ca81 
Signed-off-by: fulianfa1 <fulianfa1@xiaomi.com>
@Frozen935
use bt_disable need func k_thread_abort
205fc79 
Signed-off-by: cuiyunlong <cuiyunlong@xiaomi.com>
@LingaoM @Frozen935
fix -lto warning
f18a4c7 
Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
@Frozen935
fix compile error when open CONFIG_SMP
124b9b6 
Signed-off-by: fulianfa1 <fulianfa1@xiaomi.com>
@anchao @Frozen935
zblue/thread: update nxtask_init() prototype
7d704d4 
Signed-off-by: chao an <anchao@xiaomi.com>
@hujun260 @Frozen935
zblue: sched_lock should not be called in irq
be88faf 
Signed-off-by: hujun5 <hujun5@xiaomi.com>
@Frozen935
Add new config for mesh scan windows and interval
30a9909 
Signed-off-by: fulianfa1 <fulianfa1@xiaomi.com>
@Frozen935
fix link redeclared as different kind of symbol
9540719 
Signed-off-by: fulianfa1 <fulianfa1@xiaomi.com>
@Frozen935
report iv index to common when iv update
43ac8f6 
Signed-off-by: fulianfa1 <fulianfa1@xiaomi.com>
@Frozen935
port/Kconfig: modify CONFIG_FLASH_MAP Dependency
2370890 
Signed-off-by: fulianfa1 <fulianfa1@xiaomi.com>
@Frozen935
thread.c: Pinlock cpu0 for CONFIG_SMP
2224824 
Signed-off-by: fulianfa1 <fulianfa1@xiaomi.com>
@Frozen935
h4.c: add mutex when open CONFIG_SMP
c968571 
Signed-off-by: fulianfa1 <fulianfa1@xiaomi.com>
@Frozen935
[zblue/port] fix bug:param be redefined
c74fc82 
Signed-off-by: wangzhi7 <wangzhi7@xiaomi.com>
@chengkai15 @Frozen935
h4.c: show bt driver reason code when sending hci error
a7cbf0e 
Signed-off-by: chengkai <chengkai@xiaomi.com>
@more36 @Frozen935
Fixed an error in the if condition
f7f56d4 
Signed-off-by: duqunbo <duqunbo@xiaomi.com>
@Frozen935
fix"Overflow constant in pb_adv.c"
6ec8789 
Signed-off-by: fulianfa1 <fulianfa1@xiaomi.com>
@Frozen935
remove build warning
2273503 
Signed-off-by: fulianfa1 <fulianfa1@xiaomi.com>
@Frozen935
port: update BT_USERCHAN and ARCH_SIM dependencies
ccff555 
fix userchan.c build error

Signed-off-by: fangzhenwei <fangzhenwei@xiaomi.com>
@Frozen935
port: fix SRAM_SIZE defined with multiple types, remove zblue depende…
8b3934a 
…ncies

bug: v/40753

warning: SRAM_SIZE (defined at arch/dummy/Kconfig:135, ../apps/external/zblue/zblue/port/Kconfig.zephyr:76) defined with multiple types, int will be used
warning: the int symbol SRAM_SIZE (defined at arch/dummy/Kconfig:135, ../apps/external/zblue/zblue/port/Kconfig.zephyr:76) has a non-int default 0x1C000 (undefined)

Signed-off-by: fangzhenwei <fangzhenwei@xiaomi.com>
@Frozen935
port:add NET_BUF_VARIABLE config, disable net buf variable define by …
5b4d62a 
…default

bug: v/40753

/usr/bin/ld: nuttx.rel: in function `mem_pool_data_alloc':
/home/frozen/work/coding/vela/dev/external/zblue/zblue/subsys/net/buf.c:122: undefined reference to `k_heap_alloc'
/usr/bin/ld: nuttx.rel: in function `mem_pool_data_unref':
/home/frozen/work/coding/vela/dev/external/zblue/zblue/subsys/net/buf.c:147: undefined reference to `k_heap_free'

Signed-off-by: fangzhenwei <fangzhenwei@xiaomi.com>
@Frozen935
zblue: fix esp32 build waring
5c99f02 
bug: v/42205

subsys/bluetooth/host/smp.c: In function 'sc_send_public_key':
subsys/bluetooth/host/smp.c:3144:9: error: 'memcpy' offset [0, 31] is out of the bounds [0, 0] [-Werror=array-bounds]
 3144 |         memcpy(req->y, &sc_public_key[32], sizeof(req->y));
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: fangzhenwei <fangzhenwei@xiaomi.com>
@Frozen935
port: add config ZEPHYR_WORK_ON_USERSPACE
43cb28d 
bug: v/42708

1. let ZEPHYR_WORK_ON_USERSPACE decide k_thread_create implementation.
2. use pthread_create replace nxthread_create when work at usersapce.

Signed-off-by: fangzhenwei <fangzhenwei@xiaomi.com>
@CLAassistant
Copy link

CLAassistant commented Jan 10, 2025 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 11 committers have signed the CLA.

✅ Frozen935
✅ hujun260
✅ more36
✅ chengkai15
✅ anchao
❌ PavelVPV
❌ nvlsianpu
❌ LingaoM
❌ jdascenzio
❌ Yuanjiawei1234
❌ Damian-Nordic
You have signed the CLA already but the status is still pending? Let us recheck it.

@Frozen935 Frozen935 marked this pull request as ready for review January 10, 2025 08:56
@hyson710 hyson710 added the enhancement New feature or request label Jan 10, 2025
@Frozen935 Frozen935 requested a review from hyson710 January 13, 2025 01:59
@pengxianghao21 pengxianghao21 merged commit 69aecba into open-vela:dev-upgrade-4.0.0 Jan 13, 2025
10 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hyson710 hyson710 Awaiting requested review from hyson710 hyson710 is a code owner

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.