ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xid: Improve emulation based on tests with real hardware 

XID tests with a real Duke controller were done.
The results have been added to XboxDevWiki.

The behaviour documented on XboxDevWiki has then been implemented:
- XID_GET_CAPABILITIES is now supported
- Interrupt-out doesn't STALL anymore
- More accurate STALL conditions
- Packet truncation to actual length
- XID descriptor dumped from real Duke controller
This commit is contained in:
Jannik Vogel 2018-07-05 01:56:40 +02:00 committed by Matt
parent 592b4dbbf7
commit 32bf810a59
1 changed files with 72 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
hw/xbox/xid.c
View File

@ -101,7 +101,9 @@ typedef struct USBXIDState {
QemuInputHandlerState *hs; QemuInputHandlerState *hs;
bool in_dirty; bool in_dirty;
XIDGamepadReport in_state; XIDGamepadReport in_state;
XIDGamepadReport in_state_capabilities;
XIDGamepadOutputReport out_state; XIDGamepadOutputReport out_state;
XIDGamepadOutputReport out_state_capabilities;
} USBXIDState; } USBXIDState;
static const USBDescIface desc_iface_xbox_gamepad = { static const USBDescIface desc_iface_xbox_gamepad = {
@ -158,15 +160,14 @@ static const USBDesc desc_xbox_gamepad = {
static const XIDDesc desc_xid_xbox_gamepad = { static const XIDDesc desc_xid_xbox_gamepad = {
.bLength = 0x10, .bLength = 0x10,
.bDescriptorType = USB_DT_XID, .bDescriptorType = USB_DT_XID,
.bcdXid = 1, .bcdXid = 0x100,
.bType = 1, .bType = 1,
.bSubType = 1, .bSubType = 1,
.bMaxInputReportSize = 0x20, .bMaxInputReportSize = 20,
.bMaxOutputReportSize = 0x6, .bMaxOutputReportSize = 6,
.wAlternateProductIds = {-1, -1, -1, -1}, .wAlternateProductIds = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF },
}; };
#define GAMEPAD_A 0 #define GAMEPAD_A 0
#define GAMEPAD_B 1 #define GAMEPAD_B 1
#define GAMEPAD_X 2 #define GAMEPAD_X 2
@ -309,12 +310,20 @@ static void usb_xid_handle_reset(USBDevice *dev)
DPRINTF("xid reset\n"); DPRINTF("xid reset\n");
} }
static void update_force_feedback(USBXIDState *s)
{
/* FIXME: Check actuator endianess */
DPRINTF("Set rumble power to 0x%x, 0x%x\n",
s->out_state.left_actuator_strength,
s->out_state.right_actuator_strength);
}
static void usb_xid_handle_control(USBDevice *dev, USBPacket *p, static void usb_xid_handle_control(USBDevice *dev, USBPacket *p,
int request, int value, int index, int length, uint8_t *data) int request, int value, int index, int length, uint8_t *data)
{ {
USBXIDState *s = (USBXIDState *)dev; USBXIDState *s = (USBXIDState *)dev;
DPRINTF("xid handle_control 0x%x 0x%x\n", request, value); DPRINTF("xid handle_control 0x%x 0x%x (length: %d)\n", request, value, length);
int ret = usb_desc_handle_control(dev, p, request, value, int ret = usb_desc_handle_control(dev, p, request, value,
index, length, data); index, length, data);
@ -327,28 +336,35 @@ static void usb_xid_handle_control(USBDevice *dev, USBPacket *p,
/* HID requests */ /* HID requests */
case ClassInterfaceRequest | HID_GET_REPORT: case ClassInterfaceRequest | HID_GET_REPORT:
DPRINTF("xid GET_REPORT 0x%x\n", value); DPRINTF("xid GET_REPORT 0x%x\n", value);
if (value == 0x100) { /* input */ if (value == 0x0100) { /* input */
assert(s->in_state.bLength <= length); if (length <= s->in_state.bLength) {
// s->in_state.bReportId++; /* FIXME: I'm not sure if bReportId is just a counter */ memcpy(data, &s->in_state, s->in_state.bLength);
memcpy(data, &s->in_state, s->in_state.bLength); p->actual_length = length;
p->actual_length = s->in_state.bLength; } else {
p->status = USB_RET_STALL;
}
} else { } else {
p->status = USB_RET_STALL;
assert(false); assert(false);
} }
break; break;
case ClassInterfaceOutRequest | HID_SET_REPORT: case ClassInterfaceOutRequest | HID_SET_REPORT:
DPRINTF("xid SET_REPORT 0x%x\n", value); DPRINTF("xid SET_REPORT 0x%x\n", value);
if (value == 0x200) { /* output */ if (value == 0x0200) { /* output */
/* Read length, then the entire packet */ /* Read length, then the entire packet */
memcpy(&s->out_state, data, sizeof(s->out_state)); if (length == s->out_state.length) {
assert(s->out_state.length == sizeof(s->out_state)); memcpy(&s->out_state, data, sizeof(s->out_state));
assert(s->out_state.length <= length);
//FIXME: Check actuator endianess /* FIXME: This should also be a STALL */
DPRINTF("Set rumble power to 0x%x, 0x%x\n", assert(s->out_state.length == sizeof(s->out_state));
s->out_state.left_actuator_strength,
s->out_state.right_actuator_strength); p->actual_length = length;
p->actual_length = s->out_state.length; } else {
p->status = USB_RET_STALL;
}
update_force_feedback(s);
} else { } else {
p->status = USB_RET_STALL;
assert(false); assert(false);
} }
break; break;
@ -360,14 +376,28 @@ static void usb_xid_handle_control(USBDevice *dev, USBPacket *p,
memcpy(data, s->xid_desc, s->xid_desc->bLength); memcpy(data, s->xid_desc, s->xid_desc->bLength);
p->actual_length = s->xid_desc->bLength; p->actual_length = s->xid_desc->bLength;
} else { } else {
p->status = USB_RET_STALL;
assert(false); assert(false);
} }
break; break;
case VendorInterfaceRequest | XID_GET_CAPABILITIES: case VendorInterfaceRequest | XID_GET_CAPABILITIES:
DPRINTF("xid XID_GET_CAPABILITIES 0x%x\n", value); DPRINTF("xid XID_GET_CAPABILITIES 0x%x\n", value);
/* FIXME: ! */ if (value == 0x0100) {
p->status = USB_RET_STALL; if (length > s->in_state_capabilities.bLength) {
//assert(false); length = s->in_state_capabilities.bLength;
}
memcpy(data, &s->in_state_capabilities, length);
p->actual_length = length;
} else if (value == 0x0200) {
if (length > s->out_state_capabilities.length) {
length = s->out_state_capabilities.length;
}
memcpy(data, &s->out_state_capabilities, length);
p->actual_length = length;
} else {
p->status = USB_RET_STALL;
assert(false);
}
break; break;
case ((USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_DEVICE) << 8) case ((USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_DEVICE) << 8)
| USB_REQ_GET_DESCRIPTOR: | USB_REQ_GET_DESCRIPTOR:
@ -415,7 +445,12 @@ static void usb_xid_handle_data(USBDevice *dev, USBPacket *p)
} }
break; break;
case USB_TOKEN_OUT: case USB_TOKEN_OUT:
p->status = USB_RET_STALL; if (p->ep->nr == 2) {
usb_packet_copy(p, &s->out_state, s->out_state.length);
update_force_feedback(s);
} else {
assert(false);
}
break; break;
default: default:
p->status = USB_RET_STALL; p->status = USB_RET_STALL;
@ -442,7 +477,20 @@ static void usb_xbox_gamepad_realize(USBDevice *dev, Error **errp)
s->intr = usb_ep_get(dev, USB_TOKEN_IN, 2); s->intr = usb_ep_get(dev, USB_TOKEN_IN, 2);
s->in_state.bLength = sizeof(s->in_state); s->in_state.bLength = sizeof(s->in_state);
s->in_state.bReportId = 0;
s->out_state.length = sizeof(s->out_state); s->out_state.length = sizeof(s->out_state);
s->out_state.report_id = 0;
memset(&s->in_state_capabilities, 0xFF, sizeof(s->in_state_capabilities));
s->in_state_capabilities.bLength = sizeof(s->in_state_capabilities);
s->in_state_capabilities.bReportId = 0;
memset(&s->out_state_capabilities, 0xFF, sizeof(s->out_state_capabilities));
s->out_state_capabilities.length = sizeof(s->out_state_capabilities);
s->out_state_capabilities.report_id = 0;
s->hs = qemu_input_handler_register((DeviceState *)(s), &xboxkbd_handler); s->hs = qemu_input_handler_register((DeviceState *)(s), &xboxkbd_handler);
s->xid_desc = &desc_xid_xbox_gamepad; s->xid_desc = &desc_xid_xbox_gamepad;
} }