From 34352671ed7351e06e7d6597311c6d42aa309a5c Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Fri, 3 Sep 2021 17:21:47 -0400
Subject: [PATCH] usb_audio: Yet more code cleanup.

Slight logic tweaks but no real behavioral changes intended.
---
 src/add-ons/kernel/drivers/audio/usb/Device.cpp |  6 ++++--
 src/add-ons/kernel/drivers/audio/usb/Stream.cpp | 17 ++++++-----------
 src/add-ons/kernel/drivers/audio/usb/Stream.h   |  5 +++--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/add-ons/kernel/drivers/audio/usb/Device.cpp b/src/add-ons/kernel/drivers/audio/usb/Device.cpp
index 5e4cce114b..955b608333 100644
--- a/src/add-ons/kernel/drivers/audio/usb/Device.cpp
+++ b/src/add-ons/kernel/drivers/audio/usb/Device.cpp
@@ -694,9 +694,10 @@ Device::_MultiBufferExchange(multi_buffer_info* multiInfo)
 		return B_BAD_ADDRESS;
 	}
 
-	for (int i = 0; i < fStreams.Count(); i++)
+	for (int i = 0; i < fStreams.Count(); i++) {
 		if (!fStreams[i]->IsRunning())
 			fStreams[i]->Start();
+	}
 
 	status_t status = acquire_sem_etc(fBuffersReadySem, 1,
 		B_RELATIVE_TIMEOUT | B_CAN_INTERRUPT, 50000);
@@ -706,11 +707,12 @@ Device::_MultiBufferExchange(multi_buffer_info* multiInfo)
 	}
 
 	status = B_ERROR;
-	for (int i = 0; i < fStreams.Count(); i++)
+	for (int i = 0; i < fStreams.Count(); i++) {
 		if (fStreams[i]->ExchangeBuffer(&Info)) {
 			status = B_OK;
 			break;
 		}
+	}
 
 	if (status != B_OK) {
 		TRACE(ERR, "Error processing buffers:%08x.\n", status);
diff --git a/src/add-ons/kernel/drivers/audio/usb/Stream.cpp b/src/add-ons/kernel/drivers/audio/usb/Stream.cpp
index acc6962544..9609f77c8a 100644
--- a/src/add-ons/kernel/drivers/audio/usb/Stream.cpp
+++ b/src/add-ons/kernel/drivers/audio/usb/Stream.cpp
@@ -29,8 +29,8 @@ Stream::Stream(Device* device, size_t interface, usb_interface_list* List)
 	fDescriptors(NULL),
 	fDescriptorsCount(0),
 	fCurrentBuffer(0),
-	fStartingFrame(0),
 	fSamplesCount(0),
+	fStartingFrame(0),
 	fPacketSize(0),
 	fProcessedBuffers(0),
 	fInsideNotify(0)
@@ -146,7 +146,7 @@ Stream::OnRemove()
 	// not inside the callback anymore before returning, as we would otherwise
 	// violate the promise not to use any of the pipes after returning from the
 	// removed callback
-	while (atomic_add(&fInsideNotify, 0) != 0)
+	while (atomic_get(&fInsideNotify) != 0)
 		snooze(100);
 
 	gUSBModule->cancel_queued_transfers(fStreamEndpoint);
@@ -285,7 +285,7 @@ Stream::Stop()
 {
 	if (fIsRunning) {
 		// wait until possible notification handling finished...
-		while (atomic_add(&fInsideNotify, 0) != 0)
+		while (atomic_get(&fInsideNotify) != 0)
 			snooze(100);
 		fIsRunning = false;
 	}
@@ -328,9 +328,9 @@ Stream::_TransferCallback(void* cookie, status_t status, void* data,
 	Stream* stream = (Stream*)cookie;
 	atomic_add(&stream->fInsideNotify, 1);
 	if (status == B_CANCELED || stream->fDevice->fRemoved || !stream->fIsRunning) {
-		atomic_add(&stream->fInsideNotify, -1);
 		TRACE(ERR, "Cancelled: c:%p st:%#010x, data:%#010x, len:%d\n",
 			cookie, status, data, actualLength);
+		atomic_add(&stream->fInsideNotify, -1);
 		return;
 	}
 
@@ -354,10 +354,7 @@ Stream::_TransferCallback(void* cookie, status_t status, void* data,
 void
 Stream::_DumpDescriptors()
 {
-	//size_t packetsCount = fDescriptorsCount / kSamplesBufferCount;
-	size_t from = /*fCurrentBuffer > 0 ? packetsCount :*/ 0 ;
-	size_t to   = /*fCurrentBuffer > 0 ?*/ fDescriptorsCount /*: packetsCount*/ ;
-	for (size_t i = from; i < to; i++)
+	for (size_t i = 0; i < fDescriptorsCount; i++)
 		TRACE(ISO, "%d:req_len:%d; act_len:%d; stat:%#010x\n", i,
 			fDescriptors[i].request_length,	fDescriptors[i].actual_length,
 			fDescriptors[i].status);
@@ -489,8 +486,6 @@ Stream::GetBuffers(multi_buffer_list* List)
 
 	TypeIFormatDescriptor* format = static_cast<TypeIFormatDescriptor*>(
 		fAlternates[fActiveAlternate]->Format());
-//	const ASEndpointDescriptor* endpoint
-//					= fAlternates[fActiveAlternate]->Endpoint();
 
 	// [buffer][channel] init buffers
 	for (size_t buffer = 0; buffer < kSamplesBufferCount; buffer++) {
@@ -538,7 +533,7 @@ Stream::GetBuffers(multi_buffer_list* List)
 bool
 Stream::ExchangeBuffer(multi_buffer_info* Info)
 {
-	if (fProcessedBuffers <= 0)
+	if (atomic_get(&fProcessedBuffers) <= 0)
 		return false;
 
 	if (fIsInput) {
diff --git a/src/add-ons/kernel/drivers/audio/usb/Stream.h b/src/add-ons/kernel/drivers/audio/usb/Stream.h
index e585b39a51..61e1b65b9a 100644
--- a/src/add-ons/kernel/drivers/audio/usb/Stream.h
+++ b/src/add-ons/kernel/drivers/audio/usb/Stream.h
@@ -42,12 +42,12 @@ public:
 			status_t		SetGlobalFormat(multi_format_info* Format);
 
 protected:
-
 			Device*			fDevice;
 			status_t		fStatus;
 
 			uint8			fTerminalID;
 			usb_pipe		fStreamEndpoint;
+
 			bool			fIsRunning;
 			area_id			fArea, fKernelArea;
 			size_t			fAreaSize;
@@ -56,9 +56,10 @@ protected:
 			uint8*			fBuffers;
 			uint8*			fKernelBuffers;
 			size_t			fCurrentBuffer;
-			uint32			fStartingFrame;
 			size_t			fSamplesCount;
+
 			size_t			fPacketSize;
+			uint32			fStartingFrame;
 			int32			fProcessedBuffers;
 			int32			fInsideNotify;