Changeset 24699

Timestamp:

03/30/08 17:48:17 (8 months ago)

Author:

oruizdorantes

Message:

- Implementation of the discovery classes & RemoteDevice
. Support for StartInquiry method

Location:

haiku/trunk/src/kits/bluetooth

Files:

• DiscoveryAgent.cpp (modified) (1 diff)
• DiscoveryListener.cpp (modified) (4 diffs)
• Jamfile (modified) (1 diff)
• RemoteDevice.cpp (added)

haiku/trunk/src/kits/bluetooth/DiscoveryAgent.cpp

@@ -8 +8 @@
 #include <bluetooth/DiscoveryAgent.h>
 #include <bluetooth/DiscoveryListener.h>
+#include <bluetooth/RemoteDevice.h>
+#include <bluetooth/LocalDevice.h>
 
-#include <bluetooth/RemoteDevice.h>
+#include <bluetooth/bluetooth_error.h>
+
+#include <bluetooth/bluetoothserver_p.h>
+#include <bluetooth/CommandManager.h>
+
+#include <bluetooth/HCI/btHCI_command.h>
+#include <bluetooth/HCI/btHCI_event.h>
+
+
+#include "KitSupport.h"
 
 namespace Bluetooth {
 
 
-RemoteDevice**
+RemoteDevicesList
 DiscoveryAgent::RetrieveDevices(int option)
 {
-        return NULL;
+    /* No inquiry process initiated */
+    if (fLastUsedListener == NULL)
+        return NULL;
+
+    return fLastUsedListener->GetRemoteDevicesList();
+}
+
+
+status_t
+DiscoveryAgent::StartInquiry(int accessCode, DiscoveryListener* listener)
+{
+    return StartInquiry(accessCode, listener, BT_DEFAULT_INQUIRY_TIME);
+}
+
+
+status_t
+DiscoveryAgent::StartInquiry(uint32 accessCode, DiscoveryListener* listener, bigtime_t secs)
+{
+    BMessenger* btsm = NULL;
+        size_t size;
+
+    if ((btsm = _RetrieveBluetoothMessenger()) == NULL)
+        return B_ERROR;
+
+        if (secs < 1 || secs > 61 )
+                return B_TIMED_OUT;
+
+    void*  startInquiryCommand = NULL;
+    int8   bt_status = BT_ERROR;
+
+    // keep the listener whats the current listener for our inquiry state
+    fLastUsedListener = listener;
+
+    // Inform the listener who is gonna be its owner LocalDevice
+    // and its discovered devices
+    listener->SetLocalDeviceOwner(fLocalDevice);
+
+    /* Issue inquiry command */
+    BMessage request(BT_MSG_HANDLE_SIMPLE_REQUEST);
+    BMessage reply;
+
+    request.AddInt32("hci_id", fLocalDevice->GetID());
+    
+        startInquiryCommand = buildInquiry(accessCode, secs, BT_MAX_RESPONSES, &size);
+        request.AddData("raw command", B_ANY_TYPE, startInquiryCommand, size);
+    request.AddInt16("eventExpected",  HCI_EVENT_CMD_STATUS);
+    request.AddInt16("opcodeExpected", PACK_OPCODE(OGF_LINK_CONTROL, OCF_INQUIRY));
+
+    if (btsm->SendMessage(&request, listener) == B_OK)
+    {
+        return B_OK;
+    }
+        
+        return B_ERROR;
 
 }
 
 
-bool
-DiscoveryAgent::StartInquiry(int accessCode, DiscoveryListener listener)
+status_t
+DiscoveryAgent::CancelInquiry(DiscoveryListener* listener)
 {
-        return false;
+    BMessenger* btsm = NULL;
 
+    if ((btsm = _RetrieveBluetoothMessenger()) == NULL)
+        return B_ERROR;
+
+    void* cancelInquiryCommand = NULL;
+    int8  bt_status = BT_ERROR;
+
+    /* Issue inquiry command */
+    BMessage request(BT_MSG_HANDLE_SIMPLE_REQUEST);
+    BMessage reply;
+
+    request.AddInt32("hci_id", fLocalDevice->GetID());
+    // TODO: Add the raw command to the BMessage + expected event(s)
+
+
+
+    if (btsm->SendMessage(&request, listener) == B_OK) {
+        if (reply.FindInt8("status", &bt_status ) == B_OK ) {
+            return bt_status;
+        }
+    }
+        
+        return B_ERROR;
+}
+
+void
+DiscoveryAgent::SetLocalDeviceOwner(LocalDevice* ld)
+{
+    fLocalDevice = ld;
+}
+
+DiscoveryAgent::DiscoveryAgent()
+{
+    fLocalDevice = NULL;
 }
 
 
-bool
-DiscoveryAgent::CancelInquiry(DiscoveryListener listener)
-{
-        return false;
 }
-        
-
-DiscoveryAgent::DiscoveryAgent()
-{
-
-}
-
-}

