diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2020-10-28 14:50:00 -0700 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2020-10-29 10:27:37 -0700 |
| commit | 01d035d33886b13cd6dc361f994ce22ad47daf61 (patch) | |
| tree | fed6bff733a16c81499125502066177daa13f980 /profiles | |
| parent | 8c6373667aebae94722eb1960434231528b51f3f (diff) | |
| download | bluez-01d035d33886b13cd6dc361f994ce22ad47daf61.tar.gz | |
core: Rename main_opts to btd_opts
Use btd_ prefix since this is a daemon API.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/audio/a2dp.c | 2 | ||||
| -rw-r--r-- | profiles/audio/avdtp.c | 2 | ||||
| -rw-r--r-- | profiles/scanparam/scan.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c index 4ec99278a..6e05db103 100644 --- a/profiles/audio/a2dp.c +++ b/profiles/audio/a2dp.c @@ -2324,7 +2324,7 @@ static bool a2dp_server_listen(struct a2dp_server *server) if (server->io) return true; - if (main_opts.mps == MPS_OFF) + if (btd_opts.mps == MPS_OFF) mode = BT_IO_MODE_BASIC; else mode = BT_IO_MODE_STREAMING; diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c index 97b4d1b44..bcb0c71da 100644 --- a/profiles/audio/avdtp.c +++ b/profiles/audio/avdtp.c @@ -2438,7 +2438,7 @@ static GIOChannel *l2cap_connect(struct avdtp *session) src = btd_adapter_get_address(device_get_adapter(session->device)); - if (main_opts.mps == MPS_OFF) + if (btd_opts.mps == MPS_OFF) mode = BT_IO_MODE_BASIC; else mode = BT_IO_MODE_STREAMING; diff --git a/profiles/scanparam/scan.c b/profiles/scanparam/scan.c index 258bd3f63..41350c988 100644 --- a/profiles/scanparam/scan.c +++ b/profiles/scanparam/scan.c @@ -64,12 +64,12 @@ static void write_scan_params(struct scan *scan) /* Unless scan parameters are configured, use the known kernel default * parameters */ - put_le16(main_opts.defaults.le.scan_interval_autoconnect ? - main_opts.defaults.le.scan_interval_autoconnect : + put_le16(btd_opts.defaults.le.scan_interval_autoconnect ? + btd_opts.defaults.le.scan_interval_autoconnect : 0x60, &value[0]); - put_le16(main_opts.defaults.le.scan_win_autoconnect ? - main_opts.defaults.le.scan_win_autoconnect : + put_le16(btd_opts.defaults.le.scan_win_autoconnect ? + btd_opts.defaults.le.scan_win_autoconnect : 0x30, &value[2]); bt_gatt_client_write_without_response(scan->client, scan->iwhandle, |