Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This allows that 2 or more LocalDevices can be retrieved with repeated calls of LocalDevice::GetLocalDevice()

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29156 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Ruiz Dorantes 2009-02-08 01:56:16 +00:00
parent 42fe9293f8
commit 9306af4deb
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/servers/bluetooth/BluetoothServer.cpp
View File

@ -226,7 +226,7 @@ BluetoothServer::HandleAcquireLocalDevice(BMessage* message, BMessage* reply)
ssize_t size; ssize_t size;
bdaddr_t bdaddr; bdaddr_t bdaddr;
LocalDeviceImpl* ldi = NULL; LocalDeviceImpl* ldi = NULL;
int32 index = 0; static int32 lastIndex = 0;
if (message->FindInt32("hci_id", &hid) == B_OK) if (message->FindInt32("hci_id", &hid) == B_OK)
{ {
@ -239,38 +239,56 @@ BluetoothServer::HandleAcquireLocalDevice(BMessage* message, BMessage* reply)
/* Try to find out when the user specified the address */ /* Try to find out when the user specified the address */
Output::Instance()->Post("GetLocalDevice requested with bdaddr\n", Output::Instance()->Post("GetLocalDevice requested with bdaddr\n",
BLACKBOARD_KIT); BLACKBOARD_KIT);
for (index = 0; index < fLocalDevicesList.CountItems(); index ++) { for (lastIndex = 0; lastIndex < fLocalDevicesList.CountItems(); lastIndex ++) {
bdaddr_t local; //TODO: Only possible if the property is available
ldi = fLocalDevicesList.ItemAt(index); //bdaddr_t local;
// TODO: Only if the property is available //ldi = fLocalDevicesList.ItemAt(lastIndex);
//if ((ldi->GetAddress(&local, message) == B_OK) //if ((ldi->GetAddress(&local, message) == B_OK)
// && bacmp(&local, &bdaddr)) { // && bacmp(&local, &bdaddr)) {
// break; // break;
//} //}
} }
} else { } else {
/* Careless, any device not performing operations will be fine */ // Careless, any device not performing operations will be fine
Output::Instance()->Post("GetLocalDevice requested\n", BLACKBOARD_KIT); Output::Instance()->Post("GetLocalDevice plain request\n", BLACKBOARD_KIT);
for (index = 0; index < fLocalDevicesList.CountItems(); index ++) { // from last assigned till end
for ( int index = lastIndex + 1; index < fLocalDevicesList.CountItems(); index ++) {
ldi = fLocalDevicesList.ItemAt(index);
printf("Requesting local device %ld\n", ldi->GetID());
if (ldi != NULL && ldi->Available())
{
Output::Instance()->Postf(BLACKBOARD_KIT, "Device available: %lx\n", ldi->GetID());
lastIndex = index;
break;
}
}
// from starting till last assigned if not yet found
if (ldi == NULL) {
for ( int index = 0; index <= lastIndex ; index ++) {
ldi = fLocalDevicesList.ItemAt(index); ldi = fLocalDevicesList.ItemAt(index);
printf("Requesting local device %ld\n", ldi->GetID()); printf("Requesting local device %ld\n", ldi->GetID());
if (ldi != NULL && ldi->Available()) if (ldi != NULL && ldi->Available())
{ {
printf("dev ours %ld\n", ldi->GetID()); Output::Instance()->Postf(BLACKBOARD_KIT, "Device available: %lx\n", ldi->GetID());
lastIndex = index;
break; break;
} }
} }
} }
if (index <= fLocalDevicesList.CountItems() && ldi != NULL && ldi->Available()) {
Output::Instance()->Post("Device acquired\n", BLACKBOARD_KIT);
ldi->Acquire();
return reply->AddInt32("hci_id", hid);
} }
if (lastIndex <= fLocalDevicesList.CountItems() && ldi != NULL && ldi->Available()) {
hid = ldi->GetID();
ldi->Acquire();
Output::Instance()->Postf(BLACKBOARD_KIT, "Device acquired %lx\n", hid);
return reply->AddInt32("hci_id", hid);
}
return B_ERROR; return B_ERROR;
} }