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

ols: change driver dev_acquisition_start/_stop calls to use sdi 

...yeah, forgot OLS.
This commit is contained in:
Bert Vermeulen 2012-07-22 12:35:57 +02:00
parent be5bf44d28
commit 5d9ed643e9
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -884,12 +884,12 @@ static int receive_data(int fd, int revents, void *cb_data)
return TRUE; return TRUE;
} }
static int hw_dev_acquisition_start(int dev_index, void *cb_data) static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{ {
struct sr_datafeed_packet *packet; struct sr_datafeed_packet *packet;
struct sr_datafeed_header *header; struct sr_datafeed_header *header;
struct sr_datafeed_meta_logic meta; struct sr_datafeed_meta_logic meta;
struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;
uint32_t trigger_config[4]; uint32_t trigger_config[4];
uint32_t data; uint32_t data;
@ -898,9 +898,6 @@ 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(odi->instances, dev_index)))
return SR_ERR;
ctx = sdi->priv; ctx = sdi->priv;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
@ -1044,12 +1041,13 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
} }
/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */ /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
static int hw_dev_acquisition_stop(int dev_index, void *cb_data) static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
void *cb_data)
{ {
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
/* Avoid compiler warnings. */ /* Avoid compiler warnings. */
(void)dev_index; (void)sdi;
packet.type = SR_DF_END; packet.type = SR_DF_END;
sr_session_send(cb_data, &packet); sr_session_send(cb_data, &packet);