X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fserial_bt.c;h=42d6289a51126b9f10db2d55e978add48404eaa4;hp=33abec0ff481715993920aed1fc57a59433c44a7;hb=HEAD;hpb=a8b0e6f538b9f1d5d30af3695a1b625c9b626935

diff --git a/src/serial_bt.c b/src/serial_bt.c
index 33abec0f..977f248b 100644
--- a/src/serial_bt.c
+++ b/src/serial_bt.c
@@ -37,6 +37,7 @@
 #define SER_BT_PARAM_PREFIX_HDL_TX	"handle_tx="
 #define SER_BT_PARAM_PREFIX_HDL_CCCD	"handle_cccd="
 #define SER_BT_PARAM_PREFIX_VAL_CCCD	"value_cccd="
+#define SER_BT_PARAM_PREFIX_BLE_MTU	"mtu="
 
 /**
  * @file
@@ -83,6 +84,7 @@ static const struct scan_supported_item {
 	{ "DL24M_BLE", SER_BT_CONN_AC6328, NULL, },
 	{ "DL24M_SPP", SER_BT_CONN_RFCOMM, "/channel=2", },
 	{ "HC-05", SER_BT_CONN_RFCOMM, NULL, },
+	{ "TC66C", SER_BT_CONN_DIALOG, "/mtu=200", },
 	{ "UC96_BLE", SER_BT_CONN_AC6328, NULL, },
 	{ "UC96_SPP", SER_BT_CONN_RFCOMM, "/channel=2", },
 	{ "UM25C", SER_BT_CONN_RFCOMM, NULL, },
@@ -113,6 +115,8 @@ static const char *ser_bt_conn_names[SER_BT_CONN_MAX] = {
 	[SER_BT_CONN_NRF51] = "nrf51",
 	[SER_BT_CONN_CC254x] = "cc254x",
 	[SER_BT_CONN_AC6328] = "ac6328",
+	[SER_BT_CONN_DIALOG] = "dialog",
+	[SER_BT_CONN_NOTIFY] = "notify",
 };
 
 static enum ser_bt_conn_t lookup_conn_name(const char *name)
@@ -190,7 +194,8 @@ static int ser_bt_parse_conn_spec(
 	enum ser_bt_conn_t *conn_type, const char **remote_addr,
 	size_t *rfcomm_channel,
 	uint16_t *read_hdl, uint16_t *write_hdl,
-	uint16_t *cccd_hdl, uint16_t *cccd_val)
+	uint16_t *cccd_hdl, uint16_t *cccd_val,
+	uint16_t *ble_mtu)
 {
 	char **fields, *field;
 	enum ser_bt_conn_t type;
@@ -214,6 +219,8 @@ static int ser_bt_parse_conn_spec(
 		*cccd_hdl = 0;
 	if (cccd_val)
 		*cccd_val = 0;
+	if (ble_mtu)
+		*ble_mtu = 0;
 
 	if (!serial || !spec || !spec[0])
 		return SR_ERR_ARG;
@@ -301,6 +308,23 @@ static int ser_bt_parse_conn_spec(
 		if (cccd_val)
 			*cccd_val = 0x0001;
 		break;
+	case SER_BT_CONN_DIALOG:
+		if (read_hdl)
+			*read_hdl = 23;
+		if (write_hdl)
+			*write_hdl = 18;
+		if (cccd_hdl)
+			*cccd_hdl = 0;
+		if (cccd_val)
+			*cccd_val = 0x0001;
+		if (ble_mtu)
+			*ble_mtu = 400;
+		break;
+	case SER_BT_CONN_NOTIFY:
+		/* All other values must be provided externally. */
+		if (cccd_val)
+			*cccd_val = 0x0001;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -377,6 +401,18 @@ static int ser_bt_parse_conn_spec(
 				*cccd_val = parm_val;
 			continue;
 		}
