From fa262f2273ad87695689f196e75fc18c451aa708 Mon Sep 17 00:00:00 2001 From: Oliver Ruiz Dorantes Date: Fri, 20 Feb 2009 18:25:41 +0000 Subject: [PATCH] Add prototypes to keep/use global Inquiry time git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29264 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/bluetooth/DiscoveryAgent.h | 9 ++++++--- headers/os/bluetooth/DiscoveryListener.h | 3 +-- src/kits/bluetooth/DiscoveryAgent.cpp | 2 +- src/kits/bluetooth/KitSupport.cpp | 20 +++++++++++++++----- src/kits/bluetooth/KitSupport.h | 3 +++ 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/headers/os/bluetooth/DiscoveryAgent.h b/headers/os/bluetooth/DiscoveryAgent.h index 428a61f48a..85dcea1b62 100644 --- a/headers/os/bluetooth/DiscoveryAgent.h +++ b/headers/os/bluetooth/DiscoveryAgent.h @@ -7,6 +7,7 @@ #include #include +#include #define BT_CACHED 0x00 @@ -17,13 +18,15 @@ #define BT_LIAC 0x9E8B00 #define BT_MAX_RESPONSES (32) + #define BT_BASE_INQUIRY_TIME (1.28) -#define BT_DEFAULT_INQUIRY_TIME (0x15*BT_BASE_INQUIRY_TIME) /* TODO: REVIEW SPECS! */ +#define BT_DEFAULT_INQUIRY_TIME (0x0A) +#define BT_MIN_INQUIRY_TIME (0x01) // 1.18 secs +#define BT_MAX_INQUIRY_TIME (0x30) // 61.44 secs namespace Bluetooth { -class DiscoveryListener; -class RemoteDevice; +class LocalDevice; class DiscoveryAgent { diff --git a/headers/os/bluetooth/DiscoveryListener.h b/headers/os/bluetooth/DiscoveryListener.h index 55cb6070bc..5f9f8676eb 100644 --- a/headers/os/bluetooth/DiscoveryListener.h +++ b/headers/os/bluetooth/DiscoveryListener.h @@ -8,6 +8,7 @@ #include #include +#include #include @@ -20,8 +21,6 @@ namespace Bluetooth { typedef BObjectList RemoteDevicesList; -class RemoteDevice; -class DeviceClass; class LocalDevice; class DiscoveryListener : public BLooper { diff --git a/src/kits/bluetooth/DiscoveryAgent.cpp b/src/kits/bluetooth/DiscoveryAgent.cpp index d2abbe59fe..f415b3cb8a 100644 --- a/src/kits/bluetooth/DiscoveryAgent.cpp +++ b/src/kits/bluetooth/DiscoveryAgent.cpp @@ -36,7 +36,7 @@ DiscoveryAgent::RetrieveDevices(int option) status_t DiscoveryAgent::StartInquiry(int accessCode, DiscoveryListener* listener) { - return StartInquiry(accessCode, listener, BT_DEFAULT_INQUIRY_TIME); + return StartInquiry(accessCode, listener, GetInquiryTime()); } diff --git a/src/kits/bluetooth/KitSupport.cpp b/src/kits/bluetooth/KitSupport.cpp index d7f2b02676..5c7483d9fc 100644 --- a/src/kits/bluetooth/KitSupport.cpp +++ b/src/kits/bluetooth/KitSupport.cpp @@ -4,16 +4,13 @@ * All rights reserved. Distributed under the terms of the MIT License. * */ - - #include +#include + #include #include "KitSupport.h" - - - BMessenger* _RetrieveBluetoothMessenger(void) { // Fix/review: leaking memory here @@ -24,3 +21,16 @@ BMessenger* _RetrieveBluetoothMessenger(void) else return fMessenger; } + + +uint8 GetInquiryTime() +{ + return BT_DEFAULT_INQUIRY_TIME; +} + + +void SetInquiryTime(uint8 time) +{ + ((void)(time)); + +} diff --git a/src/kits/bluetooth/KitSupport.h b/src/kits/bluetooth/KitSupport.h index adca3c2a13..69eea93606 100644 --- a/src/kits/bluetooth/KitSupport.h +++ b/src/kits/bluetooth/KitSupport.h @@ -5,3 +5,6 @@ #include BMessenger* _RetrieveBluetoothMessenger(void); + +uint8 GetInquiryTime(); +void SetInquiryTime(uint8 time);