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

bluetooth_server: some 64 bit fixes

Browse Source
This commit is contained in:
Jérôme Duval
2013-05-04 15:31:04 +02:00
parent dc4e3ce337
commit 48350f1a72
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/bluetooth/BluetoothServer.cpp
+6 -4
View File
@@ -344,7 +344,8 @@ BluetoothServer::HandleAcquireLocalDevice(BMessage* message, BMessage* reply)
for (int index = lastIndex + 1; for (int index = lastIndex + 1;
index < fLocalDevicesList.CountItems(); index++) { index < fLocalDevicesList.CountItems(); index++) {
lDeviceImpl= fLocalDevicesList.ItemAt(index); lDeviceImpl= fLocalDevicesList.ItemAt(index);
printf("Requesting local device %ld\n", lDeviceImpl->GetID()); printf("Requesting local device %" B_PRId32 "\n",
lDeviceImpl->GetID());
if (lDeviceImpl != NULL && lDeviceImpl->Available()) { if (lDeviceImpl != NULL && lDeviceImpl->Available()) {
Output::Instance()->Postf(BLACKBOARD_KIT, Output::Instance()->Postf(BLACKBOARD_KIT,
"Device available: %lx\n", lDeviceImpl->GetID()); "Device available: %lx\n", lDeviceImpl->GetID());
@@ -357,7 +358,8 @@ BluetoothServer::HandleAcquireLocalDevice(BMessage* message, BMessage* reply)
if (lDeviceImpl == NULL) { if (lDeviceImpl == NULL) {
for (int index = 0; index <= lastIndex ; index ++) { for (int index = 0; index <= lastIndex ; index ++) {
lDeviceImpl = fLocalDevicesList.ItemAt(index); lDeviceImpl = fLocalDevicesList.ItemAt(index);
printf("Requesting local device %ld\n", lDeviceImpl->GetID()); printf("Requesting local device %" B_PRId32 "\n",
lDeviceImpl->GetID());
if (lDeviceImpl != NULL && lDeviceImpl->Available()) { if (lDeviceImpl != NULL && lDeviceImpl->Available()) {
Output::Instance()->Postf(BLACKBOARD_KIT, Output::Instance()->Postf(BLACKBOARD_KIT,
"Device available: %lx\n", lDeviceImpl->GetID()); "Device available: %lx\n", lDeviceImpl->GetID());
@@ -600,7 +602,7 @@ BluetoothServer::_InstallDeskbarIcon()
status_t res = deskbar.AddItem(&appInfo.ref); status_t res = deskbar.AddItem(&appInfo.ref);
if (res != B_OK) { if (res != B_OK) {
printf("Failed adding deskbar icon: %ld\n", res); printf("Failed adding deskbar icon: %" B_PRId32 "\n", res);
} }
} }
@@ -611,7 +613,7 @@ BluetoothServer::_RemoveDeskbarIcon()
BDeskbar deskbar; BDeskbar deskbar;
status_t res = deskbar.RemoveItem(kDeskbarItemName); status_t res = deskbar.RemoveItem(kDeskbarItemName);
if (res != B_OK) { if (res != B_OK) {
printf("Failed removing Deskbar icon: %ld: \n", res); printf("Failed removing Deskbar icon: %" B_PRId32 ": \n", res);
} }
} }
src/servers/bluetooth/HCITransportAccessor.cpp
+4 -4
View File
@@ -20,11 +20,11 @@ HCITransportAccessor::HCITransportAccessor(BPath* path) : HCIDelegate(path)
if (fDescriptor > 0) { if (fDescriptor > 0) {
// find out which ID was assigned // find out which ID was assigned
status = ioctl(fDescriptor, GET_HCI_ID, &fIdentifier, 0); status = ioctl(fDescriptor, GET_HCI_ID, &fIdentifier, 0);
printf("%s: hid retrieved %lx status=%ld\n", __FUNCTION__, printf("%s: hid retrieved %" B_PRIx32 " status=%" B_PRId32 "\n",
fIdentifier, status); __FUNCTION__, fIdentifier, status);
} else { } else {
printf("%s: Device driver %s could not be opened %ld\n", __FUNCTION__, printf("%s: Device driver %s could not be opened %" B_PRId32 "\n",
path->Path(), fIdentifier); __FUNCTION__, path->Path(), fIdentifier);
fIdentifier = B_ERROR; fIdentifier = B_ERROR;
} }
src/servers/bluetooth/LocalDeviceHandler.cpp
+3 -2
View File
@@ -93,11 +93,12 @@ LocalDeviceHandler::ClearWantedEvent(BMessage* msg, uint16 event, uint16 opcode)
// for each Event // for each Event
while (msg->FindInt16("eventExpected", eventIndex, &eventFound) == B_OK) { while (msg->FindInt16("eventExpected", eventIndex, &eventFound) == B_OK) {
printf("%s:Event expected %d@%ld...\n", __FUNCTION__, event, eventIndex); printf("%s:Event expected %d@%" B_PRId32 "...\n", __FUNCTION__, event,
eventIndex);
if (eventFound == event) { if (eventFound == event) {
printf("%s:Event matches@%ld", __FUNCTION__, eventIndex); printf("%s:Event matches@%" B_PRId32 "\n", __FUNCTION__, eventIndex);
// there is an opcode specified // there is an opcode specified
if (opcode != 0) { if (opcode != 0) {