mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
rust: pl011: always use reset() method on registers
For CR, the ugly-ish "0.into()" idiom is already hidden within the
reset method. Do not repeat it.
For FR, standardize on reset() being equivalent to "*self = Self::default()"
and let reset_fifo toggle only the bits that are related to FIFOs. This
commit also reproduces C commit 02b1f7f619
("hw/char/pl011: Split RX/TX
path of pl011_reset_fifo()", 2024-09-13).
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
ac096b0bef
commit
f65314bdd0
2 changed files with 21 additions and 15 deletions
|
@ -262,7 +262,7 @@ impl PL011State {
|
|||
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 @@ impl PL011State {
|
|||
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 @@ impl PL011State {
|
|||
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 mod registers {
|
|||
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 mod registers {
|
|||
|
||||
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
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue