Skip to content

Commit 0c422ae

Browse files
committed
ondisk: PspSoftFuseChain: add serde defaults for remaining fields
1 parent 81e5653 commit 0c422ae

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/ondisk.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,28 +1090,34 @@ pub enum PspDirectoryEntryType {
10901090
}
10911091

10921092
/// For 32 MiB SPI Flash, which half to map to MMIO 0xff00_0000.
1093-
#[derive(Debug, PartialEq, FromPrimitive, Clone, Copy, BitfieldSpecifier)]
1093+
#[derive(
1094+
Debug, Default, PartialEq, FromPrimitive, Clone, Copy, BitfieldSpecifier,
1095+
)]
10941096
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
10951097
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
10961098
#[bits = 1]
10971099
pub enum PspSoftFuseChain32MiBSpiDecoding {
1100+
#[default]
10981101
LowerHalf = 0,
10991102
UpperHalf = 1,
11001103
}
11011104

1102-
#[derive(Debug, PartialEq, FromPrimitive, Clone, Copy, BitfieldSpecifier)]
1105+
#[derive(
1106+
Debug, Default, PartialEq, FromPrimitive, Clone, Copy, BitfieldSpecifier,
1107+
)]
11031108
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
11041109
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
11051110
#[bits = 1]
11061111
pub enum PspSoftFuseChainPostCodeDecoding {
1112+
#[default]
11071113
Lpc = 0,
11081114
Espi = 1,
11091115
}
11101116

11111117
make_bitfield_serde! {
11121118
#[bitfield(bits = 64)]
11131119
#[repr(u64)]
1114-
#[derive(Copy, Clone, Debug)]
1120+
#[derive(Copy, Clone, Debug, Default)]
11151121
pub struct PspSoftFuseChain {
11161122
#[allow(dead_code)]
11171123
pub secure_debug_unlock || #[serde(default)] bool : bool | pub get bool : pub set bool,
@@ -1130,9 +1136,9 @@ make_bitfield_serde! {
11301136
#[allow(non_snake_case)]
11311137
_reserved_1 || #[serde(default)] u8 : B7,
11321138
#[allow(dead_code)]
1133-
pub spi_decoding || PspSoftFuseChain32MiBSpiDecoding : PspSoftFuseChain32MiBSpiDecoding | pub get PspSoftFuseChain32MiBSpiDecoding : pub set PspSoftFuseChain32MiBSpiDecoding,
1139+
pub spi_decoding || #[serde(default)] PspSoftFuseChain32MiBSpiDecoding : PspSoftFuseChain32MiBSpiDecoding | pub get PspSoftFuseChain32MiBSpiDecoding : pub set PspSoftFuseChain32MiBSpiDecoding,
11341140
#[allow(dead_code)]
1135-
pub postcode_decoding || PspSoftFuseChainPostCodeDecoding : PspSoftFuseChainPostCodeDecoding | pub get PspSoftFuseChainPostCodeDecoding : pub set PspSoftFuseChainPostCodeDecoding,
1141+
pub postcode_decoding || #[serde(default)] PspSoftFuseChainPostCodeDecoding : PspSoftFuseChainPostCodeDecoding | pub get PspSoftFuseChainPostCodeDecoding : pub set PspSoftFuseChainPostCodeDecoding,
11361142
#[allow(non_snake_case)]
11371143
_reserved_2 || #[serde(default)] u16 : B12,
11381144
#[allow(non_snake_case)]
@@ -1148,12 +1154,6 @@ make_bitfield_serde! {
11481154
}
11491155
}
11501156

1151-
impl Default for PspSoftFuseChain {
1152-
fn default() -> Self {
1153-
Self::new()
1154-
}
1155-
}
1156-
11571157
#[repr(u8)]
11581158
#[derive(Debug, PartialEq, FromPrimitive, Clone, Copy, BitfieldSpecifier)]
11591159
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]

0 commit comments

Comments
 (0)