haiku/trunk/src/kits/bluetooth/DiscoveryListener.cpp

@@ -10 +10 @@
 #include <bluetooth/DeviceClass.h>
 
+#include <bluetooth/HCI/btHCI_event.h>
+
 #include <bluetoothserver_p.h>
 
@@ -19 +21 @@
 /* hooks */
 void 
-DiscoveryListener::DeviceDiscovered(RemoteDevice btDevice, DeviceClass cod)
+DiscoveryListener::DeviceDiscovered(RemoteDevice* btDevice, DeviceClass cod)
 {
     
@@ -42 +44 @@
 
 /* private */            
-DiscoveryListener::DiscoveryListener()
+
+/* A LocalDevice is always referenced in any request to the
+   Bluetooth server therefore is going to be needed in any */
+void
+DiscoveryListener::SetLocalDeviceOwner(LocalDevice* ld)
+{
+    fLocalDevice = ld;
+}
+
+
+RemoteDevicesList
+DiscoveryListener::GetRemoteDevicesList(void)
+{
+        return fRemoteDevicesList;
+}
+
+
+void
+DiscoveryListener::MessageReceived(BMessage* message)
+{
+    int8 status;
+
+    switch (message->what)
+    {
+        case BT_MSG_INQUIRY_DEVICE:
+        {
+                        const struct inquiry_info* inquiryInfo;
+                        ssize_t size;   
+
+                        if (message->FindData("info", B_ANY_TYPE, 0, (const void**)&inquiryInfo, &size) == B_OK )
+                        {                       
+                    RemoteDevice* rd = new RemoteDevice(inquiryInfo->bdaddr);
+                    //  DeviceClass(inquiryInfo->dev_class[0] | inquiryInfo->dev_class[1]<<8 | inquiryInfo->dev_class[2]<<16 )
+                                //  fRemoteDevicesList.AddItem(rd);
+                    rd->SetLocalDeviceOwner(fLocalDevice);            
+                    DeviceDiscovered( rd, DeviceClass(inquiryInfo->dev_class[0] | inquiryInfo->dev_class[1]<<8 | inquiryInfo->dev_class[2]<<16 ));
+
+                        }
+        }
+        break;
+
+        case BT_MSG_INQUIRY_STARTED:
+            if (message->FindInt8("status", &status) == B_OK){
+                    InquiryStarted(status);
+            }
+            
+        break;
+
+        case BT_MSG_INQUIRY_COMPLETED:
+
+            InquiryCompleted(BT_INQUIRY_COMPLETED);
+
+        break;
+        case BT_MSG_INQUIRY_TERMINATED: /* inquiry was cancelled */
+
+            InquiryCompleted(BT_INQUIRY_TERMINATED);
+
+        break;
+        case BT_MSG_INQUIRY_ERROR:
+
+            InquiryCompleted(BT_INQUIRY_ERROR);
+
+        break;
+
+        default:
+
+            BLooper::MessageReceived(message);
+
+        break;
+
+    }
+
+}
+
+
+DiscoveryListener::DiscoveryListener() : BLooper()
 {
 
@@ -48 +125 @@
 
 
-void 
-DiscoveryListener::MessageReceived(BMessage* message)
-{
-    switch (message->what) 
-    {
-        case BT_MSG_INQUIRY_DEVICE:
-            
-            /* TODO: Extract info from BMessage to create a 
-               proper RemoteDevice, message should be passed from Agent??? */
-               
-            /* - Instance to be stored/Registered in the Agent? */            
-            //DeviceDiscovered( RemoteDevice(BString("00:00:00:00:00:00")), DeviceClass(0));
-
-        break;
-        
-        case BT_MSG_INQUIRY_COMPLETED:
-
-            InquiryCompleted(B_BT_INQUIRY_COMPLETED);
-
-        break;
-        case BT_MSG_INQUIRY_TERMINATED:
-
-            InquiryCompleted(B_BT_INQUIRY_TERMINATED);
-
-        break;
-        case BT_MSG_INQUIRY_ERROR:
-
-            InquiryCompleted(B_BT_INQUIRY_ERROR);            
-
-        break;
-        
-        default:
-
-            BLooper::MessageReceived(message);
-
-        break;
-        
-    }        
-    
 }
-
-}

haiku/trunk/src/kits/bluetooth/Jamfile

@@ -10 +10 @@
 
 SharedLibrary libbluetooth.so :
+SharedLibrary libbluetooth.so :
         LocalDevice.cpp
+        DiscoveryListener.cpp
         DiscoveryAgent.cpp
-        DiscoveryListener.cpp
+        RemoteDevice.cpp
         CommandManager.cpp
         KitSupport.cpp