korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-17 01:04:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Inherit the device specific options from the default

Browse Source
This commit is contained in:
Marcel Holtmann 2004-11-14 02:17:58 +00:00
parent e0cbfd7cc7
commit 5ac3c1ef76
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hcid/hcid.h
View File

@ -97,7 +97,7 @@ extern struct hcid_opts hcid;
int read_config(char *file);
struct device_opts *alloc_device_opts(char *addr);
struct device_opts *alloc_device_opts(char *ref);
gboolean io_stack_event(GIOChannel *chan, GIOCondition cond, gpointer data);
gboolean io_security_event(GIOChannel *chan, GIOCondition cond, gpointer data);

4
hcid/main.c
View File

@ -78,6 +78,7 @@ static inline void init_device_defaults(struct device_opts *device_opts)
{
memset(device_opts, 0, sizeof(*device_opts));
device_opts->scan = SCAN_PAGE | SCAN_INQUIRY;
device_opts->name = strdup("BlueZ");
}
struct device_opts *alloc_device_opts(char *ref)
@ -95,7 +96,8 @@ struct device_opts *alloc_device_opts(char *ref)
device->next = device_list;
device_list = device;
init_device_defaults(&device->opts);
memcpy(&device->opts, &default_device, sizeof(struct device_opts));
device->opts.name = strdup(default_device.name);
return &device->opts;
}

2
hcid/parser.y
View File

@ -183,7 +183,7 @@ device_opt:
| K_NAME dev_name {
if (parser_device->name)
free(parser_device->name);
parser_device->name = $2;
parser_device->name = strdup($2);
}
| K_CLASS NUM {