diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-12 09:48:49 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-12 09:48:49 -0800 |
| commit | 3d2704aa1df011aa288b28ef61999c98d1fe3694 (patch) | |
| tree | fad648c3bc322223175c4ffc06d4c02d9937fdf8 | |
| parent | 8f6abb6760dd3cd6b5c2d096416bc380587c2e8e (diff) | |
| parent | 944dd265f78d321a0ac85c36fccb706f5fa32b41 (diff) | |
| download | android_packages_apps_BluetoothExt-3d2704aa1df011aa288b28ef61999c98d1fe3694.tar.gz android_packages_apps_BluetoothExt-3d2704aa1df011aa288b28ef61999c98d1fe3694.tar.bz2 android_packages_apps_BluetoothExt-3d2704aa1df011aa288b28ef61999c98d1fe3694.zip | |
Merge "HID-C: Update report id to pass PTS Teest cases"
| -rw-r--r-- | hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidConsts.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidConsts.java b/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidConsts.java index a1b3368..6f616ec 100644 --- a/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidConsts.java +++ b/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidConsts.java @@ -43,7 +43,7 @@ public class HidConsts { (byte) 0xa1, (byte) 0x01, // COLLECTION (Application) (byte) 0x09, (byte) 0x01, // USAGE (Pointer) (byte) 0xa1, (byte) 0x00, // COLLECTION (Physical) - (byte) 0x85, (byte) 0x01, // REPORT_ID (1) + (byte) 0x85, (byte) 0x02, // REPORT_ID (2) (byte) 0x05, (byte) 0x09, // USAGE_PAGE (Button) (byte) 0x19, (byte) 0x01, // USAGE_MINIMUM (Button 1) (byte) 0x29, (byte) 0x03, // USAGE_MAXIMUM (Button 3) @@ -93,7 +93,7 @@ public class HidConsts { (byte) 0x05, (byte) 0x01, // USAGE_PAGE (Generic Desktop) (byte) 0x09, (byte) 0x06, // USAGE (Keyboard) (byte) 0xa1, (byte) 0x01, // COLLECTION (Application) - (byte) 0x85, (byte) 0x10, // REPORT_ID (16) + (byte) 0x85, (byte) 0x01, // REPORT_ID (1) (byte) 0x05, (byte) 0x07, // USAGE_PAGE (Keyboard) (byte) 0x19, (byte) 0xe0, // USAGE_MINIMUM (Keyboard LeftControl) (byte) 0x29, (byte) 0xe7, // USAGE_MAXIMUM (Keyboard Right GUI) @@ -121,7 +121,7 @@ public class HidConsts { (byte) 0x05, (byte) 0x07, // USAGE_PAGE (Keyboard) (byte) 0x95, (byte) 0x05, // REPORT_COUNT (5) (byte) 0x75, (byte) 0x01, // REPORT_SIZE (1) - (byte) 0x85, (byte) 0x10, // REPORT_ID (16) + (byte) 0x85, (byte) 0x01, // REPORT_ID (1) (byte) 0x05, (byte) 0x08, // USAGE_PAGE (LEDs) (byte) 0x19, (byte) 0x01, // USAGE_MINIMUM (Num Lock) (byte) 0x29, (byte) 0x05, // USAGE_MAXIMUM (Kana) @@ -141,11 +141,11 @@ public class HidConsts { }; /* @formatter:on */ - public final static byte MOUSE_REPORT_ID = 1; + public final static byte KEYBOARD_INPUT_REPORT_ID = 1; - public final static byte KEYBOARD_INPUT_REPORT_ID = 16; + public final static byte KEYBOARD_OUTPUT_REPORT_ID = 1; - public final static byte KEYBOARD_OUTPUT_REPORT_ID = 16; + public final static byte MOUSE_REPORT_ID = 2; public final static byte BOOT_KEYBOARD_REPORT_ID = 1; |