@@ -262,7 +262,7 @@ pub fn write(&mut self, offset: hwaddr, value: u64) {
self.update();
}
Ok(RSR) => {
- self.receive_status_error_clear = 0.into();
+ self.receive_status_error_clear.reset();
}
Ok(FR) => {
// flag writes are ignored
@@ -283,7 +283,8 @@ pub fn write(&mut self, offset: hwaddr, value: u64) {
if bool::from(self.line_control.fifos_enabled())
^ bool::from(new_val.fifos_enabled())
{
- self.reset_fifo();
+ self.reset_rx_fifo();
+ self.reset_tx_fifo();
}
if self.line_control.send_break() ^ new_val.send_break() {
let mut break_enable: c_int = new_val.send_break().into();
@@ -442,16 +443,24 @@ pub fn reset(&mut self) {
self.read_trigger = 1;
self.ifl = 0x12;
self.control.reset();
- self.flags = 0.into();
- self.reset_fifo();
+ self.flags.reset();
+ self.reset_rx_fifo();
+ self.reset_tx_fifo();
}
- pub fn reset_fifo(&mut self) {
+ pub fn reset_rx_fifo(&mut self) {
self.read_count = 0;
self.read_pos = 0;
- /* Reset FIFO flags */
- self.flags.reset();
+ // Reset FIFO flags
+ self.flags.set_receive_fifo_full(false);
+ self.flags.set_receive_fifo_empty(true);
+ }
+
+ pub fn reset_tx_fifo(&mut self) {
+ // Reset FIFO flags
+ self.flags.set_transmit_fifo_full(false);
+ self.flags.set_transmit_fifo_empty(true);
}
pub fn can_receive(&self) -> bool {
@@ -230,7 +230,7 @@ pub struct ReceiveStatusErrorClear {
impl ReceiveStatusErrorClear {
pub fn reset(&mut self) {
// All the bits are cleared to 0 on reset.
- *self = 0.into();
+ *self = Self::default();
}
}
@@ -297,19 +297,16 @@ pub struct Flags {
impl Flags {
pub fn reset(&mut self) {
- // After reset TXFF, RXFF, and BUSY are 0, and TXFE and RXFE are 1
- self.set_receive_fifo_full(false);
- self.set_transmit_fifo_full(false);
- self.set_busy(false);
- self.set_receive_fifo_empty(true);
- self.set_transmit_fifo_empty(true);
+ *self = Self::default();
}
}
impl Default for Flags {
fn default() -> Self {
let mut ret: Self = 0.into();
- ret.reset();
+ // After reset TXFF, RXFF, and BUSY are 0, and TXFE and RXFE are 1
+ ret.set_receive_fifo_empty(true);
+ ret.set_transmit_fifo_empty(true);
ret
}
}