if (out < 0) {
sr_err("Send error: %s", g_strerror(errno));
+ g_free(buf);
return SR_ERR;
}
if (out < (int)strlen(buf)) {
- sr_dbg("Only sent %d/%lu bytes of command: '%s'.", out,
+ sr_dbg("Only sent %d/%zu bytes of command: '%s'.", out,
strlen(buf), buf);
}
sr_spew("Sent command: '%s'.", buf);
+
g_free(buf);
return SR_OK;
do {
ret = select(devc->socket + 1, &rset, NULL, NULL, &tv);
- if (ret > 0) {
+ if (ret > 0)
len += beaglelogic_tcp_read_data(devc, buf, 1024);
- }
} while (ret > 0);
sr_spew("Drained %d bytes of data.", len);
g_free(buf);
+
return SR_OK;
}
int len;
gint64 timeout;
+ *tcp_resp = NULL;
if (cmd) {
- if (beaglelogic_tcp_send_cmd(devc, cmd) != SR_OK) {
+ if (beaglelogic_tcp_send_cmd(devc, cmd) != SR_OK)
return SR_ERR;
- }
}
timeout = g_get_monotonic_time() + devc->read_timeout;
return SR_ERR;
}
- if (len > 0) {
+ if (len > 0)
g_string_set_size(response, len);
- }
if (g_get_monotonic_time() > timeout) {
sr_err("Timed out waiting for response.");
response->str, response->len);
*tcp_resp = g_string_free(response, FALSE);
+
return SR_OK;
}
ret = SR_ERR;
g_free(resp);
+
return ret;
}
int ret;
char *resp;
- beaglelogic_tcp_send_cmd(devc, "memalloc %lu", devc->buffersize);
+ beaglelogic_tcp_send_cmd(devc, "memalloc %" PRIu32, devc->buffersize);
ret = beaglelogic_tcp_get_string(devc, NULL, &resp);
if (ret == SR_OK && !g_ascii_strncasecmp(resp, "ok", 2))
ret = SR_OK;
ret = SR_ERR;
g_free(resp);
+
return ret;
}
static int beaglelogic_get_samplerate(struct dev_context *devc)
{
int arg, err;
+
err = beaglelogic_tcp_get_int(devc, "samplerate", &arg);
+ if (err)
+ return err;
+
devc->cur_samplerate = arg;
- return err;
+ return SR_OK;
}
static int beaglelogic_set_samplerate(struct dev_context *devc)
int ret;
char *resp;
- beaglelogic_tcp_send_cmd(devc, "samplerate %lu",
+ beaglelogic_tcp_send_cmd(devc, "samplerate %" PRIu32,
(uint32_t)devc->cur_samplerate);
ret = beaglelogic_tcp_get_string(devc, NULL, &resp);
if (ret == SR_OK && !g_ascii_strncasecmp(resp, "ok", 2))
ret = SR_ERR;
g_free(resp);
+
return ret;
}
int ret;
char *resp;
- beaglelogic_tcp_send_cmd(devc, "sampleunit %lu", devc->sampleunit);
+ beaglelogic_tcp_send_cmd(devc, "sampleunit %" PRIu32, devc->sampleunit);
ret = beaglelogic_tcp_get_string(devc, NULL, &resp);
if (ret == SR_OK && !g_ascii_strncasecmp(resp, "ok", 2))
ret = SR_OK;
ret = SR_ERR;
g_free(resp);
+
return ret;
}
int ret;
char *resp;
- beaglelogic_tcp_send_cmd(devc, "triggerflags %lu", devc->triggerflags);
+ beaglelogic_tcp_send_cmd(devc, "triggerflags %" PRIu32, devc->triggerflags);
ret = beaglelogic_tcp_get_string(devc, NULL, &resp);
if (ret == SR_OK && !g_ascii_strncasecmp(resp, "ok", 2))
ret = SR_OK;
ret = SR_ERR;
g_free(resp);
+
return ret;
}
static int beaglelogic_get_lasterror(struct dev_context *devc)
{
devc->last_error = 0;
+
return SR_OK;
}
static int beaglelogic_start(struct dev_context *devc)
{
beaglelogic_tcp_drain(devc);
+
return beaglelogic_tcp_send_cmd(devc, "get");
}
int ret;
char *resp;
- beaglelogic_tcp_send_cmd(devc, "bufunitsize %ld", devc->bufunitsize);
+ beaglelogic_tcp_send_cmd(devc, "bufunitsize %" PRIu32, devc->bufunitsize);
ret = beaglelogic_tcp_get_string(devc, NULL, &resp);
if (ret == SR_OK && !g_ascii_strncasecmp(resp, "ok", 2))
ret = SR_OK;
ret = SR_ERR;
g_free(resp);
+
return ret;
}
static int dummy(struct dev_context *devc)
{
(void)devc;
+
return SR_ERR_NA;
}