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

Class name starts with uppercase/ style 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30336 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Ruiz Dorantes 2009-04-22 20:59:17 +00:00
parent 3861c65e89
commit 620b8b6e4c
2 changed files with 74 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/bin/bt_dev_info.cpp
View File

@ -1,8 +1,6 @@
/* /*
* Copyright 2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com * Copyright 2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
*
* All rights reserved. Distributed under the terms of the MIT License. * All rights reserved. Distributed under the terms of the MIT License.
*
*/ */
#include <stdio.h> #include <stdio.h>
@ -16,7 +14,7 @@ static void
DumpInfo(LocalDevice* device) DumpInfo(LocalDevice* device)
{ {
printf("[LocalDevice] %s\t%s\n", (device->GetFriendlyName()).String(), printf("[LocalDevice] %s\t%s\n", (device->GetFriendlyName()).String(),
bdaddrUtils::ToString(device->GetBluetoothAddress())); bdaddrUtils::ToString(device->GetBluetoothAddress()));
BString classString; BString classString;
DeviceClass cod = device->GetDeviceClass(); DeviceClass cod = device->GetDeviceClass();
@ -27,8 +25,10 @@ DumpInfo(LocalDevice* device)
classString << " |"; classString << " |";
cod.GetMinorDeviceClass(classString); cod.GetMinorDeviceClass(classString);
printf("\t\t%s: \n", classString.String()); printf("\t\t%s: \n", classString.String());
} }
static status_t static status_t
LocalDeviceError(status_t status) LocalDeviceError(status_t status)
{ {
@ -41,32 +41,32 @@ LocalDeviceError(status_t status)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
if (argc == 2) { if (argc == 2) {
// device specified // device specified
LocalDevice* ld = LocalDevice::GetLocalDevice(atoi(argv[0])); LocalDevice* ld = LocalDevice::GetLocalDevice(atoi(argv[0]));
if (ld == NULL) if (ld == NULL)
return LocalDeviceError(ENODEV); return LocalDeviceError(ENODEV);
DumpInfo(ld); DumpInfo(ld);
} else if (argc == 1) { } else if (argc == 1) {
// show all devices // show all devices
LocalDevice* ld = NULL; LocalDevice* ld = NULL;
printf("Listing %ld Bluetooth Local Devices ...\n", LocalDevice::GetLocalDeviceCount()); printf("Listing %ld Bluetooth Local Devices ...\n",
for (uint32 index = 0 ; index < LocalDevice::GetLocalDeviceCount() ; index++) { LocalDevice::GetLocalDeviceCount());
for (uint32 index = 0 ; index < LocalDevice::GetLocalDeviceCount() ; index++) {
ld = LocalDevice::GetLocalDevice(); ld = LocalDevice::GetLocalDevice();
if (ld == NULL) if (ld == NULL)
return LocalDeviceError(ENODEV); return LocalDeviceError(ENODEV);
DumpInfo(ld); DumpInfo(ld);
}
} return B_OK;
return B_OK; } else {
fprintf(stderr,"Usage: bt_dev_info [device]\n");
} else { return B_ERROR;
fprintf(stderr,"Usage: bt_dev_info [device]\n"); }
return B_ERROR;
}
} }

77
src/bin/bt_discovery.cpp
View File

