From: Uwe Hermann <redacted>
Date: Thu, 20 Jun 2019 15:50:35 +0000 (+0200)
Subject: std: Factor out std_dummy_set_params().
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=c0aa074eb2d13c5d81e2caff8d243ca5f3feb3c6;p=libsigrok.git

std: Factor out std_dummy_set_params().
---

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 20674cdf..adbc79f2 100644
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -1087,6 +1087,10 @@ SR_PRIV int std_double_tuple_idx_d0(const double d, const double a[][2], unsigne
 
 SR_PRIV int std_cg_idx(const struct sr_channel_group *cg, struct sr_channel_group *a[], unsigned int n);
 
+SR_PRIV int std_dummy_set_params(struct sr_serial_dev_inst *serial,
+	int baudrate, int bits, int parity, int stopbits,
+	int flowcontrol, int rts, int dtr);
+
 /*--- resource.c ------------------------------------------------------------*/
 
 SR_PRIV int64_t sr_file_get_size(FILE *file);
diff --git a/src/serial_bt.c b/src/serial_bt.c
index 8ed4523b..678a0ce2 100644
--- a/src/serial_bt.c
+++ b/src/serial_bt.c
@@ -574,28 +574,6 @@ static int ser_bt_read(struct sr_serial_dev_inst *serial,
 	return sr_ser_unqueue_rx_data(serial, buf, dlen);
 }
 
-static int ser_bt_set_params(struct sr_serial_dev_inst *serial,
-		int baudrate, int bits, int parity, int stopbits,
-		int flowcontrol, int rts, int dtr)
-{
-	/*
-	 * Bluetooth communication has no concept of bitrate, so ignore
-	 * these arguments silently. Neither need we pass the frame format
-	 * down to internal BT comm routines, nor need we keep the values
-	 * here, since the caller will cache/register them already.
-	 */
-	(void)serial;
-	(void)baudrate;
-	(void)bits;
-	(void)parity;
-	(void)stopbits;
-	(void)flowcontrol;
-	(void)rts;
-	(void)dtr;
-
-	return SR_OK;
-}
-
 struct bt_source_args_t {
 	/* The application callback. */
 	sr_receive_data_callback cb;
@@ -835,7 +813,13 @@ static struct ser_lib_functions serlib_bt = {
 	.drain = ser_bt_drain,
 	.write = ser_bt_write,
 	.read = ser_bt_read,
-	.set_params = ser_bt_set_params,
+	/*
+	 * Bluetooth communication has no concept of bitrate, so ignore
+	 * these arguments silently. Neither need we pass the frame format
+	 * down to internal BT comm routines, nor need we keep the values
+	 * here, since the caller will cache/register them already.
+	 */
+	.set_params = std_dummy_set_params,
 	.setup_source_add = ser_bt_setup_source_add,
 	.setup_source_remove = ser_bt_setup_source_remove,
 	.list = ser_bt_list,
diff --git a/src/serial_hid_bu86x.c b/src/serial_hid_bu86x.c
index 32fa8f21..4009c334 100644
--- a/src/serial_hid_bu86x.c
+++ b/src/serial_hid_bu86x.c
@@ -60,26 +60,6 @@ static const struct vid_pid_item vid_pid_items_bu86x[] = {
 	ALL_ZERO
 };
 
-static int bu86x_set_params(struct sr_serial_dev_inst *serial,
-	int baudrate, int bits, int parity, int stopbits,
-	int flowcontrol, int rts, int dtr)
-{
-	/*
-	 * The IR adapter's communication parameters are fixed and need
-	 * not get configured. Just silently ignore the caller's spec.
-	 */
-	(void)serial;
-	(void)baudrate;
-	(void)bits;
-	(void)parity;
-	(void)stopbits;
-	(void)flowcontrol;
-	(void)rts;
-	(void)dtr;
-
-	return SR_OK;
-}
-
 static int bu86x_read_bytes(struct sr_serial_dev_inst *serial,
 	uint8_t *data, int space, unsigned int timeout)
 {
@@ -108,7 +88,11 @@ static struct ser_hid_chip_functions chip_bu86x = {
 	.chipdesc = "Brymen BU-86X",
 	.vid_pid_items = vid_pid_items_bu86x,
 	.max_bytes_per_request = BU86X_MAX_BYTES_PER_REQUEST,
-	.set_params = bu86x_set_params,
+	/*
+	 * The IR adapter's communication parameters are fixed and need
+	 * not get configured. Just silently ignore the caller's spec.
+	 */
+	.set_params = std_dummy_set_params,
 	.read_bytes = bu86x_read_bytes,
 	.write_bytes = bu86x_write_bytes,
 };
diff --git a/src/serial_hid_victor.c b/src/serial_hid_victor.c
index 694cef27..a304980e 100644
--- a/src/serial_hid_victor.c
+++ b/src/serial_hid_victor.c
@@ -60,26 +60,6 @@ static const struct vid_pid_item vid_pid_items_victor[] = {
 	ALL_ZERO
 };
 
-static int victor_set_params(struct sr_serial_dev_inst *serial,
-	int baudrate, int bits, int parity, int stopbits,
-	int flowcontrol, int rts, int dtr)
-{
-	/*
-	 * The USB HID connection has no concept of UART bitrate or
-	 * frame format. Silently ignore the parameters.
-	 */
-	(void)serial;
-	(void)baudrate;
-	(void)bits;
-	(void)parity;
-	(void)stopbits;
-	(void)flowcontrol;
-	(void)rts;
-	(void)dtr;
-
-	return SR_OK;
-}
-
 /* Reverse bits within a byte. */
 static uint8_t bit_reverse(uint8_t b)
 {
@@ -193,7 +173,11 @@ static struct ser_hid_chip_functions chip_victor = {
 	.chipdesc = "Victor DMM scrambler",
 	.vid_pid_items = vid_pid_items_victor,
 	.max_bytes_per_request = VICTOR_DMM_PACKET_LENGTH,
-	.set_params = victor_set_params,
+	/*
+	 * The USB HID connection has no concept of UART bitrate or
+	 * frame format. Silently ignore the parameters.
+	 */
+	.set_params = std_dummy_set_params,
 	.read_bytes = victor_read_bytes,
 	.write_bytes = victor_write_bytes,
 };
diff --git a/src/std.c b/src/std.c
index b6a0fc9c..cd3bdd0b 100644
--- a/src/std.c
+++ b/src/std.c
@@ -937,3 +937,20 @@ SR_PRIV int std_cg_idx(const struct sr_channel_group *cg, struct sr_channel_grou
 
 	return -1;
 }
+
+SR_PRIV int std_dummy_set_params(struct sr_serial_dev_inst *serial,
+	int baudrate, int bits, int parity, int stopbits,
+	int flowcontrol, int rts, int dtr)
+{
+	(void)serial;
+	(void)baudrate;
+	(void)bits;
+	(void)parity;
+	(void)stopbits;
+	(void)flowcontrol;
+	(void)rts;
+	(void)dtr;
+
+	return SR_OK;
+}
+