motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-02 06:51:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

rust: pl011: pass around registers::Data

Browse source 
The values stored in the Fifo are instances of the bitfield-struct
registers::Data.  Convert as soon as possible the value written
into DR, and always refer to the bitfield struct; it's generally
cleaner other than PL011State::receive having to do a double
conversion u8=>u32=>registers::Data.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-12-18 12:31:46 +01:00
parent 9b642097d6
commit aa50bc4fb9
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rust/hw/char/pl011/src/device.rs
View file

@ -234,7 +234,7 @@ impl PL011Registers {
match offset { match offset {
DR => { DR => {
// interrupts always checked // interrupts always checked
let _ = self.loopback_tx(value); let _ = self.loopback_tx(value.into());
self.int_level |= Interrupt::TX.0; self.int_level |= Interrupt::TX.0;
return true; return true;
} }
@ -301,7 +301,7 @@ impl PL011Registers {
#[inline] #[inline]
#[must_use] #[must_use]
fn loopback_tx(&mut self, value: u32) -> bool { fn loopback_tx(&mut self, value: registers::Data) -> bool {
// Caveat: // Caveat:
// //
// In real hardware, TX loopback happens at the serial-bit level // In real hardware, TX loopback happens at the serial-bit level
@ -370,7 +370,7 @@ impl PL011Registers {
} }
fn loopback_break(&mut self, enable: bool) -> bool { fn loopback_break(&mut self, enable: bool) -> bool {
enable && self.loopback_tx(registers::Data::BREAK.into()) enable && self.loopback_tx(registers::Data::BREAK)
} }
fn set_read_trigger(&mut self) { fn set_read_trigger(&mut self) {
@ -429,11 +429,11 @@ impl PL011Registers {
} }
#[must_use] #[must_use]
pub fn put_fifo(&mut self, value: u32) -> bool { pub fn put_fifo(&mut self, value: registers::Data) -> bool {
let depth = self.fifo_depth(); let depth = self.fifo_depth();
assert!(depth > 0); assert!(depth > 0);
let slot = (self.read_pos + self.read_count) & (depth - 1); let slot = (self.read_pos + self.read_count) & (depth - 1);
self.read_fifo[slot] = registers::Data::from(value); self.read_fifo[slot] = value;
self.read_count += 1; self.read_count += 1;
self.flags.set_receive_fifo_empty(false); self.flags.set_receive_fifo_empty(false);
if self.read_count == depth { if self.read_count == depth {
@ -578,7 +578,8 @@ impl PL011State {
return; return;
} }
let mut regs = self.regs.borrow_mut(); let mut regs = self.regs.borrow_mut();
let update_irq = !regs.loopback_enabled() && regs.put_fifo(buf[0].into()); let c: u32 = buf[0].into();
let update_irq = !regs.loopback_enabled() && regs.put_fifo(c.into());
// Release the BqlRefCell before calling self.update() // Release the BqlRefCell before calling self.update()
drop(regs); drop(regs);
@ -591,7 +592,7 @@ impl PL011State {
let mut update_irq = false; let mut update_irq = false;
let mut regs = self.regs.borrow_mut(); let mut regs = self.regs.borrow_mut();
if event == Event::CHR_EVENT_BREAK && !regs.loopback_enabled() { if event == Event::CHR_EVENT_BREAK && !regs.loopback_enabled() {
update_irq = regs.put_fifo(registers::Data::BREAK.into()); update_irq = regs.put_fifo(registers::Data::BREAK);
} }
// Release the BqlRefCell before calling self.update() // Release the BqlRefCell before calling self.update()
drop(regs); drop(regs);