X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffluke-dmm%2Fapi.c;h=f533f1c5df7d7a2731f187b28779efea7c709944;hb=366ccb8ab75f7291a11e677034085c702a1c5361;hp=50add95d7be20778f0a736a85de8c53b51234910;hpb=05199c0ac9f15f229d43e50e86c4c1eadc55deac;p=libsigrok.git diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c index 50add95d..f533f1c5 100644 --- a/src/hardware/fluke-dmm/api.c +++ b/src/hardware/fluke-dmm/api.c @@ -90,7 +90,7 @@ static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn, /* Response is first a CMD_ACK byte (ASCII '0' for OK, * or '1' to signify an error. */ - len = 128; + len = sizeof(buf); serial_readline(serial, &b, &len, 150); if (len != 1) continue; @@ -98,7 +98,7 @@ static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn, continue; /* If CMD_ACK was OK, ID string follows. */ - len = 128; + len = sizeof(buf); serial_readline(serial, &b, &len, 850); if (len < 10) continue; @@ -182,8 +182,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_set(uint32_t key, GVariant *data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; @@ -194,8 +194,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return sr_sw_limits_config_set(&devc->limits, key, data); } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); } @@ -210,7 +210,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) sr_sw_limits_acquisition_start(&devc->limits); std_session_send_df_header(sdi); - /* Poll every 100ms, or whenever some data comes in. */ serial = sdi->conn; serial_source_add(sdi->session, serial, G_IO_IN, 50, fluke_receive_data, (void *)sdi);