BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Create & use new sr_usbtmc_dev_inst for Rigol DS driver.

This commit is contained in:
Martin Ling 2013-11-29 00:48:42 +00:00
parent babab6225b
commit ae67644fe5
6 changed files with 74 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
device.c
View File

@ -350,9 +350,34 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
g_free(serial->serialcomm); g_free(serial->serialcomm);
g_free(serial); g_free(serial);
} }
#endif #endif
SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device)
{
struct sr_usbtmc_dev_inst *usbtmc;
if (!device) {
sr_err("Device name required.");
return NULL;
}
if (!(usbtmc = g_try_malloc0(sizeof(struct sr_usbtmc_dev_inst)))) {
sr_err("USBTMC device instance malloc failed.");
return NULL;
}
usbtmc->device = g_strdup(device);
usbtmc->fd = -1;
return usbtmc;
}
SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc)
{
g_free(usbtmc->device);
g_free(usbtmc);
}
/** /**
* Get the list of devices/instances of the specified driver. * Get the list of devices/instances of the specified driver.
* *

42
hardware/rigol-ds/api.c
View File

@ -217,7 +217,7 @@ static int probe_port(const char *port, GSList **devices)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct sr_serial_dev_inst *serial; struct sr_usbtmc_dev_inst *usbtmc;
struct sr_probe *probe; struct sr_probe *probe;
unsigned int i; unsigned int i;
int len, num_tokens; int len, num_tokens;
@ -227,17 +227,17 @@ static int probe_port(const char *port, GSList **devices)
gchar **tokens, *channel_name; gchar **tokens, *channel_name;
*devices = NULL; *devices = NULL;
if (!(serial = sr_serial_dev_inst_new(port, NULL))) if (!(usbtmc = sr_usbtmc_dev_inst_new(port)))
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
if (serial_open(serial, SERIAL_RDWR) != SR_OK) if ((usbtmc->fd = open(usbtmc->device, O_RDWR)) < 0)
return SR_ERR; return SR_ERR;
len = serial_write(serial, "*IDN?", 5); len = write(usbtmc->fd, "*IDN?", 5);
len = serial_read(serial, buf, sizeof(buf)); len = read(usbtmc->fd, buf, sizeof(buf));
if (serial_close(serial) != SR_OK) if (close(usbtmc->fd) < 0)
return SR_ERR; return SR_ERR;
sr_serial_dev_inst_free(serial); sr_usbtmc_dev_inst_free(usbtmc);
if (len == 0) if (len == 0)
return SR_ERR_NA; return SR_ERR_NA;
@ -277,10 +277,10 @@ static int probe_port(const char *port, GSList **devices)
g_strfreev(tokens); g_strfreev(tokens);
if (!(sdi->conn = sr_serial_dev_inst_new(port, NULL))) if (!(sdi->conn = sr_usbtmc_dev_inst_new(port)))
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
sdi->driver = di; sdi->driver = di;
sdi->inst_type = SR_INST_SERIAL; sdi->inst_type = SR_INST_USBTMC;
if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
@ -399,8 +399,9 @@ static GSList *dev_list(void)
static int dev_open(struct sr_dev_inst *sdi) static int dev_open(struct sr_dev_inst *sdi)
{ {
struct sr_usbtmc_dev_inst *usbtmc = sdi->conn;
if (serial_open(sdi->conn, SERIAL_RDWR) != SR_OK) if ((usbtmc->fd = open(usbtmc->device, O_RDWR)) < 0)
return SR_ERR; return SR_ERR;
if (rigol_ds_get_dev_cfg(sdi) != SR_OK) if (rigol_ds_get_dev_cfg(sdi) != SR_OK)
@ -413,11 +414,12 @@ static int dev_open(struct sr_dev_inst *sdi)
static int dev_close(struct sr_dev_inst *sdi) static int dev_close(struct sr_dev_inst *sdi)
{ {
struct sr_serial_dev_inst *serial; struct sr_usbtmc_dev_inst *usbtmc;
serial = sdi->conn; usbtmc = sdi->conn;
if (serial && serial->fd != -1) { if (usbtmc && usbtmc->fd != -1) {
serial_close(serial); close(usbtmc->fd);
usbtmc->fd = -1;
sdi->status = SR_ST_INACTIVE; sdi->status = SR_ST_INACTIVE;
} }
@ -737,7 +739,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{ {
struct sr_serial_dev_inst *serial; struct sr_usbtmc_dev_inst *usbtmc;
struct dev_context *devc; struct dev_context *devc;
struct sr_probe *probe; struct sr_probe *probe;
GSList *l; GSList *l;
@ -746,7 +748,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
serial = sdi->conn; usbtmc = sdi->conn;
devc = sdi->priv; devc = sdi->priv;
if (devc->data_source == DATA_SOURCE_LIVE) { if (devc->data_source == DATA_SOURCE_LIVE) {
@ -792,7 +794,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (!devc->enabled_analog_probes && !devc->enabled_digital_probes) if (!devc->enabled_analog_probes && !devc->enabled_digital_probes)
return SR_ERR; return SR_ERR;
sr_source_add(serial->fd, G_IO_IN, 50, rigol_ds_receive, (void *)sdi); sr_source_add(usbtmc->fd, G_IO_IN, 50, rigol_ds_receive, (void *)sdi);
/* Send header packet to the session bus. */ /* Send header packet to the session bus. */
std_session_send_df_header(cb_data, LOG_PREFIX); std_session_send_df_header(cb_data, LOG_PREFIX);
@ -843,7 +845,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_usbtmc_dev_inst *usbtmc;
(void)cb_data; (void)cb_data;
@ -858,8 +860,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
g_slist_free(devc->enabled_digital_probes); g_slist_free(devc->enabled_digital_probes);
devc->enabled_analog_probes = NULL; devc->enabled_analog_probes = NULL;
devc->enabled_digital_probes = NULL; devc->enabled_digital_probes = NULL;
serial = sdi->conn; usbtmc = sdi->conn;
sr_source_remove(serial->fd); sr_source_remove(usbtmc->fd);
return SR_OK; return SR_OK;
} }

