Re: HID certification using PTS

Index: device.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/device.c,v
retrieving revision 1.71
diff -a -u -r1.71 device.c
--- device.c	14 Mar 2008 18:44:00 -0000	1.71
+++ device.c	31 Mar 2008 08:36:28 -0000
@@ -1039,6 +1039,19 @@
 	return send_message_and_unref(conn, reply);
 }
 
+static DBusHandlerResult device_unplug(DBusConnection *conn,
+						DBusMessage *msg, void *data)
+{
+	struct device *idev = data;
+
+	if (disconnect(idev, (1 << HIDP_VIRTUAL_CABLE_UNPLUG)) < 0)
+		return error_failed_errno(conn, msg, errno);
+
+	/* Replying to the requestor */
+	return send_message_and_unref(conn,
+			dbus_message_new_method_return(msg));
+}
+
 static void device_unregister(DBusConnection *conn, void *data)
 {
 	struct device *idev = data;
@@ -1057,6 +1070,7 @@
 	{ "GetName",		device_get_name,	"",	"s"	},
 	{ "GetProductId",	device_get_product_id,	"",	"q"	},
 	{ "GetVendorId",	device_get_vendor_id,	"",	"q"	},
+	{ "Unplug",			device_unplug,		"",	"" 	},
 	{ NULL, NULL, NULL, NULL }
 };
 
Index: input-api.txt
===================================================================
RCS file: /cvsroot/bluez/utils/input/input-api.txt,v
retrieving revision 1.12
diff -a -u -r1.12 input-api.txt
--- input-api.txt	26 Nov 2007 13:41:38 -0000	1.12
+++ input-api.txt	31 Mar 2008 08:36:28 -0000
@@ -39,6 +39,32 @@
 			                 org.bluez.Error.ConnectionAttemptFailed
 			                 org.bluez.Error.Failed
 
+		string CreateAndConnectDevice(string address)
+
+			Create an input device object.
+
+			On success it will return the path of the
+			newly created device object.
+
+			Possible errors: org.bluez.Error.AlreadyExists
+			                 org.bluez.Error.NotSupported
+			                 org.bluez.Error.ConnectionAttemptFailed
+			                 org.bluez.Error.Failed
+
+		string CreateAndConnectSecureDevice(string address)
+
+			Create an input device object. Pairing will
+			be initiated if needed(keyboard/combo devices).
+
+			On success it will return the path of the
+			newly created device object.
+
+			Possible errors: org.bluez.Error.AlreadyExists
+			                 org.bluez.Error.NotSupported
+			                 org.bluez.Error.ConnectionAttemptFailed
+			                 org.bluez.Error.AuthenticationFailed
+			                 org.bluez.Error.Failed
+
 		void RemoveDevice(string path)
 
 			Remove the input device object for a given path.
@@ -98,6 +124,12 @@
 
 			Possible errors: org.bluez.Error.Failed
 
+		void Unplug()
+
+			Unplug virtual cable of the input device.
+
+			Possible errors: org.bluez.Error.Failed
+
 Signals		void Connected()
 
 		void Disconnected()
Index: manager.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/manager.c,v
retrieving revision 1.39
diff -a -u -r1.39 manager.c
--- manager.c	27 Mar 2008 14:05:55 -0000	1.39
+++ manager.c	31 Mar 2008 08:36:28 -0000
@@ -337,6 +337,33 @@
 
 	device_paths = g_slist_append(device_paths, g_strdup(path));
 
+	if ((strcmp("CreateAndConnectDevice", dbus_message_get_member(pr->msg)) == 0) ||
+		(strcmp("CreateAndConnectSecureDevice", dbus_message_get_member(pr->msg)) == 0)) {
+		if ((err = input_device_set_channel(&pr->src, &pr->dst, L2CAP_PSM_HIDP_CTRL, pr->ctrl_sock)) < 0) {
+			/* Send unplug virtual cable to unknown devices */
+			unsigned char unplug[] = { 0x15 };
+			write(pr->ctrl_sock, unplug, sizeof(unplug));
+
+			goto failed;
+		}
+
+		pr->ctrl_sock = -1;
+
+		if ((err = input_device_set_channel(&pr->src, &pr->dst, L2CAP_PSM_HIDP_INTR, isk)) < 0) {
+			input_device_close_channels(&pr->src, &pr->dst);
+
+			goto failed;
+		}
+
+		isk = -1;
+
+		if ((err = input_device_connadd(&pr->src, &pr->dst)) < 0) {
+			input_device_close_channels(&pr->src, &pr->dst);
+
+			goto failed;
+		}
+	}
+
 	/* Replying to the requestor */
 	reply = dbus_message_new_method_return(pr->msg);
 
@@ -354,7 +381,8 @@
 	if (isk >= 0)
 		close(isk);
 
-	close(pr->ctrl_sock);
+	if (pr->ctrl_sock >= 0)
+		close(pr->ctrl_sock);
 	pending_req_free(pr);
 
 	if (hidp.rd_data)
@@ -544,7 +572,8 @@
 
 	dbus_message_unref(reply);
 
-	if (strcmp("CreateSecureDevice", dbus_message_get_member(pr->msg)) == 0) {
+	if ((strcmp("CreateSecureDevice", dbus_message_get_member(pr->msg)) == 0) ||
+		(strcmp("CreateAndConnectSecureDevice", dbus_message_get_member(pr->msg)) == 0)) {
 		sdp_data_t *d;
 
 		/* Pairing mandatory for keyboard and combo */
@@ -1136,6 +1165,8 @@
 	{ "ListDevices",		list_devices,	"",	"as"	},
 	{ "CreateDevice",		create_device,	"s",	"s"	},
 	{ "CreateSecureDevice",		create_device,	"s",	"s"	},
+	{ "CreateAndConnectDevice",	create_device,	"s",	"s"	},
+	{ "CreateAndConnectSecureDevice",		create_device,	"s",	"s"	},
 	{ "RemoveDevice",		remove_device,	"s",	""	},
 	{ NULL, NULL, NULL, NULL },
 };