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

usb_audio: Clean up and fix device management code.

Browse Source 
* Actually use the global mutex instead of creating useless MutexLockers.
 * Don't delete the device object on _free(), then it can't be opened again,
   which we want to be possible. Matches the behavior of other audio drivers.
 * Clean up device detection code to better match other drivers.

At least under XHCI, multi_audio_test throws a variety of errors and then
crashes while attempting to use this driver. But following implementing
CancelQueuedTransfers, the system no longer KDLs after that. Progress!
This commit is contained in:
Augustin Cavalier
2019-03-13 00:34:58 -04:00
parent d592cab849
commit 19151d0134
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/usb/Driver.cpp
+12 -25
View File
@@ -30,7 +30,7 @@ usb_audio_device_added(usb_device device, void** cookie)
{ {
*cookie = NULL; *cookie = NULL;
MutexLocker driverLock; MutexLocker _(gDriverLock);
// check if this is a replug of an existing device first // check if this is a replug of an existing device first
for (int32 i = 0; i < MAX_DEVICES; i++) { for (int32 i = 0; i < MAX_DEVICES; i++) {
@@ -84,7 +84,7 @@ usb_audio_device_added(usb_device device, void** cookie)
status_t status_t
usb_audio_device_removed(void* cookie) usb_audio_device_removed(void* cookie)
{ {
MutexLocker driverLock; MutexLocker _(gDriverLock);
Device* device = (Device*)cookie; Device* device = (Device*)cookie;
for (int32 i = 0; i < MAX_DEVICES; i++) { for (int32 i = 0; i < MAX_DEVICES; i++) {
@@ -173,14 +173,16 @@ uninit_driver()
static status_t static status_t
usb_audio_open(const char* name, uint32 flags, void** cookie) usb_audio_open(const char* name, uint32 flags, void** cookie)
{ {
MutexLocker driverLock; MutexLocker _(gDriverLock);
*cookie = NULL; *cookie = NULL;
status_t status = ENODEV; status_t status = ENODEV;
int32 index = strtol(name + strlen(sDeviceBaseName), NULL, 10) - 1; for (int32 i = 0; i < MAX_DEVICES && gDevices[i] != NULL; i++) {
if (index >= 0 && index < MAX_DEVICES && gDevices[index]) { if (strcmp(gDeviceNames[i], name) == 0) {
status = gDevices[index]->Open(flags); status = gDevices[i]->Open(flags);
*cookie = gDevices[index]; *cookie = gDevices[i];
break;
}
} }
return status; return status;
@@ -224,35 +226,20 @@ static status_t
usb_audio_free(void* cookie) usb_audio_free(void* cookie)
{ {
Device* device = (Device*)cookie; Device* device = (Device*)cookie;
return device->Free();
MutexLocker driverLock;
status_t status = device->Free();
for (int32 i = 0; i < MAX_DEVICES; i++) {
if (gDevices[i] == device) {
// the device is removed already but as it was open the
// removed hook has not deleted the object
gDevices[i] = NULL;
delete device;
TRACE(INF, "Device at %ld deleted.\n", i);
break;
}
}
return status;
} }
const char** const char**
publish_devices() publish_devices()
{ {
MutexLocker _(gDriverLock);
for (int32 i = 0; gDeviceNames[i]; i++) { for (int32 i = 0; gDeviceNames[i]; i++) {
free(gDeviceNames[i]); free(gDeviceNames[i]);
gDeviceNames[i] = NULL; gDeviceNames[i] = NULL;
} }
MutexLocker driverLock;
int32 deviceCount = 0; int32 deviceCount = 0;
for (size_t i = 0; i < MAX_DEVICES; i++) { for (size_t i = 0; i < MAX_DEVICES; i++) {
if (gDevices[i] == NULL) if (gDevices[i] == NULL)