preserve-emulation/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2026-07-11 01:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

xblc: Don't assert in control/data handlers

Browse Source
This commit is contained in:
Matt Borgerson
2026-02-18 23:23:38 -07:00
committed by mborgerson
parent 49cd4ce5d0
commit d6a3a78e80
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hw/xbox/xblc.c
+16 -8
View File
@@ -147,8 +147,7 @@ static const USBDesc desc_xblc = {
static int xblc_get_sample_rate_for_index(unsigned int index)
{
static const uint16_t sample_rates[] = { 8000, 11025, 16000, 22050, 24000 };
assert(index < ARRAY_SIZE(sample_rates));
return sample_rates[index];
return index < ARRAY_SIZE(sample_rates) ? sample_rates[index] : 0;
}
static SDL_AudioSpec xblc_get_audio_spec(USBXBLCState *s)
@@ -205,8 +204,12 @@ static void xblc_handle_control(USBDevice *dev, USBPacket *p, int request,
switch (request) {
case VendorInterfaceOutRequest | USB_REQ_SET_FEATURE:
if (index == XBLC_SET_SAMPLE_RATE) {
xblc_set_sample_rate(s,
xblc_get_sample_rate_for_index(value & 0xFF));
int new_sample_rate = xblc_get_sample_rate_for_index(value & 0xFF);
if (new_sample_rate > 0) {
xblc_set_sample_rate(s, new_sample_rate);
} else {
DPRINTF("Invalid sample rate index %d", value & 0xFF);
}
break;
} else if (index == XBLC_SET_AGC) {
DPRINTF("Set Auto Gain Control to %d", value);
@@ -216,7 +219,6 @@ static void xblc_handle_control(USBDevice *dev, USBPacket *p, int request,
default:
DPRINTF("USB stalled on request 0x%x value 0x%x", request, value);
p->status = USB_RET_STALL;
assert(!"USB stalled on request");
return;
}
}
@@ -227,7 +229,10 @@ static void xblc_handle_data(USBDevice *dev, USBPacket *p)
switch (p->pid) {
case USB_TOKEN_IN: {
assert(p->ep->nr == XBLC_EP_IN);
if (p->ep->nr != XBLC_EP_IN) {
DPRINTF("Unexpected USB endpoint for USB_TOKEN_IN");
break;
}
if (s->in == NULL) {
break;
@@ -264,7 +269,10 @@ static void xblc_handle_data(USBDevice *dev, USBPacket *p)
break;
}
case USB_TOKEN_OUT:
assert(p->ep->nr == XBLC_EP_OUT);
if (p->ep->nr != XBLC_EP_OUT) {
DPRINTF("Unexpected USB endpoint for USB_TOKEN_OUT");
break;
}
if (s->out != NULL) {
if (!SDL_PutAudioStreamData(s->out, p->iov.iov->iov_base,
p->iov.size)) {
@@ -273,7 +281,7 @@ static void xblc_handle_data(USBDevice *dev, USBPacket *p)
}
break;
default:
assert(!"Iso cannot report STALL/HALT");
DPRINTF("Unexpected USB token pid %d for XBLC device", p->pid);
break;
}