summaryrefslogtreecommitdiff
path: root/btio/btio.c
diff options
context:
space:
mode:
authorAbhinav Kumar <abhinav.ku91@samsung.com>2015-02-18 18:46:18 +0530
committerAbhinav Kumar <abhinav.ku91@samsung.com>2015-02-18 18:46:18 +0530
commitd88e507a339b9c982b172b555834cd831c54f050 (patch)
tree259714ffaa00ccfaa7b766edf79df0eb6353d3c8 /btio/btio.c
parentccb69ca94573c9863fe6324d77dae73ef7c01393 (diff)
downloadbluez-d88e507a339b9c982b172b555834cd831c54f050.tar.gz
bluez-d88e507a339b9c982b172b555834cd831c54f050.tar.bz2
bluez-d88e507a339b9c982b172b555834cd831c54f050.zip
Changes for successful build after porting of Tizen 2.4 code
1> Copied Tizen 2.4 code in tizen branch. 2> Made changes to spec file for successful build. Also added a new file .gbs.conf. Change-Id: I6e479759454c1978e68340a0f3541fb66b437044
Diffstat (limited to 'btio/btio.c')
-rw-r--r--btio/btio.c56
1 files changed, 52 insertions, 4 deletions
diff --git a/btio/btio.c b/btio/btio.c
index 5f911710..db731faa 100644
--- a/btio/btio.c
+++ b/btio/btio.c
@@ -777,6 +777,7 @@ voice:
if (!voice)
return TRUE;
+ memset(&bt_voice, 0, sizeof(bt_voice));
bt_voice.setting = voice;
if (setsockopt(sock, SOL_BLUETOOTH, BT_VOICE, &bt_voice,
sizeof(bt_voice)) < 0) {
@@ -874,6 +875,12 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err,
case BT_IO_OPT_VOICE:
opts->voice = va_arg(args, int);
break;
+ case BT_IO_OPT_INVALID:
+ case BT_IO_OPT_KEY_SIZE:
+ case BT_IO_OPT_SOURCE_CHANNEL:
+ case BT_IO_OPT_DEST_CHANNEL:
+ case BT_IO_OPT_HANDLE:
+ case BT_IO_OPT_CLASS:
default:
g_set_error(err, BT_IO_ERROR, EINVAL,
"Unknown option %d", opt);
@@ -969,7 +976,7 @@ static gboolean l2cap_get(int sock, GError **err, BtIOOption opt1,
struct l2cap_options l2o;
int flags;
uint8_t dev_class[3];
- uint16_t handle;
+ uint16_t handle = 0;
socklen_t len;
gboolean flushable = FALSE, have_dst = FALSE;
uint32_t priority;
@@ -1085,9 +1092,10 @@ parse_opts:
break;
}
+ len = sizeof(l2o.omtu);
if (getsockopt(sock, SOL_BLUETOOTH, BT_SNDMTU,
&l2o.omtu, &len) < 0) {
- ERROR_FAILED(err, "getsockopt(BT_RCVMTU)",
+ ERROR_FAILED(err, "getsockopt(BT_SNDMTU)",
errno);
return FALSE;
}
@@ -1139,6 +1147,13 @@ parse_opts:
}
*(va_arg(args, uint32_t *)) = priority;
break;
+ case BT_IO_OPT_INVALID:
+ case BT_IO_OPT_SOURCE_TYPE:
+ case BT_IO_OPT_CHANNEL:
+ case BT_IO_OPT_SOURCE_CHANNEL:
+ case BT_IO_OPT_DEST_CHANNEL:
+ case BT_IO_OPT_MTU:
+ case BT_IO_OPT_VOICE:
default:
g_set_error(err, BT_IO_ERROR, EINVAL,
"Unknown option %d", opt);
@@ -1178,7 +1193,7 @@ static gboolean rfcomm_get(int sock, GError **err, BtIOOption opt1,
int flags;
socklen_t len;
uint8_t dev_class[3];
- uint16_t handle;
+ uint16_t handle = 0;
if (!get_src(sock, &src, sizeof(src), err))
return FALSE;
@@ -1272,6 +1287,19 @@ static gboolean rfcomm_get(int sock, GError **err, BtIOOption opt1,
}
memcpy(va_arg(args, uint8_t *), dev_class, 3);
break;
+ case BT_IO_OPT_SOURCE_TYPE:
+ case BT_IO_OPT_DEST_TYPE:
+ case BT_IO_OPT_KEY_SIZE:
+ case BT_IO_OPT_PSM:
+ case BT_IO_OPT_CID:
+ case BT_IO_OPT_MTU:
+ case BT_IO_OPT_OMTU:
+ case BT_IO_OPT_IMTU:
+ case BT_IO_OPT_MODE:
+ case BT_IO_OPT_FLUSHABLE:
+ case BT_IO_OPT_PRIORITY:
+ case BT_IO_OPT_VOICE:
+ case BT_IO_OPT_INVALID:
default:
g_set_error(err, BT_IO_ERROR, EINVAL,
"Unknown option %d", opt);
@@ -1309,7 +1337,7 @@ static gboolean sco_get(int sock, GError **err, BtIOOption opt1, va_list args)
struct sco_options sco_opt;
socklen_t len;
uint8_t dev_class[3];
- uint16_t handle;
+ uint16_t handle = 0;
len = sizeof(sco_opt);
memset(&sco_opt, 0, len);
@@ -1357,6 +1385,22 @@ static gboolean sco_get(int sock, GError **err, BtIOOption opt1, va_list args)
}
memcpy(va_arg(args, uint8_t *), dev_class, 3);
break;
+ case BT_IO_OPT_SOURCE_TYPE:
+ case BT_IO_OPT_DEST_TYPE:
+ case BT_IO_OPT_DEFER_TIMEOUT:
+ case BT_IO_OPT_SEC_LEVEL:
+ case BT_IO_OPT_KEY_SIZE:
+ case BT_IO_OPT_CHANNEL:
+ case BT_IO_OPT_SOURCE_CHANNEL:
+ case BT_IO_OPT_DEST_CHANNEL:
+ case BT_IO_OPT_PSM:
+ case BT_IO_OPT_CID:
+ case BT_IO_OPT_MASTER:
+ case BT_IO_OPT_MODE:
+ case BT_IO_OPT_FLUSHABLE:
+ case BT_IO_OPT_PRIORITY:
+ case BT_IO_OPT_VOICE:
+ case BT_IO_OPT_INVALID:
default:
g_set_error(err, BT_IO_ERROR, EINVAL,
"Unknown option %d", opt);
@@ -1383,6 +1427,7 @@ static gboolean get_valist(GIOChannel *io, BtIOType type, GError **err,
return rfcomm_get(sock, err, opt1, args);
case BT_IO_SCO:
return sco_get(sock, err, opt1, args);
+ case BT_IO_INVALID:
default:
g_set_error(err, BT_IO_ERROR, EINVAL,
"Unknown BtIO type %d", type);
@@ -1450,6 +1495,7 @@ gboolean bt_io_set(GIOChannel *io, GError **err, BtIOOption opt1, ...)
return rfcomm_set(sock, opts.sec_level, opts.master, err);
case BT_IO_SCO:
return sco_set(sock, opts.mtu, opts.voice, err);
+ case BT_IO_INVALID:
default:
g_set_error(err, BT_IO_ERROR, EINVAL,
"Unknown BtIO type %d", type);
@@ -1520,6 +1566,7 @@ static GIOChannel *create_io(gboolean server, struct set_opts *opts,
if (!sco_set(sock, opts->mtu, opts->voice, err))
goto failed;
break;
+ case BT_IO_INVALID:
default:
g_set_error(err, BT_IO_ERROR, EINVAL,
"Unknown BtIO type %d", opts->type);
@@ -1573,6 +1620,7 @@ GIOChannel *bt_io_connect(BtIOConnect connect, gpointer user_data,
case BT_IO_SCO:
err = sco_connect(sock, &opts.dst);
break;
+ case BT_IO_INVALID:
default:
g_set_error(gerr, BT_IO_ERROR, EINVAL,
"Unknown BtIO type %d", opts.type);