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

ols: use driver struct-based device instance list

This commit is contained in:
Bert Vermeulen 2012-07-13 13:26:30 +02:00
parent d6db79a48c
commit e5e81856b4
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hardware/openbench-logic-sniffer/ols.c
View File

@ -100,8 +100,8 @@ static const struct sr_samplerates samplerates = {
NULL, NULL,
}; };
/* List of struct sr_dev_inst. */ SR_PRIV struct sr_dev_driver ols_driver_info;
static GSList *dev_insts = NULL; static struct sr_dev_driver *odi = &ols_driver_info;
static int send_shortcommand(int fd, uint8_t command) static int send_shortcommand(int fd, uint8_t command)
{ {
@ -459,7 +459,9 @@ static int hw_scan(void)
sdi->priv = ctx; sdi->priv = ctx;
} }
ctx->serial = sr_serial_dev_inst_new(dev_names[i], -1); ctx->serial = sr_serial_dev_inst_new(dev_names[i], -1);
dev_insts = g_slist_append(dev_insts, sdi); odi->instances = g_slist_append(odi->instances, sdi);
devices = g_slist_append(devices, sdi);
final_devcnt++; final_devcnt++;
serial_close(fds[i].fd); serial_close(fds[i].fd);
fds[i].fd = 0; fds[i].fd = 0;
@ -491,7 +493,7 @@ static int hw_dev_open(int dev_index)
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
return SR_ERR; return SR_ERR;
ctx = sdi->priv; ctx = sdi->priv;
@ -510,7 +512,7 @@ static int hw_dev_close(int dev_index)
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { if (!(sdi = sr_dev_inst_get(odi->instances, dev_index))) {
sr_err("ols: %s: sdi was NULL", __func__); sr_err("ols: %s: sdi was NULL", __func__);
return SR_ERR_BUG; return SR_ERR_BUG;
} }
@ -535,7 +537,7 @@ static int hw_cleanup(void)
int ret = SR_OK; int ret = SR_OK;
/* Properly close and free all devices. */ /* Properly close and free all devices. */
for (l = dev_insts; l; l = l->next) { for (l = odi->instances; l; l = l->next) {
if (!(sdi = l->data)) { if (!(sdi = l->data)) {
/* Log error, but continue cleaning up the rest. */ /* Log error, but continue cleaning up the rest. */
sr_err("ols: %s: sdi was NULL, continuing", __func__); sr_err("ols: %s: sdi was NULL, continuing", __func__);
@ -555,8 +557,8 @@ static int hw_cleanup(void)
sr_serial_dev_inst_free(ctx->serial); sr_serial_dev_inst_free(ctx->serial);
sr_dev_inst_free(sdi); sr_dev_inst_free(sdi);
} }
g_slist_free(dev_insts); g_slist_free(odi->instances);
dev_insts = NULL; odi->instances = NULL;
return ret; return ret;
} }
@ -600,7 +602,7 @@ static int hw_dev_status_get(int dev_index)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
return SR_ST_NOT_FOUND; return SR_ST_NOT_FOUND;
return sdi->status; return sdi->status;
@ -650,7 +652,7 @@ static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
int ret; int ret;
const uint64_t *tmp_u64; const uint64_t *tmp_u64;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
return SR_ERR; return SR_ERR;
ctx = sdi->priv; ctx = sdi->priv;
@ -708,7 +710,7 @@ static int receive_data(int fd, int revents, void *cb_data)
/* Find this device's ctx struct by its fd. */ /* Find this device's ctx struct by its fd. */
ctx = NULL; ctx = NULL;
for (l = dev_insts; l; l = l->next) { for (l = odi->instances; l; l = l->next) {
sdi = l->data; sdi = l->data;
ctx = sdi->priv; ctx = sdi->priv;
if (ctx->serial->fd == fd) { if (ctx->serial->fd == fd) {
@ -890,7 +892,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
int num_channels; int num_channels;
int i; int i;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
return SR_ERR; return SR_ERR;
ctx = sdi->priv; ctx = sdi->priv;
@ -1064,4 +1066,5 @@ SR_PRIV struct sr_dev_driver ols_driver_info = {
.dev_config_set = hw_dev_config_set, .dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop, .dev_acquisition_stop = hw_dev_acquisition_stop,
.instances = NULL,
}; };