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

Remove warning, use the common util function for the bdaddr utils class

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26983 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Ruiz Dorantes 2008-08-15 19:08:48 +00:00
parent 6dc27eba0c
commit 85ce690475
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
headers/os/bluetooth/bdaddrUtils.h
View File

@ -9,25 +9,26 @@
#include <stdio.h> #include <stdio.h>
#include <bluetooth/bluetooth.h> #include <bluetooth/bluetooth.h>
#include <bluetooth/bluetooth_util.h>
namespace Bluetooth { namespace Bluetooth {
class bdaddrUtils { class bdaddrUtils {
public: public:
static inline bdaddr_t NullAddress() static inline bdaddr_t NullAddress()
{ {
return ((bdaddr_t) {{0, 0, 0, 0, 0, 0}}); return ((bdaddr_t) {{0, 0, 0, 0, 0, 0}});
} }
static inline bdaddr_t LocalAddress() static inline bdaddr_t LocalAddress()
{ {
return ((bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}}); return ((bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}});
} }
static inline bdaddr_t BroadcastAddress() static inline bdaddr_t BroadcastAddress()
{ {
return ((bdaddr_t) {{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}}); return ((bdaddr_t) {{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}});
} }
@ -35,11 +36,11 @@ public:
static bool Compare(bdaddr_t *ba1, bdaddr_t *ba2) static bool Compare(bdaddr_t *ba1, bdaddr_t *ba2)
{ {
return (memcmp(ba1, ba2, sizeof(bdaddr_t)) == 0); return (bacmp(ba1, ba2) == 0);
} }
static char* ToString(const bdaddr_t bdaddr) static char* ToString(const bdaddr_t bdaddr)
{ {
// TODO: not safe // TODO: not safe
static char str[18]; static char str[18];
@ -64,7 +65,7 @@ public:
} }
return NullAddress(); return NullAddress();
} }
}; };

1
headers/os/bluetooth/bluetooth_util.h
View File

@ -6,6 +6,7 @@
#define _BLUETOOTH_UTIL_H #define _BLUETOOTH_UTIL_H
#include <bluetooth/bluetooth.h> #include <bluetooth/bluetooth.h>
#include <string.h>
/* BD Address management */ /* BD Address management */
static inline int bacmp(bdaddr_t* ba1, bdaddr_t* ba2) static inline int bacmp(bdaddr_t* ba1, bdaddr_t* ba2)