max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2219 from embassy-rs/no-concat-bytes

Browse Source 
cyw43: remove feature(concat_bytes).
This commit is contained in:
Dario Nieuwenhuis 2023-11-25 00:09:02 +00:00 committed by GitHub
commit 0ad0d27150
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cyw43/src/lib.rs
View File

@ -1,6 +1,6 @@
#![no_std] #![no_std]
#![no_main] #![no_main]
#![feature(async_fn_in_trait, type_alias_impl_trait, concat_bytes)] #![feature(async_fn_in_trait, type_alias_impl_trait)]
#![allow(stable_features, unknown_lints, async_fn_in_trait)] #![allow(stable_features, unknown_lints, async_fn_in_trait)]
#![deny(unused_must_use)] #![deny(unused_must_use)]

102
cyw43/src/nvram.rs
View File

@ -1,54 +1,48 @@
macro_rules! nvram { pub static NVRAM: &'static [u8] = b"
($($s:literal,)*) => { NVRAMRev=$Rev$\x00\
concat_bytes!($($s, b"\x00",)* b"\x00\x00") manfid=0x2d0\x00\
}; prodid=0x0727\x00\
} vendid=0x14e4\x00\
devid=0x43e2\x00\
pub static NVRAM: &'static [u8] = &*nvram!( boardtype=0x0887\x00\
b"NVRAMRev=$Rev$", boardrev=0x1100\x00\
b"manfid=0x2d0", boardnum=22\x00\
b"prodid=0x0727", macaddr=00:A0:50:b5:59:5e\x00\
b"vendid=0x14e4", sromrev=11\x00\
b"devid=0x43e2", boardflags=0x00404001\x00\
b"boardtype=0x0887", boardflags3=0x04000000\x00\
b"boardrev=0x1100", xtalfreq=37400\x00\
b"boardnum=22", nocrc=1\x00\
b"macaddr=00:A0:50:b5:59:5e", ag0=255\x00\
b"sromrev=11", aa2g=1\x00\
b"boardflags=0x00404001", ccode=ALL\x00\
b"boardflags3=0x04000000", pa0itssit=0x20\x00\
b"xtalfreq=37400", extpagain2g=0\x00\
b"nocrc=1", pa2ga0=-168,6649,-778\x00\
b"ag0=255", AvVmid_c0=0x0,0xc8\x00\
b"aa2g=1", cckpwroffset0=5\x00\
b"ccode=ALL", maxp2ga0=84\x00\
b"pa0itssit=0x20", txpwrbckof=6\x00\
b"extpagain2g=0", cckbw202gpo=0\x00\
b"pa2ga0=-168,6649,-778", legofdmbw202gpo=0x66111111\x00\
b"AvVmid_c0=0x0,0xc8", mcsbw202gpo=0x77711111\x00\
b"cckpwroffset0=5", propbw202gpo=0xdd\x00\
b"maxp2ga0=84", ofdmdigfilttype=18\x00\
b"txpwrbckof=6", ofdmdigfilttypebe=18\x00\
b"cckbw202gpo=0", papdmode=1\x00\
b"legofdmbw202gpo=0x66111111", papdvalidtest=1\x00\
b"mcsbw202gpo=0x77711111", pacalidx2g=45\x00\
b"propbw202gpo=0xdd", papdepsoffset=-30\x00\
b"ofdmdigfilttype=18", papdendidx=58\x00\
b"ofdmdigfilttypebe=18", ltecxmux=0\x00\
b"papdmode=1", ltecxpadnum=0x0102\x00\
b"papdvalidtest=1", ltecxfnsel=0x44\x00\
b"pacalidx2g=45", ltecxgcigpio=0x01\x00\
b"papdepsoffset=-30", il0macaddr=00:90:4c:c5:12:38\x00\
b"papdendidx=58", wl0id=0x431b\x00\
b"ltecxmux=0", deadman_to=0xffffffff\x00\
b"ltecxpadnum=0x0102", muxenab=0x100\x00\
b"ltecxfnsel=0x44", spurconfig=0x3\x00\
b"ltecxgcigpio=0x01", glitch_based_crsmin=1\x00\
b"il0macaddr=00:90:4c:c5:12:38", btc_mode=1\x00\
b"wl0id=0x431b", \x00";
b"deadman_to=0xffffffff",
b"muxenab=0x100",
b"spurconfig=0x3",
b"glitch_based_crsmin=1",
b"btc_mode=1",
);

1
embassy-stm32-wpan/src/lib.rs
View File

@ -4,7 +4,6 @@
any(feature = "ble", feature = "mac"), any(feature = "ble", feature = "mac"),
allow(stable_features, unknown_lints, async_fn_in_trait) allow(stable_features, unknown_lints, async_fn_in_trait)
)] )]
#![cfg_attr(feature = "mac", feature(type_alias_impl_trait, concat_bytes))]
// This must go FIRST so that all the other modules see its macros. // This must go FIRST so that all the other modules see its macros.
mod fmt; mod fmt;