i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Remove the report ID argument of HIDWriter::DefineInput{Data|Paddding} to

Browse Source 
allow for creating descriptors that don't use report IDs at all.
* Adjust sixaxis_build_descriptor and set the global report ID once at the
  beginning instead.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42001 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2011-06-06 23:54:01 +00:00
parent c67c6b5300
commit 575517e617
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/input/usb_hid/HIDWriter.cpp
+4 -6
View File
@@ -37,9 +37,8 @@ HIDWriter::~HIDWriter()
status_t status_t
HIDWriter::DefineInputPadding(uint8 reportID, uint8 count, uint8 bitLength) HIDWriter::DefineInputPadding(uint8 count, uint8 bitLength)
{ {
SetReportID(reportID);
SetReportSize(bitLength); SetReportSize(bitLength);
SetReportCount(count); SetReportCount(count);
@@ -50,11 +49,10 @@ HIDWriter::DefineInputPadding(uint8 reportID, uint8 count, uint8 bitLength)
status_t status_t
HIDWriter::DefineInputData(uint8 reportID, uint8 count, uint8 bitLength, HIDWriter::DefineInputData(uint8 count, uint8 bitLength, main_item_data data,
main_item_data data, uint32 logicalMinimum, uint32 logicalMaximum, uint32 logicalMinimum, uint32 logicalMaximum, uint16 usagePage,
uint16 usagePage, uint16 usageMinimum, uint16 usageMaximum) uint16 usageMinimum, uint16 usageMaximum)
{ {
SetReportID(reportID);
SetReportSize(bitLength); SetReportSize(bitLength);
SetReportCount(count); SetReportCount(count);
src/add-ons/kernel/drivers/input/usb_hid/HIDWriter.h
+3 -4
View File
@@ -15,11 +15,10 @@ public:
// High Level // High Level
status_t DefineInputPadding(uint8 reportID, uint8 count, status_t DefineInputPadding(uint8 count,
uint8 bitLength); uint8 bitLength);
status_t DefineInputData(uint8 reportID, uint8 count, status_t DefineInputData(uint8 count, uint8 bitLength,
uint8 bitLength, main_item_data data, main_item_data data, uint32 logicalMinimum,
uint32 logicalMinimum,
uint32 logicalMaximum, uint16 usagePage, uint32 logicalMaximum, uint16 usagePage,
uint16 usageMinimum, uint16 usageMinimum,
uint16 usageMaximum = 0xffff); uint16 usageMaximum = 0xffff);
src/add-ons/kernel/drivers/input/usb_hid/QuirkyDevices.cpp
+14 -12
View File
@@ -43,44 +43,46 @@ sixaxis_build_descriptor(HIDWriter &writer)
converter.main_data.array_variable = 1; converter.main_data.array_variable = 1;
converter.main_data.no_preferred = 1; converter.main_data.no_preferred = 1;
writer.SetReportID(1);
// unknown / padding // unknown / padding
writer.DefineInputPadding(1, 1, 8); writer.DefineInputPadding(1, 8);
// digital button state on/off // digital button state on/off
writer.DefineInputData(1, 19, 1, converter.main_data, 0, 1, writer.DefineInputData(19, 1, converter.main_data, 0, 1,
B_HID_USAGE_PAGE_BUTTON, 1); B_HID_USAGE_PAGE_BUTTON, 1);
// padding to 32 bit boundary // padding to 32 bit boundary
writer.DefineInputPadding(1, 13, 1); writer.DefineInputPadding(13, 1);
// left analog stick // left analog stick
writer.DefineInputData(1, 1, 8, converter.main_data, 0, 255, writer.DefineInputData(1, 8, converter.main_data, 0, 255,
B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_X); B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_X);
writer.DefineInputData(1, 1, 8, converter.main_data, 0, 255, writer.DefineInputData(1, 8, converter.main_data, 0, 255,
B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_Y); B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_Y);
// right analog stick // right analog stick
writer.DefineInputData(1, 1, 8, converter.main_data, 0, 255, writer.DefineInputData(1, 8, converter.main_data, 0, 255,
B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_X); B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_X);
writer.DefineInputData(1, 1, 8, converter.main_data, 0, 255, writer.DefineInputData(1, 8, converter.main_data, 0, 255,
B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_Y); B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_Y);
// unknown / padding // unknown / padding
writer.DefineInputPadding(1, 4, 8); writer.DefineInputPadding(4, 8);
// pressure sensitive button states // pressure sensitive button states
writer.DefineInputData(1, 12, 8, converter.main_data, 0, 255, writer.DefineInputData(12, 8, converter.main_data, 0, 255,
B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_VNO, B_HID_UID_GD_VNO); B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_VNO, B_HID_UID_GD_VNO);
// unknown / padding / operation mode / battery status / connection ... // unknown / padding / operation mode / battery status / connection ...
writer.DefineInputPadding(1, 15, 8); writer.DefineInputPadding(15, 8);
// accelerometer x, y and z // accelerometer x, y and z
writer.DefineInputData(1, 3, 16, converter.main_data, 0, UINT16_MAX, writer.DefineInputData(3, 16, converter.main_data, 0, UINT16_MAX,
B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_VX); B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_VX);
// gyroscope // gyroscope
writer.DefineInputData(1, 1, 16, converter.main_data, 0, UINT16_MAX, writer.DefineInputData(1, 16, converter.main_data, 0, UINT16_MAX,
B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_VBRZ); B_HID_USAGE_PAGE_GENERIC_DESKTOP, B_HID_UID_GD_VBRZ);
return writer.EndCollection(); return writer.EndCollection();