@ -6,8 +6,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <bluetooth/LocalDevice.h>
#include <bluetooth/bdaddrUtils.h> #include <bluetooth/bdaddrUtils.h>
#include <bluetooth/LocalDevice.h>
#include <bluetooth/DeviceClass.h> #include <bluetooth/DeviceClass.h>
#include <bluetooth/DiscoveryAgent.h> #include <bluetooth/DiscoveryAgent.h>
@ -15,11 +15,12 @@
thread_id mainThread; thread_id mainThread;
class simpleDiscoveryListener : public DiscoveryListener { class SimpleDiscoveryListener : public DiscoveryListener {
public: public:
simpleDiscoveryListener() : DiscoveryListener() SimpleDiscoveryListener()
: DiscoveryListener()
{ {
} }
@ -30,13 +31,15 @@ DeviceDiscovered(RemoteDevice* btDevice, DeviceClass cod)
{ {
BString classString; BString classString;
printf("\t%s: Device %s discovered.\n",__FUNCTION__, bdaddrUtils::ToString(btDevice->GetBluetoothAddress())); printf("\t%s: Device %s discovered.\n",__FUNCTION__,
bdaddrUtils::ToString(btDevice->GetBluetoothAddress()));
cod.GetServiceClass(classString); cod.GetServiceClass(classString);
classString << " |"; classString << " |";
cod.GetMajorDeviceClass(classString); cod.GetMajorDeviceClass(classString);
classString << " |"; classString << " |";
cod.GetMinorDeviceClass(classString); cod.GetMinorDeviceClass(classString);
printf("\t\t%s: \n", classString.String()); printf("\t\t%s: \n", classString.String());
} }
@ -44,10 +47,8 @@ DeviceDiscovered(RemoteDevice* btDevice, DeviceClass cod)
void void
InquiryCompleted(int discType) InquiryCompleted(int discType)
{ {
printf("\t%s: Inquiry process has finished ...\n",__FUNCTION__); printf("\t%s: Inquiry process has finished ...\n",__FUNCTION__);
(void)send_data(mainThread, discType, NULL, 0); (void)send_data(mainThread, discType, NULL, 0);
} }
@ -72,27 +73,29 @@ DumpInfo(LocalDevice* device)
} }
printf("Discovering for [LocalDevice] %s\t%s\n\n", printf("Discovering for [LocalDevice] %s\t%s\n\n",
(device->GetFriendlyName()).String(), (device->GetFriendlyName()).String(),
bdaddrUtils::ToString(device->GetBluetoothAddress())); bdaddrUtils::ToString(device->GetBluetoothAddress()));
simpleDiscoveryListener* dListener = new simpleDiscoveryListener(); SimpleDiscoveryListener* dListener = new SimpleDiscoveryListener();
dAgent->StartInquiry(BT_GIAC, dListener); dAgent->StartInquiry(BT_GIAC, dListener);
thread_id sender; thread_id sender;
(void)receive_data(&sender, NULL, 0); (void)receive_data(&sender, NULL, 0);
printf("Retrieving names ...\n"); printf("Retrieving names ...\n");
for (int32 index = 0 ; index < dAgent->RetrieveDevices(0).CountItems(); index++ ) { for (int32 index = 0 ; index < dAgent->RetrieveDevices(0).CountItems(); index++ ) {
RemoteDevice* rDevice = dAgent->RetrieveDevices(0).ItemAt(index); RemoteDevice* rDevice = dAgent->RetrieveDevices(0).ItemAt(index);
printf("\t%s \t@ %s ...\n", rDevice->GetFriendlyName(true).String(), bdaddrUtils::ToString(rDevice->GetBluetoothAddress())); printf("\t%s \t@ %s ...\n", rDevice->GetFriendlyName(true).String(),
bdaddrUtils::ToString(rDevice->GetBluetoothAddress()));
} }
} }
static status_t static status_t
LocalDeviceError(status_t status) LocalDeviceError(status_t status)
{ {
@ -105,38 +108,38 @@ LocalDeviceError(status_t status)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
mainThread = find_thread(NULL); mainThread = find_thread(NULL);
if (argc == 2) { if (argc == 2) {
// device specified // device specified
LocalDevice* device = LocalDevice::GetLocalDevice(atoi(argv[0])); LocalDevice* device = LocalDevice::GetLocalDevice(atoi(argv[0]));
if (device == NULL) if (device == NULL)
return LocalDeviceError(ENODEV); return LocalDeviceError(ENODEV);
DumpInfo(device); DumpInfo(device);
} else if (argc == 1) { } else if (argc == 1) {
// show all devices // show all devices
LocalDevice* device = NULL; LocalDevice* device = NULL;
printf("Performing discovery for %ld Bluetooth Local Devices ...\n", LocalDevice::GetLocalDeviceCount()); printf("Performing discovery for %ld Bluetooth Local Devices ...\n",
LocalDevice::GetLocalDeviceCount());
for (uint32 index = 0 ; index < LocalDevice::GetLocalDeviceCount() ; index++) { for (uint32 index = 0 ; index < LocalDevice::GetLocalDeviceCount() ; index++) {
device = LocalDevice::GetLocalDevice(); device = LocalDevice::GetLocalDevice();
if (device == NULL) { if (device == NULL) {
LocalDeviceError(ENODEV); LocalDeviceError(ENODEV);
continue; continue;
} }
DumpInfo(device); DumpInfo(device);
} }
return B_OK; return B_OK;
} else { } else {
fprintf(stderr,"Usage: bt_dev_info [device]\n"); fprintf(stderr,"Usage: bt_dev_info [device]\n");
return B_ERROR; return B_ERROR;
} }
} }