Drop some lines that are no longer needed.
This commit is contained in:
parent
0bdb4f2e4a
commit
decfe89d4e
|
@ -172,8 +172,6 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
|
||||||
GVariantBuilder gvb;
|
GVariantBuilder gvb;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
(void)sdi;
|
|
||||||
|
|
||||||
switch (key) {
|
switch (key) {
|
||||||
case SR_CONF_DEVICE_OPTIONS:
|
case SR_CONF_DEVICE_OPTIONS:
|
||||||
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
|
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
|
||||||
|
|
|
@ -210,8 +210,6 @@ static GSList *hw_dev_list(void)
|
||||||
|
|
||||||
static int hw_dev_open(struct sr_dev_inst *sdi)
|
static int hw_dev_open(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
(void)sdi;
|
|
||||||
|
|
||||||
sdi->status = SR_ST_ACTIVE;
|
sdi->status = SR_ST_ACTIVE;
|
||||||
|
|
||||||
return SR_OK;
|
return SR_OK;
|
||||||
|
@ -219,9 +217,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
static int hw_dev_close(struct sr_dev_inst *sdi)
|
static int hw_dev_close(struct sr_dev_inst *sdi)
|
||||||
{
|
{
|
||||||
(void)sdi;
|
sdi->status = SR_ST_INACTIVE;
|
||||||
|
|
||||||
sdi->status = SR_ST_INACTIVE;
|
|
||||||
|
|
||||||
return SR_OK;
|
return SR_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,8 +35,6 @@ static struct sr_datafeed_analog *handle_qm_18x(const struct sr_dev_inst *sdi,
|
||||||
char *e, *u;
|
char *e, *u;
|
||||||
gboolean is_oor;
|
gboolean is_oor;
|
||||||
|
|
||||||
(void)sdi;
|
|
||||||
|
|
||||||
if (strcmp(tokens[0], "QM") || !tokens[1])
|
if (strcmp(tokens[0], "QM") || !tokens[1])
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
@ -159,8 +157,6 @@ static struct sr_datafeed_analog *handle_qm_28x(const struct sr_dev_inst *sdi,
|
||||||
float fvalue;
|
float fvalue;
|
||||||
char *eptr;
|
char *eptr;
|
||||||
|
|
||||||
(void)sdi;
|
|
||||||
|
|
||||||
if (!tokens[1])
|
if (!tokens[1])
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
|
@ -343,7 +343,6 @@ static struct dev_context *fx2lafw_dev_new(void)
|
||||||
devc->limit_samples = 0;
|
devc->limit_samples = 0;
|
||||||
devc->sample_wide = 0;
|
devc->sample_wide = 0;
|
||||||
|
|
||||||
|
|
||||||
return devc;
|
return devc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -593,8 +593,6 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
|
||||||
GVariantBuilder gvb;
|
GVariantBuilder gvb;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
(void)sdi;
|
|
||||||
|
|
||||||
if (!sdi)
|
if (!sdi)
|
||||||
return SR_ERR_ARG;
|
return SR_ERR_ARG;
|
||||||
|
|
||||||
|
|
|
@ -81,8 +81,6 @@ static GSList *hw_scan(GSList *options)
|
||||||
GSList *usb_devices, *devices, *l;
|
GSList *usb_devices, *devices, *l;
|
||||||
const char *conn;
|
const char *conn;
|
||||||
|
|
||||||
(void)options;
|
|
||||||
|
|
||||||
drvc = di->priv;
|
drvc = di->priv;
|
||||||
|
|
||||||
conn = NULL;
|
conn = NULL;
|
||||||
|
|
|
@ -67,8 +67,6 @@ static GSList *hw_scan(GSList *options)
|
||||||
struct udev *udev;
|
struct udev *udev;
|
||||||
int ptype;
|
int ptype;
|
||||||
|
|
||||||
(void)options;
|
|
||||||
|
|
||||||
for (l = options; l; l = l->next) {
|
for (l = options; l; l = l->next) {
|
||||||
src = l->data;
|
src = l->data;
|
||||||
switch (src->key) {
|
switch (src->key) {
|
||||||
|
|
|
@ -153,8 +153,6 @@ static GSList *hw_scan(GSList *options)
|
||||||
int i;
|
int i;
|
||||||
const char *conn;
|
const char *conn;
|
||||||
|
|
||||||
(void)options;
|
|
||||||
|
|
||||||
drvc = di->priv;
|
drvc = di->priv;
|
||||||
|
|
||||||
conn = NULL;
|
conn = NULL;
|
||||||
|
|
|
@ -72,8 +72,6 @@ static GSList *scan(GSList *options)
|
||||||
const char *conn, *serialcomm;
|
const char *conn, *serialcomm;
|
||||||
char buf[8];
|
char buf[8];
|
||||||
|
|
||||||
(void)options;
|
|
||||||
|
|
||||||
drvc = di->priv;
|
drvc = di->priv;
|
||||||
|
|
||||||
devices = NULL;
|
devices = NULL;
|
||||||
|
@ -464,7 +462,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
|
||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
/* Avoid compiler warnings. */
|
|
||||||
(void)cb_data;
|
(void)cb_data;
|
||||||
|
|
||||||
abort_acquisition(sdi);
|
abort_acquisition(sdi);
|
||||||
|
|
|
@ -43,7 +43,7 @@ SR_PRIV int rigol_ds1xx2_receive(int fd, int revents, void *cb_data)
|
||||||
int len, i, waveform_size;
|
int len, i, waveform_size;
|
||||||
struct sr_probe *probe;
|
struct sr_probe *probe;
|
||||||
|
|
||||||
(void) fd;
|
(void)fd;
|
||||||
|
|
||||||
if (!(sdi = cb_data))
|
if (!(sdi = cb_data))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
Loading…
Reference in New Issue