Skip to content

Commit b9f6958

Browse files
dancrossnycdancrossnyc
committed
stable: build with stable Rust
Signed-off-by: Dan Cross <[email protected]>
1 parent 2b90262 commit b9f6958

File tree

2 files changed

+87
-1
lines changed

2 files changed

+87
-1
lines changed

‎rust-toolchain.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
[toolchain]
2-
channel = "nightly-2025-04-17"
32
components = [ "rustfmt", "rust-src", "rust-analyzer" ]

‎src/ondisk.rs

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,6 +1330,7 @@ make_bitfield_serde! {
13301330
#[repr(u8)]
13311331
#[derive(Copy, Clone)]
13321332
pub struct PriorityLevels {
1333+
#[bits = 1]
13331334
pub hard_force || #[serde(default)] bool : bool | pub get bool : pub set bool,
13341335
pub high || #[serde(default)] bool : bool | pub get bool : pub set bool,
13351336
pub medium || #[serde(default)] bool : bool | pub get bool : pub set bool,
@@ -1421,21 +1422,37 @@ make_bitfield_serde! {
14211422
#[repr(u16)]
14221423
#[derive(Default, Debug, Copy, Clone, PartialEq, Eq)]
14231424
pub struct BoardInstances {
1425+
#[bits = 1]
14241426
pub instance_0 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1427+
#[bits = 1]
14251428
pub instance_1 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1429+
#[bits = 1]
14261430
pub instance_2 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1431+
#[bits = 1]
14271432
pub instance_3 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1433+
#[bits = 1]
14281434
pub instance_4 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1435+
#[bits = 1]
14291436
pub instance_5 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1437+
#[bits = 1]
14301438
pub instance_6 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1439+
#[bits = 1]
14311440
pub instance_7 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1441+
#[bits = 1]
14321442
pub instance_8 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1443+
#[bits = 1]
14331444
pub instance_9 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1445+
#[bits = 1]
14341446
pub instance_10 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1447+
#[bits = 1]
14351448
pub instance_11 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1449+
#[bits = 1]
14361450
pub instance_12 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1451+
#[bits = 1]
14371452
pub instance_13 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1453+
#[bits = 1]
14381454
pub instance_14 || #[serde(default)] bool : bool | pub get bool : pub set bool,
1455+
#[bits = 1]
14391456
pub instance_15 || #[serde(default)] bool : bool | pub get bool : pub set bool,
14401457
}
14411458
}
@@ -1581,7 +1598,9 @@ pub mod gnb {
15811598
Clone, Copy, Debug, PartialEq, //BitfieldSpecifier,
15821599
)]
15831600
pub struct EarlyPcieConfigBody {
1601+
#[bits = 8]
15841602
pub start_lane || u8 : B8, // (0xFF)
1603+
#[bits = 8]
15851604
pub end_lane || u8 : B8, // (0xFF=UNUSED_LANE if descriptor is unused)
15861605
#[bits = 2]
15871606
pub socket || u8 : B2,
@@ -1591,11 +1610,17 @@ pub mod gnb {
15911610
pub link_speed: EarlyPcieLinkSpeed | pub get EarlyPcieLinkSpeed : pub set EarlyPcieLinkSpeed,
15921611
#[bits = 2]
15931612
pub reset_pin: EarlyPcieResetPin | pub get EarlyPcieResetPin : pub set EarlyPcieResetPin,
1613+
#[bits = 3]
15941614
pub root_function || u8 : B3 | pub get u8 : pub set u8, // XXX (0: default)
1615+
#[bits = 5]
15951616
pub root_device || u8 : B5 | pub get u8 : pub set u8, // XXX (0: default)
1617+
#[bits = 8]
15961618
pub max_payload || u8 : B8 | pub get u8 : pub set u8, // XXX (0xff: ignore),
1619+
#[bits = 8]
15971620
pub tx_deemphasis || u8 : B8 | pub get u8 : pub set u8, // XXX (0xff: ignore)
1621+
#[bits = 8]
15981622
pub _reserved_1 || #[serde(default)] SerdeHex8 : B8, // (0)
1623+
#[bits = 8]
15991624
pub _reserved_2 || #[serde(default)] SerdeHex8 : B8, // (0)
16001625
}
16011626
}
@@ -2682,9 +2707,13 @@ pub mod memory {
26822707
Default, Clone, Copy, PartialEq, BitfieldSpecifier,
26832708
)]
26842709
pub struct Ddr4DimmRanks {
2710+
#[bits = 1]
26852711
pub unpopulated || #[serde(default)] bool : bool | pub get bool : pub set bool,
2712+
#[bits = 1]
26862713
pub single_rank || #[serde(default)] bool : bool | pub get bool : pub set bool,
2714+
#[bits = 1]
26872715
pub dual_rank || #[serde(default)] bool : bool | pub get bool : pub set bool,
2716+
#[bits = 1]
26882717
pub quad_rank || #[serde(default)] bool : bool | pub get bool : pub set bool,
26892718
}
26902719
);
@@ -2714,8 +2743,11 @@ pub mod memory {
27142743
Clone, Copy, PartialEq, BitfieldSpecifier,
27152744
)]
27162745
pub struct LrdimmDdr4DimmRanks {
2746+
#[bits = 1]
27172747
pub unpopulated || #[serde(default)] bool : bool | pub get bool : pub set bool,
2748+
#[bits = 1]
27182749
pub lr || #[serde(default)] bool : bool | pub get bool : pub set bool,
2750+
#[bits = 2]
27192751
pub _reserved_1 || #[serde(default)] SerdeHex8 : B2,
27202752
}
27212753
);
@@ -4471,10 +4503,14 @@ pub mod memory {
44714503
#[derive(PartialEq, Debug, Copy, Clone)]
44724504
#[repr(u32)]
44734505
pub struct ErrorOutControlBeepCodePeakAttr {
4506+
#[bits = 5]
44744507
pub peak_count || u8 : B5 | pub get u8 : pub set u8,
44754508
/// PULSE_WIDTH: in units of 0.1 s
4509+
#[bits = 3]
44764510
pub pulse_width || u8 : B3 | pub get u8 : pub set u8,
4511+
#[bits = 4]
44774512
pub repeat_count || u8 : B4 | pub get u8 : pub set u8,
4513+
#[bits = 20]
44784514
pub _reserved_1 || #[serde(default)] SerdeHex32 : B20,
44794515
}
44804516
}
@@ -10210,13 +10246,21 @@ make_bitfield_serde! {
1021010246
#[derive(PartialEq, Debug, Copy, Clone)]
1021110247
#[repr(u32)]
1021210248
pub struct DfXgmiChannelTypeSelect {
10249+
#[bits = 4]
1021310250
pub s0l0 || DfXgmiChannelType : B4 | pub get DfXgmiChannelType : pub set DfXgmiChannelType,
10251+
#[bits = 4]
1021410252
pub s0l1 || DfXgmiChannelType : B4 | pub get DfXgmiChannelType : pub set DfXgmiChannelType,
10253+
#[bits = 4]
1021510254
pub s0l2 || DfXgmiChannelType : B4 | pub get DfXgmiChannelType : pub set DfXgmiChannelType,
10255+
#[bits = 4]
1021610256
pub s0l3 || DfXgmiChannelType : B4 | pub get DfXgmiChannelType : pub set DfXgmiChannelType,
10257+
#[bits = 4]
1021710258
pub s1l0 || DfXgmiChannelType : B4 | pub get DfXgmiChannelType : pub set DfXgmiChannelType,
10259+
#[bits = 4]
1021810260
pub s1l1 || DfXgmiChannelType : B4 | pub get DfXgmiChannelType : pub set DfXgmiChannelType,
10261+
#[bits = 4]
1021910262
pub s1l2 || DfXgmiChannelType : B4 | pub get DfXgmiChannelType : pub set DfXgmiChannelType,
10263+
#[bits = 4]
1022010264
pub s1l3 || DfXgmiChannelType : B4 | pub get DfXgmiChannelType : pub set DfXgmiChannelType,
1022110265
}
1022210266
}
@@ -10260,20 +10304,34 @@ make_bitfield_serde! {
1026010304
#[repr(u16)]
1026110305
#[derive(Default, Debug, Copy, Clone, PartialEq)]
1026210306
pub struct FchGppClkMapSelection {
10307+
#[bits = 1]
1026310308
pub s0_gpp0_off : bool | pub get bool : pub set bool,
10309+
#[bits = 1]
1026410310
pub s0_gpp1_off : bool | pub get bool : pub set bool,
10311+
#[bits = 1]
1026510312
pub s0_gpp4_off : bool | pub get bool : pub set bool,
10313+
#[bits = 1]
1026610314
pub s0_gpp2_off : bool | pub get bool : pub set bool,
10315+
#[bits = 1]
1026710316
pub s0_gpp3_off : bool | pub get bool : pub set bool,
10317+
#[bits = 1]
1026810318
pub s0_gpp5_off : bool | pub get bool : pub set bool,
10319+
#[bits = 2]
1026910320
pub _reserved_1 || #[serde(default)] SerdeHex8 : B2,
1027010321

10322+
#[bits = 1]
1027110323
pub s1_gpp0_off : bool | pub get bool : pub set bool,
10324+
#[bits = 1]
1027210325
pub s1_gpp1_off : bool | pub get bool : pub set bool,
10326+
#[bits = 1]
1027310327
pub s1_gpp4_off : bool | pub get bool : pub set bool,
10328+
#[bits = 1]
1027410329
pub s1_gpp2_off : bool | pub get bool : pub set bool,
10330+
#[bits = 1]
1027510331
pub s1_gpp3_off : bool | pub get bool : pub set bool,
10332+
#[bits = 1]
1027610333
pub s1_gpp5_off : bool | pub get bool : pub set bool,
10334+
#[bits = 2]
1027710335
pub _reserved_2 || #[serde(default)] SerdeHex8 : B2,
1027810336
}
1027910337
}
@@ -10335,11 +10393,17 @@ make_bitfield_serde! {
1033510393
#[repr(u8)]
1033610394
#[derive(Debug, Copy, Clone, PartialEq)]
1033710395
pub struct MemPmuBistTestSelect {
10396+
#[bits = 1]
1033810397
pub algorithm_1 || #[serde(default)] bool : bool | pub get bool : pub set bool,
10398+
#[bits = 1]
1033910399
pub algorithm_2 || #[serde(default)] bool : bool | pub get bool : pub set bool,
10400+
#[bits = 1]
1034010401
pub algorithm_3 || #[serde(default)] bool : bool | pub get bool : pub set bool,
10402+
#[bits = 1]
1034110403
pub algorithm_4 || #[serde(default)] bool : bool | pub get bool : pub set bool,
10404+
#[bits = 1]
1034210405
pub algorithm_5 || #[serde(default)] bool : bool | pub get bool : pub set bool,
10406+
#[bits = 3]
1034310407
pub _reserved_0 || #[serde(default)] SerdeHex8 : B3,
1034410408
}
1034510409
}
@@ -10401,10 +10465,15 @@ make_bitfield_serde! {
1040110465
#[repr(u8)]
1040210466
#[derive(Debug, Copy, Clone, PartialEq)]
1040310467
pub struct FchConsoleOutSerialPortEspiControllerSelect {
10468+
#[bits = 1]
1040410469
pub espi_controller || EspiController : B1 | pub get EspiController : pub set EspiController,
10470+
#[bits = 2]
1040510471
pub _reserved_0 || #[serde(default)] SerdeHex8 : B2,
10472+
#[bits = 1]
1040610473
pub io_2e_2f_disabled: bool | pub get bool : pub set bool,
10474+
#[bits = 1]
1040710475
pub io_4e_4f_disabled: bool | pub get bool : pub set bool,
10476+
#[bits = 3]
1040810477
pub _reserved_1 || #[serde(default)] SerdeHex8 : B3,
1040910478
}
1041010479
}
@@ -10419,15 +10488,25 @@ make_bitfield_serde! {
1041910488
#[repr(u16)]
1042010489
#[derive(Debug, Copy, Clone, PartialEq)]
1042110490
pub struct MemPmuBistAlgorithmSelect {
10491+
#[bits = 1]
1042210492
pub algorithm_1: bool | pub get bool : pub set bool,
10493+
#[bits = 1]
1042310494
pub algorithm_2: bool | pub get bool : pub set bool,
10495+
#[bits = 1]
1042410496
pub algorithm_3: bool | pub get bool : pub set bool,
10497+
#[bits = 1]
1042510498
pub algorithm_4: bool | pub get bool : pub set bool,
10499+
#[bits = 1]
1042610500
pub algorithm_5: bool | pub get bool : pub set bool,
10501+
#[bits = 1]
1042710502
pub algorithm_6: bool | pub get bool : pub set bool,
10503+
#[bits = 1]
1042810504
pub algorithm_7: bool | pub get bool : pub set bool,
10505+
#[bits = 1]
1042910506
pub algorithm_8: bool | pub get bool : pub set bool,
10507+
#[bits = 1]
1043010508
pub algorithm_9: bool | pub get bool : pub set bool,
10509+
#[bits = 7]
1043110510
pub _reserved_0 || #[serde(default)] SerdeHex8 : B7,
1043210511
}
1043310512
}
@@ -10734,13 +10813,21 @@ make_bitfield_serde! {
1073410813
#[repr(u8)]
1073510814
#[derive(Debug, Copy, Clone, PartialEq)]
1073610815
pub struct DfXgmiAcDcCoupledLink {
10816+
#[bits = 1]
1073710817
pub socket_0_link_0 || #[serde(default)] DfXgmiAcDcMode : DfXgmiAcDcMode | pub get DfXgmiAcDcMode : pub set DfXgmiAcDcMode,
10818+
#[bits = 1]
1073810819
pub socket_0_link_1 || #[serde(default)] DfXgmiAcDcMode : DfXgmiAcDcMode | pub get DfXgmiAcDcMode : pub set DfXgmiAcDcMode,
10820+
#[bits = 1]
1073910821
pub socket_0_link_2 || #[serde(default)] DfXgmiAcDcMode : DfXgmiAcDcMode | pub get DfXgmiAcDcMode : pub set DfXgmiAcDcMode,
10822+
#[bits = 1]
1074010823
pub socket_0_link_3 || #[serde(default)] DfXgmiAcDcMode : DfXgmiAcDcMode | pub get DfXgmiAcDcMode : pub set DfXgmiAcDcMode,
10824+
#[bits = 1]
1074110825
pub socket_1_link_0 || #[serde(default)] DfXgmiAcDcMode : DfXgmiAcDcMode | pub get DfXgmiAcDcMode : pub set DfXgmiAcDcMode,
10826+
#[bits = 1]
1074210827
pub socket_1_link_1 || #[serde(default)] DfXgmiAcDcMode : DfXgmiAcDcMode | pub get DfXgmiAcDcMode : pub set DfXgmiAcDcMode,
10828+
#[bits = 1]
1074310829
pub socket_1_link_2 || #[serde(default)] DfXgmiAcDcMode : DfXgmiAcDcMode | pub get DfXgmiAcDcMode : pub set DfXgmiAcDcMode,
10830+
#[bits = 1]
1074410831
pub socket_1_link_3 || #[serde(default)] DfXgmiAcDcMode : DfXgmiAcDcMode | pub get DfXgmiAcDcMode : pub set DfXgmiAcDcMode,
1074510832
}
1074610833
}

0 commit comments

Comments
 (0)