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

usb_disk: Clean up and consolidate mutex/semaphore creation/destruction.

Browse Source
This commit is contained in:
Augustin Cavalier
2023-05-30 14:19:57 -04:00
parent dd6e7cb90d
commit 20313e56ed
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
+23 -10
View File
@@ -106,6 +106,26 @@ status_t usb_disk_synchronize(device_lun *lun, bool force);
// #pragma mark - disk_device helper functions
disk_device_s::disk_device_s()
:
notify(-1),
interruptLock(-1)
{
mutex_init(&lock, "usb_disk device lock");
}
disk_device_s::~disk_device_s()
{
mutex_destroy(&lock);
if (notify >= 0)
delete_sem(notify);
if (interruptLock >= 0)
delete_sem(interruptLock);
}
static DMAResource*
get_dma_resource(disk_device *device, uint32 blockSize)
{
@@ -122,11 +142,8 @@ void
usb_disk_free_device_and_luns(disk_device *device)
{
mutex_lock(&device->lock);
mutex_destroy(&device->lock);
for (int32 i = 0; i < device->dma_resources.Count(); i++)
delete device->dma_resources[i];
delete_sem(device->notify);
delete_sem(device->interruptLock);
for (uint8 i = 0; i < device->lun_count; i++)
free(device->luns[i]);
free(device->luns);
@@ -596,7 +613,7 @@ usb_disk_send_diagnostic(device_lun *lun)
int retry = 100;
err_act action = err_act_ok;
while(result == B_DEV_NO_MEDIA && retry > 0) {
while (result == B_DEV_NO_MEDIA && retry > 0) {
snooze(10000);
result = usb_disk_request_sense(lun, &action);
retry--;
@@ -1090,11 +1107,8 @@ usb_disk_attach(device_node *node, usb_device newDevice, void **cookie)
return B_ERROR;
}
mutex_init(&device->lock, "usb_disk device lock");
device->notify = create_sem(0, "usb_disk callback notify");
if (device->notify < B_OK) {
mutex_destroy(&device->lock);
status_t result = device->notify;
delete device;
return result;
@@ -1103,8 +1117,6 @@ usb_disk_attach(device_node *node, usb_device newDevice, void **cookie)
if (device->is_ufi) {
device->interruptLock = create_sem(0, "usb_disk interrupt lock");
if (device->interruptLock < B_OK) {
mutex_destroy(&device->lock);
delete_sem(device->notify);
status_t result = device->interruptLock;
delete device;
return result;
@@ -1491,7 +1503,8 @@ usb_disk_ioctl(void *cookie, uint32 op, void *buffer, size_t length)
return B_DEV_NOT_READY;
switch (op) {
case B_GET_DEVICE_SIZE: {
case B_GET_DEVICE_SIZE:
{
if (lun->media_changed) {
status_t result = usb_disk_update_capacity(lun);
if (result != B_OK)
src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.h
+3
View File
@@ -31,6 +31,9 @@ typedef struct device_lun_s device_lun;
// holds common information about an attached device (pointed to by luns)
typedef struct disk_device_s {
disk_device_s();
~disk_device_s();
int32 number;
device_node *node;