26
hardware/rigol-ds/protocol.c
View File

@ -346,13 +346,13 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
} }
/* Read the header of a data block */ /* Read the header of a data block */
static int rigol_ds_read_header(struct sr_serial_dev_inst *serial) static int rigol_ds_read_header(struct sr_usbtmc_dev_inst *usbtmc)
{ {
char start[3], length[10]; char start[3], length[10];
int len, tmp; int len, tmp;
/* Read the hashsign and length digit. */ /* Read the hashsign and length digit. */
tmp = serial_read(serial, start, 2); tmp = read(usbtmc->fd, start, 2);
start[2] = '\0'; start[2] = '\0';
if (tmp != 2) if (tmp != 2)
{ {
@ -367,7 +367,7 @@ static int rigol_ds_read_header(struct sr_serial_dev_inst *serial)
len = atoi(start + 1); len = atoi(start + 1);
/* Read the data length. */ /* Read the data length. */
tmp = serial_read(serial, length, len); tmp = read(usbtmc->fd, length, len);
length[len] = '\0'; length[len] = '\0';
if (tmp != len) if (tmp != len)
{ {
@ -388,7 +388,7 @@ static int rigol_ds_read_header(struct sr_serial_dev_inst *serial)
SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data) SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct sr_serial_dev_inst *serial; struct sr_usbtmc_dev_inst *usbtmc;
struct dev_context *devc; struct dev_context *devc;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog; struct sr_datafeed_analog analog;
@ -405,7 +405,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
if (!(devc = sdi->priv)) if (!(devc = sdi->priv))
return TRUE; return TRUE;
serial = sdi->conn; usbtmc = sdi->conn;
if (revents == G_IO_IN) { if (revents == G_IO_IN) {
if (devc->model->protocol == PROTOCOL_IEEE488_2) { if (devc->model->protocol == PROTOCOL_IEEE488_2) {
@ -442,7 +442,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
sr_dbg("New block header expected"); sr_dbg("New block header expected");
if (rigol_ds_send(sdi, ":WAV:DATA?") != SR_OK) if (rigol_ds_send(sdi, ":WAV:DATA?") != SR_OK)
return TRUE; return TRUE;
len = rigol_ds_read_header(serial); len = rigol_ds_read_header(usbtmc);
if (len == -1) if (len == -1)
return TRUE; return TRUE;
/* At slow timebases in live capture the DS2072 /* At slow timebases in live capture the DS2072
@ -454,7 +454,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
if (devc->data_source == DATA_SOURCE_LIVE if (devc->data_source == DATA_SOURCE_LIVE
&& (unsigned)len < devc->num_frame_bytes) { && (unsigned)len < devc->num_frame_bytes) {
sr_dbg("Discarding short data block"); sr_dbg("Discarding short data block");
serial_read(serial, devc->buffer, len + 1); read(usbtmc->fd, devc->buffer, len + 1);
return TRUE; return TRUE;
} }
devc->num_block_bytes = len; devc->num_block_bytes = len;
@ -465,12 +465,12 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
probe = devc->channel_frame; probe = devc->channel_frame;
if (devc->model->protocol == PROTOCOL_IEEE488_2) { if (devc->model->protocol == PROTOCOL_IEEE488_2) {
len = devc->num_block_bytes - devc->num_block_read; len = devc->num_block_bytes - devc->num_block_read;
len = serial_read(serial, devc->buffer, len = read(usbtmc->fd, devc->buffer,
len < ACQ_BUFFER_SIZE ? len : ACQ_BUFFER_SIZE); len < ACQ_BUFFER_SIZE ? len : ACQ_BUFFER_SIZE);
} else { } else {
waveform_size = probe->type == SR_PROBE_ANALOG ? waveform_size = probe->type == SR_PROBE_ANALOG ?
DS1000_ANALOG_LIVE_WAVEFORM_SIZE : DIGITAL_WAVEFORM_SIZE; DS1000_ANALOG_LIVE_WAVEFORM_SIZE : DIGITAL_WAVEFORM_SIZE;
len = serial_read(serial, devc->buffer, waveform_size - devc->num_frame_bytes); len = read(usbtmc->fd, devc->buffer, waveform_size - devc->num_frame_bytes);
} }
sr_dbg("Received %d bytes.", len); sr_dbg("Received %d bytes.", len);
if (len == -1) if (len == -1)
@ -510,7 +510,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
sr_dbg("Block has been completed"); sr_dbg("Block has been completed");
/* Discard the terminating linefeed and prepare for /* Discard the terminating linefeed and prepare for
possible next block */ possible next block */
serial_read(serial, devc->buffer, 1); read(usbtmc->fd, devc->buffer, 1);
devc->num_block_bytes = 0; devc->num_block_bytes = 0;
if (devc->data_source != DATA_SOURCE_LIVE) if (devc->data_source != DATA_SOURCE_LIVE)
rigol_ds_set_wait_event(devc, WAIT_BLOCK); rigol_ds_set_wait_event(devc, WAIT_BLOCK);
@ -611,13 +611,14 @@ SR_PRIV int rigol_ds_send(const struct sr_dev_inst *sdi, const char *format, ...
va_list args; va_list args;
char buf[256]; char buf[256];
int len, out, ret; int len, out, ret;
struct sr_usbtmc_dev_inst *usbtmc = sdi->conn;
va_start(args, format); va_start(args, format);
len = vsnprintf(buf, 255, format, args); len = vsnprintf(buf, 255, format, args);
va_end(args); va_end(args);
strcat(buf, "\n"); strcat(buf, "\n");
len++; len++;
out = serial_write(sdi->conn, buf, len); out = write(usbtmc->fd, buf, len);
buf[len - 1] = '\0'; buf[len - 1] = '\0';
if (out != len) { if (out != len) {
sr_dbg("Only sent %d/%d bytes of '%s'.", out, len, buf); sr_dbg("Only sent %d/%d bytes of '%s'.", out, len, buf);
@ -634,11 +635,12 @@ static int get_cfg(const struct sr_dev_inst *sdi, char *cmd, char *reply, size_t
{ {
int len; int len;
struct dev_context *devc = sdi->priv; struct dev_context *devc = sdi->priv;
struct sr_usbtmc_dev_inst *usbtmc = sdi->conn;
if (rigol_ds_send(sdi, cmd) != SR_OK) if (rigol_ds_send(sdi, cmd) != SR_OK)
return SR_ERR; return SR_ERR;
if ((len = serial_read(sdi->conn, reply, maxlen - 1)) < 0) if ((len = read(usbtmc->fd, reply, maxlen - 1)) < 0)
return SR_ERR; return SR_ERR;
reply[len] = '\0'; reply[len] = '\0';

8
libsigrok-internal.h
View File

@ -79,6 +79,11 @@ struct sr_serial_dev_inst {
}; };
#endif #endif
struct sr_usbtmc_dev_inst {
char *device;
int fd;
};
/* Private driver context. */ /* Private driver context. */
struct drv_context { struct drv_context {
struct sr_context *sr_ctx; struct sr_context *sr_ctx;
@ -119,6 +124,9 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial); SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial);
#endif #endif
/* USBTMC-specific instances */
SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device);
SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc);
/*--- hwdriver.c ------------------------------------------------------------*/ /*--- hwdriver.c ------------------------------------------------------------*/

2
libsigrok.h
View File

@ -803,6 +803,8 @@ enum {
SR_INST_USB = 10000, SR_INST_USB = 10000,
/** Device instance type for serial port devices. */ /** Device instance type for serial port devices. */
SR_INST_SERIAL, SR_INST_SERIAL,
/** Device instance type for USBTMC devices. */
SR_INST_USBTMC,
}; };
/** Device instance status. */ /** Device instance status. */

2
std.c
View File

@ -215,6 +215,8 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
if (sdi->inst_type == SR_INST_USB) if (sdi->inst_type == SR_INST_USB)
sr_usb_dev_inst_free(sdi->conn); sr_usb_dev_inst_free(sdi->conn);
#endif #endif
if (sdi->inst_type == SR_INST_USBTMC)
sr_usbtmc_dev_inst_free(sdi->conn);
} }
if (clear_private) if (clear_private)
clear_private(sdi->priv); clear_private(sdi->priv);