X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fopenbench-logic-sniffer%2Fprotocol.c;h=9082ec1851fcd160bae1e6b4c2d5c434e8db9bba;hb=515ab0889ebde4b373d620044a1a98da37153056;hp=3d5ee6e2691da40d50f7ec448d920c53b2ad895c;hpb=eead2782427ee5da9b793527f9484ac827a7bec5;p=libsigrok.git
diff --git a/src/hardware/openbench-logic-sniffer/protocol.c b/src/hardware/openbench-logic-sniffer/protocol.c
index 3d5ee6e2..9082ec18 100644
--- a/src/hardware/openbench-logic-sniffer/protocol.c
+++ b/src/hardware/openbench-logic-sniffer/protocol.c
@@ -17,11 +17,10 @@
* along with this program. If not, see .
*/
-#include "protocol.h"
#include
+#include "protocol.h"
extern SR_PRIV struct sr_dev_driver ols_driver_info;
-static struct sr_dev_driver *di = &ols_driver_info;
SR_PRIV int send_shortcommand(struct sr_serial_dev_inst *serial,
uint8_t command)
@@ -30,7 +29,10 @@ SR_PRIV int send_shortcommand(struct sr_serial_dev_inst *serial,
sr_dbg("Sending cmd 0x%.2x.", command);
buf[0] = command;
- if (serial_write_blocking(serial, buf, 1, 0) != 1)
+ if (serial_write_blocking(serial, buf, 1, serial_timeout(serial, 1)) != 1)
+ return SR_ERR;
+
+ if (serial_drain(serial) != 0)
return SR_ERR;
return SR_OK;
@@ -48,7 +50,10 @@ SR_PRIV int send_longcommand(struct sr_serial_dev_inst *serial,
buf[2] = data[1];
buf[3] = data[2];
buf[4] = data[3];
- if (serial_write_blocking(serial, buf, 5, 0) != 5)
+ if (serial_write_blocking(serial, buf, 5, serial_timeout(serial, 1)) != 5)
+ return SR_ERR;
+
+ if (serial_drain(serial) != 0)
return SR_ERR;
return SR_OK;
@@ -118,10 +123,7 @@ SR_PRIV struct dev_context *ols_dev_new(void)
{
struct dev_context *devc;
- if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
- sr_err("Device context malloc failed.");
- return NULL;
- }
+ devc = g_malloc0(sizeof(struct dev_context));
/* Device-specific settings */
devc->max_samples = devc->max_samplerate = devc->protocol_version = 0;
@@ -139,14 +141,15 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
- struct sr_channel *ch;
uint32_t tmp_int, ui;
uint8_t key, type, token;
+ int delay_ms;
GString *tmp_str, *devname, *version;
guchar tmp_c;
- sdi = sr_dev_inst_new(SR_ST_INACTIVE, NULL, NULL, NULL);
- sdi->driver = di;
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi->status = SR_ST_INACTIVE;
+ sdi->driver = &ols_driver_info;
devc = ols_dev_new();
sdi->priv = devc;
@@ -155,7 +158,8 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
key = 0xff;
while (key) {
- if (serial_read_blocking(serial, &key, 1, 0) != 1)
+ delay_ms = serial_timeout(serial, 1);
+ if (serial_read_blocking(serial, &key, 1, delay_ms) != 1)
break;
if (key == 0x00) {
sr_dbg("Got metadata key 0x00, metadata ends.");
@@ -167,7 +171,8 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
case 0:
/* NULL-terminated string */
tmp_str = g_string_new("");
- while (serial_read_blocking(serial, &tmp_c, 1, 0) == 1 && tmp_c != '\0')
+ delay_ms = serial_timeout(serial, 1);
+ while (serial_read_blocking(serial, &tmp_c, 1, delay_ms) == 1 && tmp_c != '\0')
g_string_append_c(tmp_str, tmp_c);
sr_dbg("Got metadata key 0x%.2x value '%s'.",
key, tmp_str->str);
@@ -199,7 +204,8 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
break;
case 1:
/* 32-bit unsigned integer */
- if (serial_read_blocking(serial, &tmp_int, 4, 0) != 4)
+ delay_ms = serial_timeout(serial, 4);
+ if (serial_read_blocking(serial, &tmp_int, 4, delay_ms) != 4)
break;
tmp_int = RB32(&tmp_int);
sr_dbg("Got metadata key 0x%.2x value 0x%.8x.",
@@ -207,12 +213,9 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
switch (token) {
case 0x00:
/* Number of usable channels */
- for (ui = 0; ui < tmp_int; ui++) {
- if (!(ch = sr_channel_new(ui, SR_CHANNEL_LOGIC, TRUE,
- ols_channel_names[ui])))
- return 0;
- sdi->channels = g_slist_append(sdi->channels, ch);
- }
+ for (ui = 0; ui < tmp_int; ui++)
+ sr_channel_new(sdi, ui, SR_CHANNEL_LOGIC, TRUE,
+ ols_channel_names[ui]);
break;
case 0x01:
/* Amount of sample memory available (bytes) */
@@ -223,7 +226,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
/* what is this for? */
break;
case 0x03:
- /* Maximum sample rate (hz) */
+ /* Maximum sample rate (Hz) */
devc->max_samplerate = tmp_int;
break;
case 0x04:
@@ -238,19 +241,17 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
break;
case 2:
/* 8-bit unsigned integer */
- if (serial_read_blocking(serial, &tmp_c, 1, 0) != 1)
+ delay_ms = serial_timeout(serial, 1);
+ if (serial_read_blocking(serial, &tmp_c, 1, delay_ms) != 1)
break;
sr_dbg("Got metadata key 0x%.2x value 0x%.2x.",
key, tmp_c);
switch (token) {
case 0x00:
/* Number of usable channels */
- for (ui = 0; ui < tmp_c; ui++) {
- if (!(ch = sr_channel_new(ui, SR_CHANNEL_LOGIC, TRUE,
- ols_channel_names[ui])))
- return 0;
- sdi->channels = g_slist_append(sdi->channels, ch);
- }
+ for (ui = 0; ui < tmp_c; ui++)
+ sr_channel_new(sdi, ui, SR_CHANNEL_LOGIC, TRUE,
+ ols_channel_names[ui]);
break;
case 0x01:
/* protocol version */