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

Consistently use 'scanopts' variable across all drivers.

This commit is contained in:
Bert Vermeulen 2014-09-16 22:19:02 +02:00
parent f254bc4bba
commit a0e0bb4149
25 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hardware/agilent-dmm/api.c
View File

@ -27,7 +27,7 @@
#include "libsigrok-internal.h"
#include "agilent-dmm.h"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -225,7 +225,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/appa-55ii/api.c
View File

@ -20,7 +20,7 @@
#include <string.h>
#include "protocol.h"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -214,7 +214,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/brymen-bm86x/api.c
View File

@ -21,7 +21,7 @@
#define BRYMEN_BC86X "0820.0001"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
@ -243,7 +243,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/brymen-dmm/api.c
View File

@ -19,7 +19,7 @@
#include "protocol.h"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -189,7 +189,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/cem-dt-885x/api.c
View File

@ -24,7 +24,7 @@
/* 23ms is the longest interval between tokens. */
#define MAX_SCAN_TIME 25 * 1000
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
@ -342,7 +342,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/center-3xx/api.c
View File

@ -20,7 +20,7 @@
#include "protocol.h"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -197,7 +197,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/colead-slm/api.c
View File

@ -30,7 +30,7 @@
/* The Colead SL-5868P uses this. */
#define SERIALCOMM "2400/8n1"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -176,7 +176,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/conrad-digi-35-cpu/api.c
View File

@ -26,7 +26,7 @@
#define SERIALCOMM "9600/8n1"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -176,7 +176,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/fluke-dmm/api.c
View File

@ -27,7 +27,7 @@
#include "libsigrok-internal.h"
#include "fluke-dmm.h"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -250,7 +250,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/fx2lafw/api.c
View File

@ -73,7 +73,7 @@ static const struct fx2lafw_profile supported_fx2[] = {
{ 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
@ -478,7 +478,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/gmc-mh-1x-2x/api.c
View File

@ -34,7 +34,7 @@
SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info;
SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info;
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -463,7 +463,7 @@ static int config_list_common(uint32_t key, GVariant **data, const struct sr_dev
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
default:
return SR_ERR_NA;

4
src/hardware/lascar-el-usb/api.c
View File

@ -26,7 +26,7 @@
SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
static struct sr_dev_driver *di = &lascar_el_usb_driver_info;
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
@ -243,7 +243,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/manson-hcs-3xxx/api.c
View File

@ -26,7 +26,7 @@
#include "protocol.h"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -338,7 +338,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/mic-985xx/api.c
View File

@ -20,7 +20,7 @@
#include "protocol.h"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -199,7 +199,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/motech-lps-30x/api.c
View File

@ -44,7 +44,7 @@ SR_PRIV int lps_query_status(struct sr_dev_inst* sdi);
#define VENDOR_MOTECH "Motech"
/** Driver scanning options. */
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -732,7 +732,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
return SR_OK;
default:
if (sdi == NULL)

4
src/hardware/norma-dmm/api.c
View File

@ -24,7 +24,7 @@
#include "protocol.h"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -281,7 +281,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/openbench-logic-sniffer/api.c
View File

@ -22,7 +22,7 @@
#define SERIALCOMM "115200/8n1"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -364,7 +364,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/rigol-ds/api.c
View File

@ -29,7 +29,7 @@
#include "libsigrok-internal.h"
#include "protocol.h"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM
};
@ -772,7 +772,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
if (key == SR_CONF_SCAN_OPTIONS) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
return SR_OK;
} else if (key == SR_CONF_DEVICE_OPTIONS && cg == NULL) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/saleae-logic16/api.c
View File

@ -41,7 +41,7 @@
SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
static struct sr_dev_driver *di = &saleae_logic16_driver_info;
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
@ -548,7 +548,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/serial-dmm/api.c
View File

@ -29,7 +29,7 @@
#include "libsigrok-internal.h"
#include "protocol.h"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -507,7 +507,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/sysclk-lwla/api.c
View File

@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
@ -457,7 +457,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, G_N_ELEMENTS(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/teleinfo/api.c
View File

@ -23,7 +23,7 @@
#include "libsigrok-internal.h"
#include "protocol.h"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -217,7 +217,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/tondaj-sl-814/api.c
View File

@ -26,7 +26,7 @@
#define SERIALCOMM "9600/8e1"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
@ -162,7 +162,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/uni-t-dmm/api.c
View File

@ -26,7 +26,7 @@
#define UNI_T_UT_D04_NEW "1a86.e008"
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
@ -311,7 +311,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

4
src/hardware/victor-dmm/api.c
View File

@ -35,7 +35,7 @@ SR_PRIV struct sr_dev_driver victor_dmm_driver_info;
static struct sr_dev_driver *di = &victor_dmm_driver_info;
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
static const uint32_t hwopts[] = {
static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
@ -272,7 +272,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
break;
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,