devices: Simplify device state to support Versionize

In order to support using Versionize for state structures it is necessary
to use simpler, primitive, data types in the state definitions used for
snapshot restore.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2021-04-23 10:55:05 +01:00
parent 8614a0ab2f
commit f643ba6111
3 changed files with 9 additions and 14 deletions
+3 -3
View File
@@ -80,7 +80,7 @@ pub struct SerialState {
modem_status: u8,
scratch: u8,
baud_divisor: u16,
in_buffer: VecDeque<u8>,
in_buffer: Vec<u8>,
}
impl Serial {
@@ -223,7 +223,7 @@ impl Serial {
modem_status: self.modem_status,
scratch: self.scratch,
baud_divisor: self.baud_divisor,
in_buffer: self.in_buffer.clone(),
in_buffer: self.in_buffer.clone().into(),
}
}
@@ -236,7 +236,7 @@ impl Serial {
self.modem_status = state.modem_status;
self.scratch = state.scratch;
self.baud_divisor = state.baud_divisor;
self.in_buffer = state.in_buffer.clone();
self.in_buffer = state.in_buffer.clone().into();
}
}
+3 -3
View File
@@ -95,7 +95,7 @@ pub struct Pl011State {
dmacr: u32,
int_enabled: u32,
int_level: u32,
read_fifo: VecDeque<u8>,
read_fifo: Vec<u8>,
ilpr: u32,
ibrd: u32,
fbrd: u32,
@@ -141,7 +141,7 @@ impl Pl011 {
dmacr: self.dmacr,
int_enabled: self.int_enabled,
int_level: self.int_level,
read_fifo: self.read_fifo.clone(),
read_fifo: self.read_fifo.clone().into(),
ilpr: self.ilpr,
ibrd: self.ibrd,
fbrd: self.fbrd,
@@ -159,7 +159,7 @@ impl Pl011 {
self.dmacr = state.dmacr;
self.int_enabled = state.int_enabled;
self.int_level = state.int_level;
self.read_fifo = state.read_fifo.clone();
self.read_fifo = state.read_fifo.clone().into();
self.ilpr = state.ilpr;
self.ibrd = state.ibrd;
self.fbrd = state.fbrd;