diff options
| author | Adrian Roos <roosa@google.com> | 2022-12-06 11:16:09 +0000 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2022-12-06 11:16:09 +0000 |
| commit | a35c0be7ae54279162eacbe103845d2af05c8cad (patch) | |
| tree | 1dce57736218080425814011c2382ed5eccdd8f1 /usb_util | |
| parent | 0ec7583e64f2061c872af5919d29603caffc20cf (diff) | |
| download | crosvm-a35c0be7ae54279162eacbe103845d2af05c8cad.tar.gz | |
Revert "Merge remote-tracking branch 'aosp/upstream-main'"
Revert submission 2329297-crosvm-merge-2022-12-05
Reason for revert: breaks tests
Reverted Changes:
Id9d9e5b5e:ANDROID: ./run_cargo_embargo.sh after merge
If53fb2281:ANDROID: Temporarily disable "merge" dependency
Iaca689af2:Merge remote-tracking branch 'aosp/upstream-main'
I94fab94ec:ANDROID: update import script to use cargo_embargo...
Ia4bc6077c:ANDROID: add cargo_embargo config, delete cargo2an...
Ie2d211046:ANDROID: switch to cargo_embargo generated Android...
Bug: 260604615
Change-Id: I89d2100fe585a752d6092087d509a24dd4e71245
Fixes: 261559546
Diffstat (limited to 'usb_util')
| -rw-r--r-- | usb_util/src/device.rs | 2 | ||||
| -rw-r--r-- | usb_util/src/types.rs | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usb_util/src/device.rs b/usb_util/src/device.rs index 97914803a..33386ef56 100644 --- a/usb_util/src/device.rs +++ b/usb_util/src/device.rs @@ -59,7 +59,7 @@ pub struct TransferHandle { fd: std::sync::Weak<File>, } -#[derive(PartialEq, Eq)] +#[derive(PartialEq)] pub enum TransferStatus { Completed, Error, diff --git a/usb_util/src/types.rs b/usb_util/src/types.rs index 6ef347748..5c63efaf0 100644 --- a/usb_util/src/types.rs +++ b/usb_util/src/types.rs @@ -161,7 +161,7 @@ const ENDPOINT_DESCRIPTOR_NUMBER_MASK: u8 = 0xf; const ENDPOINT_DESCRIPTOR_ATTRIBUTES_TYPE_MASK: u8 = 0x3; /// Endpoint types. -#[derive(PartialEq, Eq)] +#[derive(PartialEq)] pub enum EndpointType { Control, Isochronous, @@ -170,7 +170,7 @@ pub enum EndpointType { } /// Endpoint Directions. -#[derive(PartialEq, Eq, Clone, Copy)] +#[derive(PartialEq, Clone, Copy)] pub enum EndpointDirection { HostToDevice = 0, DeviceToHost = 1, @@ -212,7 +212,7 @@ pub const DATA_PHASE_DIRECTION_OFFSET: u8 = 7; /// Bit mask of data phase transfer direction. pub const DATA_PHASE_DIRECTION: u8 = 1u8 << DATA_PHASE_DIRECTION_OFFSET; // Types of data phase transfer directions. -#[derive(Copy, Clone, PartialEq, Eq)] +#[derive(Copy, Clone, PartialEq)] pub enum ControlRequestDataPhaseTransferDirection { HostToDevice = 0, DeviceToHost = 1, @@ -223,7 +223,7 @@ pub const CONTROL_REQUEST_TYPE_OFFSET: u8 = 5; /// Bit mask of control request type. pub const CONTROL_REQUEST_TYPE: u8 = 0b11 << CONTROL_REQUEST_TYPE_OFFSET; /// Request types. -#[derive(PartialEq, Eq)] +#[derive(PartialEq)] pub enum ControlRequestType { Standard = 0, Class = 1, @@ -234,7 +234,7 @@ pub enum ControlRequestType { /// Recipient type bits. pub const REQUEST_RECIPIENT_TYPE: u8 = 0b1111; /// Recipient type of control request. -#[derive(PartialEq, Eq)] +#[derive(PartialEq)] pub enum ControlRequestRecipient { Device = 0, Interface = 1, @@ -244,7 +244,7 @@ pub enum ControlRequestRecipient { } /// Standard request defined in usb spec. -#[derive(PartialEq, Eq)] +#[derive(PartialEq)] pub enum StandardControlRequest { GetStatus = 0x00, ClearFeature = 0x01, |