OSDN Git Service

Fix bt_io_get parameter passing
authorJohan Hedberg <johan.hedberg@nokia.com>
Sun, 22 Feb 2009 14:50:59 +0000 (16:50 +0200)
committerJohan Hedberg <johan.hedberg@nokia.com>
Sun, 22 Feb 2009 14:50:59 +0000 (16:50 +0200)
input/server.c
serial/proxy.c
src/device.c

index b5b132a..6d08804 100644 (file)
@@ -103,7 +103,7 @@ static void connect_event_cb(GIOChannel *chan, GError *err, gpointer data)
                        BT_IO_OPT_SOURCE_BDADDR, &src,
                        BT_IO_OPT_DEST_BDADDR, &dst,
                        BT_IO_OPT_PSM, &psm,
-                       NULL);
+                       BT_IO_OPT_INVALID);
        if (gerr) {
                error("%s", gerr->message);
                g_error_free(gerr);
index 3d21cc3..d27a722 100644 (file)
@@ -397,7 +397,7 @@ static void connect_event_cb(GIOChannel *chan, GError *conn_err, gpointer data)
 
        bt_io_get(chan, BT_IO_RFCOMM, &err,
                        BT_IO_OPT_DEST_BDADDR, &prx->dst,
-                       NULL);
+                       BT_IO_OPT_INVALID);
        if (err) {
                error("%s", err->message);
                g_error_free(err);
index 2c85d33..6322231 100644 (file)
@@ -1635,7 +1635,7 @@ static void bonding_connect_cb(GIOChannel *io, GError *err, gpointer user_data)
        auth_requested_cp cp;
        evt_cmd_status rp;
        int dd;
-       uint8_t handle;
+       uint16_t handle;
 
        if (!device->bonding) {
                g_io_channel_shutdown(io, TRUE, NULL);