From 901cbebe44418d30ba76dfada52b81044abe8392 Mon Sep 17 00:00:00 2001 From: Zhang Junyang Date: Wed, 2 Aug 2023 13:50:59 +0800 Subject: [PATCH] Fix spurious bitflags usage --- framework/jinux-frame/src/sync/wait.rs | 4 ++-- services/comps/virtio/src/device/input/device.rs | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/framework/jinux-frame/src/sync/wait.rs b/framework/jinux-frame/src/sync/wait.rs index 6ec145276..49af2e378 100644 --- a/framework/jinux-frame/src/sync/wait.rs +++ b/framework/jinux-frame/src/sync/wait.rs @@ -131,7 +131,7 @@ impl Waiter { bitflags! { pub struct WaiterFlag: u32 { - const EXCLUSIVE = 0x1; - const INTERRUPTIABLE = 0x10; + const EXCLUSIVE = 1 << 0; + const INTERRUPTIABLE = 1 << 1; } } diff --git a/services/comps/virtio/src/device/input/device.rs b/services/comps/virtio/src/device/input/device.rs index b78663b3c..f14cba048 100644 --- a/services/comps/virtio/src/device/input/device.rs +++ b/services/comps/virtio/src/device/input/device.rs @@ -13,14 +13,13 @@ use super::{ bitflags! { pub struct InputProp : u8{ - const POINTER = 0x00; - const DIRECT = 0x01; - const BUTTONPAD = 0x02; - const SEMI_MT = 0x03; - const TOPBUTTONPAD = 0x04; - const POINTING_STICK = 0x05; - const ACCELEROMETER = 0x06; - + const POINTER = 1 << 0; + const DIRECT = 1 << 1; + const BUTTONPAD = 1 << 2; + const SEMI_MT = 1 << 3; + const TOPBUTTONPAD = 1 << 4; + const POINTING_STICK = 1 << 5; + const ACCELEROMETER = 1 << 6; } }