some cleanups and styling by Mika and me

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28915 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Ruiz Dorantes
2009-01-16 20:32:19 +00:00
parent 6dec91b4e8
commit e5da0ec57e
8 changed files with 243 additions and 278 deletions
+7 -7
View File
@@ -30,10 +30,10 @@ public:
static char str[50];
sprintf(str, "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:"
"%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
lk.l[0], lk.l[1], lk.l[2], lk.l[3], lk.l[4], lk.l[5],
lk.l[6], lk.l[7], lk.l[8], lk.l[9], lk.l[10], lk.l[11],
lk.l[12], lk.l[13], lk.l[14], lk.l[15]);
"%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
lk.l[0], lk.l[1], lk.l[2], lk.l[3], lk.l[4], lk.l[5],
lk.l[6], lk.l[7], lk.l[8], lk.l[9], lk.l[10], lk.l[11],
lk.l[12], lk.l[13], lk.l[14], lk.l[15]);
return str;
}
@@ -43,9 +43,9 @@ public:
if (lkstr != NULL) {
int l0, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, l12, l13, l14, l15;
size_t count = sscanf(lkstr, "%2X:%2X:%2X:%2X:%2X:%2X:%2X:%2X:"
"%2X:%2X:%2X:%2X:%2X:%2X:%2X:%2X", &l0, &l1, &l2, &l3,
&l4, &l5, &l6, &l7, &l8, &l9, &l10, &l11, &l12, &l13,
&l14, &l15);
"%2X:%2X:%2X:%2X:%2X:%2X:%2X:%2X", &l0, &l1, &l2, &l3,
&l4, &l5, &l6, &l7, &l8, &l9, &l10, &l11, &l12, &l13,
&l14, &l15);
if (count == 16) {
return (linkkey_t){{l0, l1, l2, l3, l4, l5, l6, l7, l8,
+1 -1
View File
@@ -58,7 +58,7 @@ public:
if (addr != NULL) {
size_t count = sscanf(addr, "%2X:%2X:%2X:%2X:%2X:%2X",
&b0, &b1, &b2, &b3, &b4, &b5);
&b0, &b1, &b2, &b3, &b4, &b5);
if (count == 6)
return ((bdaddr_t) {{b0, b1, b2, b3, b4, b5}});
+5 -19
View File
@@ -21,28 +21,14 @@ static inline void bacpy(bdaddr_t* dst, bdaddr_t* src)
}
static inline void baswap(bdaddr_t* dst, bdaddr_t* src) {
}
static inline char* batostr(bdaddr_t *ba)
static inline void baswap(bdaddr_t* dst, bdaddr_t* src)
{
return "00:00:00:00:00:00";
register uint8* d = (uint8*)dst;
register uint8* s = (uint8*)src;
register int i;
}
for(i=0; i<6; i++) d[i] = s[5-i];
static inline void strtoba(const char *str, bdaddr_t *ba)
{
}
/* Link key Management */
static inline char* lktostr( uint8 link_key[16] )
{
return "00:00:00:00:00:00";
}