[haiku-commits] haiku: hrev45974 - src/add-ons/kernel/drivers/audio/usb
- From: zharik@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 19 Aug 2013 21:22:47 +0200 (CEST)
hrev45974 adds 1 changeset to branch 'master'
old head: 03891f74dbbd196ad6460768475a0d7a4f0718e0
new head: 222b10cbc0981904272b180609c74df8510b5c21
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=222b10c+%5E03891f7
----------------------------------------------------------------------------
222b10c: USB audio: Fix building on x86_64
* fix x86_64 build errors and warnings pointed out by Diver;
* fix warning building with gcc2.
[ Siarzhuk Zharski <zharik@xxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45974
Commit: 222b10cbc0981904272b180609c74df8510b5c21
URL: http://cgit.haiku-os.org/haiku/commit/?id=222b10c
Author: Siarzhuk Zharski <zharik@xxxxxx>
Date: Mon Aug 19 19:18:59 2013 UTC
----------------------------------------------------------------------------
3 files changed, 9 insertions(+), 8 deletions(-)
src/add-ons/kernel/drivers/audio/usb/Driver.cpp | 2 +-
src/add-ons/kernel/drivers/audio/usb/Stream.cpp | 11 ++++++-----
src/add-ons/kernel/drivers/audio/usb/Stream.h | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/audio/usb/Driver.cpp
b/src/add-ons/kernel/drivers/audio/usb/Driver.cpp
index d636ac9..6ea128a 100644
--- a/src/add-ons/kernel/drivers/audio/usb/Driver.cpp
+++ b/src/add-ons/kernel/drivers/audio/usb/Driver.cpp
@@ -254,7 +254,7 @@ publish_devices()
MutexLocker driverLock;
int32 deviceCount = 0;
- for (int32 i = 0; i < MAX_DEVICES; i++) {
+ for (size_t i = 0; i < MAX_DEVICES; i++) {
if (gDevices[i] == NULL)
continue;
diff --git a/src/add-ons/kernel/drivers/audio/usb/Stream.cpp
b/src/add-ons/kernel/drivers/audio/usb/Stream.cpp
index 0e5f685..7493369 100644
--- a/src/add-ons/kernel/drivers/audio/usb/Stream.cpp
+++ b/src/add-ons/kernel/drivers/audio/usb/Stream.cpp
@@ -117,7 +117,7 @@ Stream::_ChooseAlternate()
== USB_ENDPOINT_ADDR_DIR_IN;
if (fIsInput)
- fCurrentBuffer = -1;
+ fCurrentBuffer = (size_t)-1;
TRACE(INF, "Alternate %d EP:%x selected for %s!\n",
fActiveAlternate, endpoint->fEndpointAddress,
@@ -306,8 +306,8 @@ Stream::_QueueNextTransfer(size_t queuedBuffer, bool start)
void
-Stream::_TransferCallback(void* cookie, int32 status, void* data,
- uint32 actualLength)
+Stream::_TransferCallback(void* cookie, status_t status, void* data,
+ size_t actualLength)
{
Stream* stream = (Stream*)cookie;
atomic_add(&stream->fInsideNotify, 1);
@@ -371,10 +371,11 @@ Stream::SetEnabledChannels(uint32& offset,
multi_channel_enable* Enable)
if (cluster == 0)
return B_ERROR;
- for (size_t i = 0; i < cluster->ChannelsCount(); i++)
+ for (size_t i = 0; i < cluster->ChannelsCount(); i++, offset++) {
TRACE(INF, "%s channel %d.\n",
- (B_TEST_CHANNEL(Enable->enable_bits, offset++)
+ (B_TEST_CHANNEL(Enable->enable_bits, offset)
? "Enable" : "Disable"), offset + 1);
+ }
return B_OK;
}
diff --git a/src/add-ons/kernel/drivers/audio/usb/Stream.h
b/src/add-ons/kernel/drivers/audio/usb/Stream.h
index 0635f70..b525acb 100644
--- a/src/add-ons/kernel/drivers/audio/usb/Stream.h
+++ b/src/add-ons/kernel/drivers/audio/usb/Stream.h
@@ -64,8 +64,8 @@ private:
status_t _ChooseAlternate();
status_t _SetupBuffers();
status_t _QueueNextTransfer(size_t
buffer, bool start);
- static void _TransferCallback(void* cookie, int32
status,
- void* data,
uint32 actualLength);
+ static void _TransferCallback(void* cookie,
status_t status,
+ void* data,
size_t actualLength);
void _DumpDescriptors();
};
Other related posts:
- » [haiku-commits] haiku: hrev45974 - src/add-ons/kernel/drivers/audio/usb - zharik
