sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Move create_path() to bluetooth plugin

This commit is contained in:
Gustavo F. Padovan 2010-06-14 15:04:27 -03:00 committed by Denis Kenzior
parent 4ccb481f4d
commit 9d543c0719
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/bluetooth.c
View File

@ -40,6 +40,28 @@ static DBusConnection *connection;
static GHashTable *uuid_hash = NULL;
static GHashTable *adapter_address_hash = NULL;
void bluetooth_create_path(const char *dev_addr, const char *adapter_addr, char *buf, int size)
{
int i, j;
for (i = 0, j = 0; adapter_addr[j] && i < size - 1; j++)
if (adapter_addr[j] >= '0' && adapter_addr[j] <= '9')
buf[i++] = adapter_addr[j];
else if (adapter_addr[j] >= 'A' && adapter_addr[j] <= 'F')
buf[i++] = adapter_addr[j];
if (i < size - 1)
buf[i++] = '_';
for (j = 0; dev_addr[j] && i < size - 1; j++)
if (dev_addr[j] >= '0' && dev_addr[j] <= '9')
buf[i++] = dev_addr[j];
else if (dev_addr[j] >= 'A' && dev_addr[j] <= 'F')
buf[i++] = dev_addr[j];
buf[i] = '\0';
}
static int send_method_call_with_reply(const char *dest, const char *path,
const char *interface, const char *method,
DBusPendingCallNotifyFunction cb,

3
plugins/bluetooth.h
View File

@ -40,3 +40,6 @@ int bluetooth_register_uuid(const char *uuid,
struct bluetooth_profile *profile);
void bluetooth_unregister_uuid(const char *uuid);
void bluetooth_create_path(const char *dev_addr, const char *adapter_addr,
char *buf, int size);

25
plugins/hfp.c
View File

@ -566,29 +566,6 @@ static GDBusMethodTable agent_methods[] = {
{ NULL, NULL, NULL, NULL }
};
static void create_path(const char *dev_addr, const char *adapter_addr,
char *buf, int size)
{
int i, j;
for (i = 0, j = 0; adapter_addr[j] && i < size - 1; j++)
if (adapter_addr[j] >= '0' && adapter_addr[j] <= '9')
buf[i++] = adapter_addr[j];
else if (adapter_addr[j] >= 'A' && adapter_addr[j] <= 'F')
buf[i++] = adapter_addr[j];
if (i < size - 1)
buf[i++] = '_';
for (j = 0; dev_addr[j] && i < size - 1; j++)
if (dev_addr[j] >= '0' && dev_addr[j] <= '9')
buf[i++] = dev_addr[j];
else if (dev_addr[j] >= 'A' && dev_addr[j] <= 'F')
buf[i++] = dev_addr[j];
buf[i] = '\0';
}
static int hfp_create_modem(const char *device, const char *dev_addr,
const char *adapter_addr, const char *alias)
{
@ -600,7 +577,7 @@ static int hfp_create_modem(const char *device, const char *dev_addr,
device, dev_addr, adapter_addr);
strcpy(buf, "hfp/");
create_path(dev_addr, adapter_addr, buf + 4, sizeof(buf) - 4);
bluetooth_create_path(dev_addr, adapter_addr, buf + 4, sizeof(buf) - 4);
modem = ofono_modem_create(buf, "hfp");
if (modem == NULL)