X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkern-scale%2Fapi.c;h=70e85a0775f0898f00697599d257334c5490063d;hb=e4204b1757459a03c0a70849a659f27387edc295;hp=e369a44cf5e585722dbec8acf544b8a90b8119e8;hpb=8686b747cd40695c36f998603f6e853ee5eea883;p=libsigrok.git diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c index e369a44c..70e85a07 100644 --- a/src/hardware/kern-scale/api.c +++ b/src/hardware/kern-scale/api.c @@ -89,7 +89,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) /* Let's get a bit of data and see if we can find a packet. */ len = sizeof(buf); ret = serial_stream_detect(serial, buf, &len, scale->packet_size, - scale->packet_valid, 3000, scale->baudrate); + scale->packet_valid, 3000); if (ret != SR_OK) goto scan_cleanup; @@ -153,7 +153,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) return SR_OK; } -#define SCALE(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, \ +#define SCALE(ID, CHIPSET, VENDOR, MODEL, CONN, PACKETSIZE, \ VALID, PARSE) \ &((struct scale_info) { \ { \ @@ -174,7 +174,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) .dev_acquisition_stop = std_serial_dev_acquisition_stop, \ .context = NULL, \ }, \ - VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, \ + VENDOR, MODEL, CONN, PACKETSIZE, \ VALID, PARSE, sizeof(struct CHIPSET##_info) \ }).di @@ -191,7 +191,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) SR_REGISTER_DEV_DRIVER_LIST(kern_scale_drivers, SCALE( "kern-ew-6200-2nm", kern, - "KERN", "EW 6200-2NM", "1200/8n2", 1200, + "KERN", "EW 6200-2NM", "1200/8n2", 15 /* (or 14) */, sr_kern_packet_valid, sr_kern_parse ) );