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

usb_serial: fixes 64 bit warnings

Browse Source
This commit is contained in:
Jérôme Duval
2013-05-09 17:40:35 +02:00
parent 0e8bd8493a
commit 24dba16d04
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/ports/usb_serial/Driver.cpp
+1 -1
View File
@@ -351,7 +351,7 @@ publish_devices()
if (gSerialDevices[i]) { if (gSerialDevices[i]) {
gDeviceNames[j] = (char *)malloc(strlen(sDeviceBaseName) + 4); gDeviceNames[j] = (char *)malloc(strlen(sDeviceBaseName) + 4);
if (gDeviceNames[j]) { if (gDeviceNames[j]) {
sprintf(gDeviceNames[j], "%s%ld", sDeviceBaseName, i); sprintf(gDeviceNames[j], "%s%" B_PRId32, sDeviceBaseName, i);
j++; j++;
} else } else
TRACE_ALWAYS("publish_devices - no memory to allocate device names\n"); TRACE_ALWAYS("publish_devices - no memory to allocate device names\n");
src/add-ons/kernel/drivers/ports/usb_serial/SerialDevice.cpp
+3 -3
View File
@@ -669,7 +669,7 @@ SerialDevice::_WriteToDevice()
void void
SerialDevice::_ReadCallbackFunction(void *cookie, status_t status, void *data, SerialDevice::_ReadCallbackFunction(void *cookie, status_t status, void *data,
uint32 actualLength) size_t actualLength)
{ {
TRACE_FUNCALLS("read callback: cookie: 0x%08x status: 0x%08x data: 0x%08x " TRACE_FUNCALLS("read callback: cookie: 0x%08x status: 0x%08x data: 0x%08x "
"length: %lu\n", cookie, status, data, actualLength); "length: %lu\n", cookie, status, data, actualLength);
@@ -683,7 +683,7 @@ SerialDevice::_ReadCallbackFunction(void *cookie, status_t status, void *data,
void void
SerialDevice::_WriteCallbackFunction(void *cookie, status_t status, void *data, SerialDevice::_WriteCallbackFunction(void *cookie, status_t status, void *data,
uint32 actualLength) size_t actualLength)
{ {
TRACE_FUNCALLS("write callback: cookie: 0x%08x status: 0x%08x data: 0x%08x " TRACE_FUNCALLS("write callback: cookie: 0x%08x status: 0x%08x data: 0x%08x "
"length: %lu\n", cookie, status, data, actualLength); "length: %lu\n", cookie, status, data, actualLength);
@@ -697,7 +697,7 @@ SerialDevice::_WriteCallbackFunction(void *cookie, status_t status, void *data,
void void
SerialDevice::_InterruptCallbackFunction(void *cookie, status_t status, SerialDevice::_InterruptCallbackFunction(void *cookie, status_t status,
void *data, uint32 actualLength) void *data, size_t actualLength)
{ {
TRACE_FUNCALLS("interrupt callback: cookie: 0x%08x status: 0x%08x data: " TRACE_FUNCALLS("interrupt callback: cookie: 0x%08x status: 0x%08x data: "
"0x%08x len: %lu\n", cookie, status, data, actualLength); "0x%08x len: %lu\n", cookie, status, data, actualLength);
src/add-ons/kernel/drivers/ports/usb_serial/SerialDevice.h
+3 -3
View File
@@ -95,13 +95,13 @@ static int32 _InputThread(void *data);
static void _ReadCallbackFunction(void *cookie, static void _ReadCallbackFunction(void *cookie,
int32 status, void *data, int32 status, void *data,
uint32 actualLength); size_t actualLength);
static void _WriteCallbackFunction(void *cookie, static void _WriteCallbackFunction(void *cookie,
int32 status, void *data, int32 status, void *data,
uint32 actualLength); size_t actualLength);
static void _InterruptCallbackFunction(void *cookie, static void _InterruptCallbackFunction(void *cookie,
int32 status, void *data, int32 status, void *data,
uint32 actualLength); size_t actualLength);
usb_device fDevice; // USB device handle usb_device fDevice; // USB device handle
uint16 fVendorID; uint16 fVendorID;