DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-25 18:23:22 +00:00
Code Issues Releases Wiki Activity

修复内核的clippy检查报错 (#637)

Browse Source 
修复内核的clippy检查报错
---------

Co-authored-by: Samuel Dai <947309196@qq.com>
Co-authored-by: Donkey Kane <109840258+xiaolin2004@users.noreply.github.com>
Co-authored-by: themildwind <107623059+themildwind@users.noreply.github.com>
Co-authored-by: GnoCiYeH <heyicong@dragonos.org>
Co-authored-by: MemoryShore <105195940+MemoryShore@users.noreply.github.com>
Co-authored-by: 曾俊 <110876916+ZZJJWarth@users.noreply.github.com>
Co-authored-by: sun5etop <146408999+sun5etop@users.noreply.github.com>
Co-authored-by: hmt <114841534+1037827920@users.noreply.github.com>
Co-authored-by: laokengwt <143977175+laokengwt@users.noreply.github.com>
Co-authored-by: TTaq <103996388+TTaq@users.noreply.github.com>
Co-authored-by: Jomo <2512364506@qq.com>
Co-authored-by: Samuel Dai <samuka007@qq.com>
Co-authored-by: sspphh <112558065+sspphh@users.noreply.github.com>
This commit is contained in:
LoGin
2024-03-22 23:26:39 +08:00
committed by GitHub
parent 4695947e1b
commit b5b571e026
175 changed files with 1820 additions and 2155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
kernel/src/driver/input/ps2_mouse/ps_mouse_device.rs
View File

@ -95,14 +95,14 @@ enum PsMouseCommand {
SetSampleRate,
}
impl Into<u8> for PsMouseCommand {
fn into(self) -> u8 {
match self {
Self::SampleRate(x) => x,
Self::EnablePacketStreaming => 0xf4,
Self::InitKeyboard => 0x47,
Self::GetMouseId => 0xf2,
Self::SetSampleRate => 0xf3,
impl From<PsMouseCommand> for u8 {
fn from(val: PsMouseCommand) -> Self {
match val {
PsMouseCommand::SampleRate(x) => x,
PsMouseCommand::EnablePacketStreaming => 0xf4,
PsMouseCommand::InitKeyboard => 0x47,
PsMouseCommand::GetMouseId => 0xf2,
PsMouseCommand::SetSampleRate => 0xf3,
}
}
}
@ -302,13 +302,13 @@ impl Ps2MouseDevice {
guard.current_state.flags = flags;
}
1 => {
let flags = guard.current_state.flags.clone();
let flags = guard.current_state.flags;
if !flags.contains(MouseFlags::X_OVERFLOW) {
guard.current_state.x = self.get_x_movement(packet, flags);
}
}
2 => {
let flags = guard.current_state.flags.clone();
let flags = guard.current_state.flags;
if !flags.contains(MouseFlags::Y_OVERFLOW) {
guard.current_state.y = self.get_y_movement(packet, flags);
}
@ -546,7 +546,7 @@ impl KObject for Ps2MouseDevice {
}
fn kobj_type(&self) -> Option<&'static dyn KObjType> {
self.inner.lock_irqsave().kobj_type.clone()
self.inner.lock_irqsave().kobj_type
}
fn set_kobj_type(&self, ktype: Option<&'static dyn KObjType>) {
@ -605,8 +605,8 @@ impl IndexNode for Ps2MouseDevice {
let mut guard = self.inner.lock_irqsave();
if guard.buf.len() >= 3 {
for i in 0..3 {
buf[i] = guard.buf.dequeue().unwrap();
for item in buf.iter_mut().take(3) {
*item = guard.buf.dequeue().unwrap();
}
return Ok(3);
} else {