[PATCH 1/5] winebus.sys: Fix some report descriptors

[Andrew Eikum]

Signed-off-by: Andrew Eikum 
---
 dlls/winebus.sys/bus_sdl.c    | 2 +-
 dlls/winebus.sys/controller.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index b774df7eddc..724cd78d580 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -147,7 +147,7 @@ static const BYTE REPORT_AXIS_TAIL[] = {
     0x95, 0x00,         /* REPORT_COUNT (?) */
     0x81, 0x02,         /* INPUT (Data,Var,Abs) */
 };
-#define IDX_ABS_AXIS_COUNT 15
+#define IDX_ABS_AXIS_COUNT 23

static const BYTE CONTROLLER_BUTTONS[] = {
     0x05, 0x09, /* USAGE_PAGE (Button) */
diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h
index 9546fe991f0..80e9c786c77 100644
--- a/dlls/winebus.sys/controller.h
+++ b/dlls/winebus.sys/controller.h
@@ -36,15 +36,15 @@ static const BYTE REPORT_BUTTONS[] = {
     0x29, 0x03, /* USAGE_MAXIMUM (Button 3) */
     0x15, 0x00, /* LOGICAL_MINIMUM (0) */
     0x25, 0x01, /* LOGICAL_MAXIMUM (1) */
-    0x35, 0x00, /* LOGICAL_MINIMUM (0) */
-    0x45, 0x01, /* LOGICAL_MAXIMUM (1) */
+    0x35, 0x00, /* PHYSICAL_MINIMUM (0) */
+    0x45, 0x01, /* PHYSICAL_MAXIMUM (1) */
     0x95, 0x03, /* REPORT_COUNT (3) */
     0x75, 0x01, /* REPORT_SIZE (1) */
     0x81, 0x02, /* INPUT (Data,Var,Abs) */
 };
 #define IDX_BUTTON_MIN_USAGE 3
 #define IDX_BUTTON_MAX_USAGE 5
-#define IDX_BUTTON_COUNT 11
+#define IDX_BUTTON_COUNT 15

static const BYTE REPORT_PADDING[] = {
     0x95, 0x03, /* REPORT_COUNT (3) */

[Aric Stewart]

Signed-off-by: Aric Stewart

On 5/6/19 8:45 AM, Andrew Eikum wrote:
> Signed-off-by: Andrew Eikum
>
> dlls/winebus.sys/bus_sdl.c    | 2 +-
>   dlls/winebus.sys/controller.h | 6 +++---
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
> index b774df7eddc..724cd78d580 100644
> --- a/dlls/winebus.sys/bus_sdl.c
> +++ b/dlls/winebus.sys/bus_sdl.c
> @@ -147,7 +147,7 @@ static const BYTE REPORT_AXIS_TAIL[] = {
>       0x95, 0x00,         /* REPORT_COUNT (?) */
>       0x81, 0x02,         /* INPUT (Data,Var,Abs) */
>   };
> -#define IDX_ABS_AXIS_COUNT 15
> +#define IDX_ABS_AXIS_COUNT 23
>
> static const BYTE CONTROLLER_BUTTONS[] = {
>       0x05, 0x09, /* USAGE_PAGE (Button) */
> diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h
> index 9546fe991f0..80e9c786c77 100644
> --- a/dlls/winebus.sys/controller.h
> +++ b/dlls/winebus.sys/controller.h
> @@ -36,15 +36,15 @@ static const BYTE REPORT_BUTTONS[] = {
>       0x29, 0x03, /* USAGE_MAXIMUM (Button 3) */
>       0x15, 0x00, /* LOGICAL_MINIMUM (0) */
>       0x25, 0x01, /* LOGICAL_MAXIMUM (1) */
> - 0x35, 0x00, /* LOGICAL_MINIMUM (0) */
> - 0x45, 0x01, /* LOGICAL_MAXIMUM (1) */
> - 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */
> - 0x45, 0x01, /* PHYSICAL_MAXIMUM (1) */
>  0x95, 0x03, /* REPORT_COUNT (3) */
>  0x75, 0x01, /* REPORT_SIZE (1) */
>  0x81, 0x02, /* INPUT (Data,Var,Abs) */
> };
> #define IDX_BUTTON_MIN_USAGE 3
> #define IDX_BUTTON_MAX_USAGE 5
>
> -#define IDX_BUTTON_COUNT 11
> +#define IDX_BUTTON_COUNT 15
>
> static const BYTE REPORT_PADDING[] = {
>       0x95, 0x03, /* REPORT_COUNT (3) */