mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 22:04:26 +00:00
Merge "UsbGadget AIDL migration cleanup"
This commit is contained in:
committed by
Android (Google) Code Review
commit
bdb590419d
@@ -34,11 +34,15 @@
|
||||
package android.hardware.usb.gadget;
|
||||
@Backing(type="int") @VintfStability
|
||||
enum UsbSpeed {
|
||||
UNKNOWN = 0,
|
||||
LOWSPEED = 1,
|
||||
FULLSPEED = 2,
|
||||
HIGHSPEED = 3,
|
||||
SUPERSPEED = 4,
|
||||
SUPERSPEED_10Gb = 5,
|
||||
SUPERSPEED_20Gb = 6,
|
||||
UNKNOWN = (-1),
|
||||
LOWSPEED = 0,
|
||||
FULLSPEED = 1,
|
||||
HIGHSPEED = 2,
|
||||
SUPERSPEED = 3,
|
||||
SUPERSPEED_10Gb = 4,
|
||||
SUPERSPEED_20Gb = 5,
|
||||
USB4_GEN2_10Gb = 6,
|
||||
USB4_GEN2_20Gb = 7,
|
||||
USB4_GEN3_20Gb = 8,
|
||||
USB4_GEN3_40Gb = 9,
|
||||
}
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package android.hardware.usb.gadget;
|
||||
|
||||
import android.hardware.usb.gadget.GadgetFunction;
|
||||
import android.hardware.usb.gadget.IUsbGadgetCallback;
|
||||
|
||||
@VintfStability
|
||||
@@ -35,7 +34,7 @@ oneway interface IUsbGadget {
|
||||
*
|
||||
*/
|
||||
void setCurrentUsbFunctions(in long functions, in IUsbGadgetCallback callback,
|
||||
in long timeoutMs, long transactionId);
|
||||
in long timeoutMs, long transactionId);
|
||||
|
||||
/**
|
||||
* This function is used to query the USB functions included in the
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package android.hardware.usb.gadget;
|
||||
|
||||
import android.hardware.usb.gadget.GadgetFunction;
|
||||
import android.hardware.usb.gadget.Status;
|
||||
import android.hardware.usb.gadget.UsbSpeed;
|
||||
|
||||
|
||||
@@ -22,29 +22,55 @@ enum UsbSpeed {
|
||||
/**
|
||||
* UNKNOWN - Not Connected or Unsupported Speed
|
||||
*/
|
||||
UNKNOWN = 0,
|
||||
UNKNOWN = -1,
|
||||
|
||||
/**
|
||||
* USB Low Speed
|
||||
*/
|
||||
LOWSPEED = 1,
|
||||
LOWSPEED = 0,
|
||||
|
||||
/**
|
||||
* USB Full Speed
|
||||
*/
|
||||
FULLSPEED = 2,
|
||||
FULLSPEED = 1,
|
||||
|
||||
/**
|
||||
* USB High Speed
|
||||
*/
|
||||
HIGHSPEED = 3,
|
||||
HIGHSPEED = 2,
|
||||
|
||||
/**
|
||||
* USB Super Speed
|
||||
*/
|
||||
SUPERSPEED = 4,
|
||||
SUPERSPEED = 3,
|
||||
|
||||
/**
|
||||
* USB Super Speed 10Gbps
|
||||
*/
|
||||
SUPERSPEED_10Gb = 5,
|
||||
SUPERSPEED_10Gb = 4,
|
||||
|
||||
/**
|
||||
* USB Super Speed 20Gbps
|
||||
*/
|
||||
SUPERSPEED_20Gb = 6,
|
||||
SUPERSPEED_20Gb = 5,
|
||||
|
||||
/**
|
||||
* USB4 Gen2 x 1 (10Gbps)
|
||||
*/
|
||||
USB4_GEN2_10Gb = 6,
|
||||
|
||||
/**
|
||||
* USB4 Gen2 x 2 (20Gbps)
|
||||
*/
|
||||
USB4_GEN2_20Gb = 7,
|
||||
|
||||
/**
|
||||
* USB4 Gen3 x 1 (20Gbps)
|
||||
*/
|
||||
USB4_GEN3_20Gb = 8,
|
||||
|
||||
/**
|
||||
* USB4 Gen3 x 2 (40Gbps)
|
||||
*/
|
||||
USB4_GEN3_40Gb = 9,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user