[PATCH 3/5] Add Passthrough signal to handle_panel_passthrough

@@ -230,7 +230,7 @@ struct avctp_header {
 #define AVCTP_HEADER_LENGTH 3
 
 struct avrcp_header {
-	uint8_t code:4;
+	uint8_t ctype:4;
 	uint8_t _hdr0:4;
 	uint8_t subunit_id:3;
 	uint8_t subunit_type:5;

@@ -261,7 +261,7 @@ struct avctp_header {
 
 struct avrcp_header {
 	uint8_t _hdr0:4;
-	uint8_t code:4;
+	uint8_t ctype:4;
 	uint8_t subunit_type:5;
 	uint8_t subunit_id:3;
 	uint8_t opcode;

@@ -551,6 +551,23 @@ static sdp_record_t *avrcp_tg_record(void)
 	return record;
 }
 
+/**
+ *	@brief	get_company_id: Three-byte Company_ID from AVRCP message
+ *
+ *	AVRCP uses three-byte company_ids, which must be converted from
+ *	BT/network big-endian order to internal form.
+ */
+static gint32 get_company_id(unsigned char *cid)
+{
+	gint32 company_id = 0;
+	company_id = *cid;
+	company_id <<= 8;
+	company_id |= *(cid+1);
+	company_id <<= 8;
+	company_id |= *(cid+2);
+	return company_id;
+}
+
 static int send_event(int fd, uint16_t type, uint16_t code, int32_t value)
 {
 	struct uinput_event event;

@@ -572,17 +589,74 @@ static void send_key(int fd, uint16_t key, int pressed)
 	send_event(fd, EV_SYN, SYN_REPORT, 0);
 }
 
+/**
+ *	@brief: handle_panel_passthrough: Handles AVRCP 1.0+ PASSTHROUGH command.
+ *
+ *	Original version only passed the keystroke to uinput.
+ *
+ *	Added a Passthrough signal, with the key state AND the optional
+ *	following company_id and vendor-unique message.
+ */
+
 static void handle_panel_passthrough(struct control *control,
-					const unsigned char *operands,
-					int operand_count)
+				     struct avrcp_passthru *avrcp,
+				     int avrcp_length)
 {
 	const char *status;
 	int pressed, i;
+	guchar key_pressed;
+	gboolean key_status;
+	gint32 pass_company_id;
+	gchar *pass_string;
 
-	if (operand_count == 0)
+	if ((unsigned int) avrcp_length < sizeof(struct avrcp_passthru) - 5)
 		return;
 
-	if (operands[0] & 0x80) {
+	/*
+	 * Following creates the Passthrough signal.
+	 * Key_state is zero if key is pressed (AVRCP v14r00 sect 22.3, p119)
+	 */
+
+	key_pressed = avrcp->key;
+	key_status = !avrcp->key_state;
+	DBG("Passthrough Key: %x Pressed: %s",
+			key_pressed, key_status ? "true" : "false");
+	if (key_pressed == VENDOR_UNIQUE_OP) {
+		if ((unsigned int) avrcp_length >
+				sizeof(struct avrcp_passthru)) {
+			pass_company_id = get_company_id(avrcp->company_id);
+			pass_string = g_strndup((const char *) avrcp->op_data,
+						(gsize) avrcp->op_len - 3);
+			DBG("Passthrough Company_ID: %06X String: %s",
+			    pass_company_id, pass_string);
+		} else if (avrcp_length == sizeof(struct avrcp_passthru)) {
+			pass_company_id = get_company_id(avrcp->company_id);
+			pass_string = (gchar *) g_malloc0(1);
+			DBG("Passthrough Company_ID: %06X String: <none>",
+			    pass_company_id);
+		} else {
+			pass_company_id = -1;
+			pass_string = (gchar *) g_malloc0(1);
+			DBG("Passthrough: No Company_ID or String!");
+		};
+	} else {
+		pass_company_id = -1;
+		pass_string = (gchar *) g_malloc0(1);
+	};
+
+	g_dbus_emit_signal(control->dev->conn, control->dev->path,
+		AUDIO_CONTROL_INTERFACE, "Passthrough",
+		DBUS_TYPE_BYTE, &key_pressed,
+		DBUS_TYPE_BOOLEAN, &key_status,
+		DBUS_TYPE_INT32, &pass_company_id,
+		DBUS_TYPE_STRING, &pass_string,
+		DBUS_TYPE_INVALID);
+
+	g_free(pass_string);
+
+	/* From here on, we are doing the equivalent of "SendKeys" */
+
+	if (avrcp->key_state) {
 		status = "released";
 		pressed = 0;
 	} else {

@@ -593,7 +667,7 @@ static void handle_panel_passthrough(struct control 

@@ -616,9 +690,12 @@ static void handle_panel_passthrough(struct control 

@@ -626,7 +703,7 @@ static int handle_vendordep_pdu(struct control *control,
 					struct avrcp_header *avrcp,
 					int operand_count)
 {
-	avrcp->code = CTYPE_NOT_IMPLEMENTED;
+	avrcp->ctype = CTYPE_NOT_IMPLEMENTED;
 	return AVRCP_HEADER_LENGTH;
 }
 

@@ -760,37 +837,36 @@ static gboolean control_cb(GIOChannel *chan, 

@@ -810,7 +886,7 @@ static gboolean control_cb(GIOChannel *chan, GIOCondition 

@@ -1222,7 +1298,7 @@ static int avctp_send_passthrough(struct control 

@@ -1324,6 +1400,7 @@ static GDBusSignalTable control_signals[] = {
 	{ "Connected",			"",	G_DBUS_SIGNAL_FLAG_DEPRECATED},
 	{ "Disconnected",		"",	G_DBUS_SIGNAL_FLAG_DEPRECATED},
 	{ "PropertyChanged",		"sv"	},
+	{ "Passthrough",		"ybis"	},
 	{ NULL, NULL }
 };