diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2012-08-28 17:07:16 -0700 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-08-28 17:18:28 -0700 |
commit | a0d52c9ad0abe3d7b4f99ea855c8d7664bb3c3fd (patch) | |
tree | 9693607f0042f84642e58e015de214d515c81222 /btio/btio.h | |
parent | 84bc0d0e5718c6a9e427d4d3bf545bc0f41a37ee (diff) | |
download | bluez-a0d52c9ad0abe3d7b4f99ea855c8d7664bb3c3fd.tar.gz |
btio: Make BtIOType private
Since the socket type can be inferred from the socket itself or from the
PSM/Channel/CID/etc parameters provided to listen() and connect() it
doesn't make sense to expose this in the BtIO API.
Diffstat (limited to 'btio/btio.h')
-rw-r--r-- | btio/btio.h | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/btio/btio.h b/btio/btio.h index bb35025f7..a6ff5a2c9 100644 --- a/btio/btio.h +++ b/btio/btio.h @@ -31,13 +31,6 @@ GQuark bt_io_error_quark(void); typedef enum { - BT_IO_L2CAP, - BT_IO_L2ERTM, - BT_IO_RFCOMM, - BT_IO_SCO, -} BtIOType; - -typedef enum { BT_IO_OPT_INVALID = 0, BT_IO_OPT_SOURCE, BT_IO_OPT_SOURCE_BDADDR, @@ -85,19 +78,16 @@ typedef void (*BtIOConnect)(GIOChannel *io, GError *err, gpointer user_data); gboolean bt_io_accept(GIOChannel *io, BtIOConnect connect, gpointer user_data, GDestroyNotify destroy, GError **err); -gboolean bt_io_set(GIOChannel *io, BtIOType type, GError **err, - BtIOOption opt1, ...); +gboolean bt_io_set(GIOChannel *io, GError **err, BtIOOption opt1, ...); + +gboolean bt_io_get(GIOChannel *io, GError **err, BtIOOption opt1, ...); -gboolean bt_io_get(GIOChannel *io, BtIOType type, GError **err, - BtIOOption opt1, ...); +GIOChannel *bt_io_connect(BtIOConnect connect, gpointer user_data, + GDestroyNotify destroy, GError **gerr, + BtIOOption opt1, ...); -GIOChannel *bt_io_connect(BtIOType type, BtIOConnect connect, +GIOChannel *bt_io_listen(BtIOConnect connect, BtIOConfirm confirm, gpointer user_data, GDestroyNotify destroy, GError **err, BtIOOption opt1, ...); -GIOChannel *bt_io_listen(BtIOType type, BtIOConnect connect, - BtIOConfirm confirm, gpointer user_data, - GDestroyNotify destroy, GError **err, - BtIOOption opt1, ...); - #endif |