+		if (g_str_has_prefix(field, SER_BT_PARAM_PREFIX_BLE_MTU)) {
+			field += strlen(SER_BT_PARAM_PREFIX_BLE_MTU);
+			endp = NULL;
+			ret = sr_atoul_base(field, &parm_val, &endp, 0);
+			if (ret != SR_OK || !endp || *endp != '\0') {
+				ret_parse = SR_ERR_ARG;
+				break;
+			}
+			if (ble_mtu)
+				*ble_mtu = parm_val;
+			continue;
+		}
 		return SR_ERR_DATA;
 	}
 
@@ -451,6 +487,7 @@ static int ser_bt_open(struct sr_serial_dev_inst *serial, int flags)
 	const char *remote_addr;
 	size_t rfcomm_channel;
 	uint16_t read_hdl, write_hdl, cccd_hdl, cccd_val;
+	uint16_t ble_mtu;
 	int rc;
 	struct sr_bt_desc *desc;
 
@@ -461,7 +498,8 @@ static int ser_bt_open(struct sr_serial_dev_inst *serial, int flags)
 			&conn_type, &remote_addr,
 			&rfcomm_channel,
 			&read_hdl, &write_hdl,
-			&cccd_hdl, &cccd_val);
+			&cccd_hdl, &cccd_val,
+			&ble_mtu);
 	if (rc != SR_OK)
 		return SR_ERR_ARG;
 
@@ -490,14 +528,18 @@ static int ser_bt_open(struct sr_serial_dev_inst *serial, int flags)
 	case SER_BT_CONN_NRF51:
 	case SER_BT_CONN_CC254x:
 	case SER_BT_CONN_AC6328:
+	case SER_BT_CONN_DIALOG:
+	case SER_BT_CONN_NOTIFY:
 		rc = sr_bt_config_notify(desc,
-			read_hdl, write_hdl, cccd_hdl, cccd_val);
+			read_hdl, write_hdl, cccd_hdl, cccd_val,
+			ble_mtu);
 		if (rc < 0)
 			return SR_ERR;
 		serial->bt_notify_handle_read = read_hdl;
 		serial->bt_notify_handle_write = write_hdl;
 		serial->bt_notify_handle_cccd = cccd_hdl;
 		serial->bt_notify_value_cccd = cccd_val;
+		serial->bt_ble_mtu = ble_mtu;
 		break;
 	default:
 		/* Unsupported type, or incomplete implementation. */
@@ -523,6 +565,8 @@ static int ser_bt_open(struct sr_serial_dev_inst *serial, int flags)
 	case SER_BT_CONN_NRF51:
 	case SER_BT_CONN_CC254x:
 	case SER_BT_CONN_AC6328:
+	case SER_BT_CONN_DIALOG:
+	case SER_BT_CONN_NOTIFY:
 		rc = sr_bt_connect_ble(desc);
 		if (rc < 0)
 			return SR_ERR;
@@ -600,6 +644,8 @@ static int ser_bt_write(struct sr_serial_dev_inst *serial,
 	case SER_BT_CONN_NRF51:
 	case SER_BT_CONN_CC254x:
 	case SER_BT_CONN_AC6328:
+	case SER_BT_CONN_DIALOG:
+	case SER_BT_CONN_NOTIFY:
 		/*
 		 * Assume that when applications call the serial layer's
 		 * write routine, then the BLE chip/module does support
@@ -666,6 +712,8 @@ static int ser_bt_read(struct sr_serial_dev_inst *serial,
 		case SER_BT_CONN_NRF51:
 		case SER_BT_CONN_CC254x:
 		case SER_BT_CONN_AC6328:
+		case SER_BT_CONN_DIALOG:
+		case SER_BT_CONN_NOTIFY:
 			dlen = sr_ser_has_queued_data(serial);
 			rc = sr_bt_check_notify(serial->bt_desc);
 			if (rc < 0)
@@ -764,6 +812,8 @@ static int bt_source_cb(int fd, int revents, void *cb_data)
 		case SER_BT_CONN_NRF51:
 		case SER_BT_CONN_CC254x:
 		case SER_BT_CONN_AC6328:
+		case SER_BT_CONN_DIALOG:
+		case SER_BT_CONN_NOTIFY:
 			dlen = sr_ser_has_queued_data(serial);
 			rc = sr_bt_check_notify(serial->bt_desc);
 			if (rc < 0)