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

fluke-dmm: build fixes

This commit is contained in:
Bert Vermeulen 2012-09-15 18:28:43 +02:00
parent 4f958423d1
commit e7edd64f45
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hardware/fluke-dmm/api.c
View File

@ -29,8 +29,8 @@
#include <errno.h> #include <errno.h>
SR_PRIV struct sr_dev_driver driver_info; SR_PRIV struct sr_dev_driver flukedmm_driver_info;
static struct sr_dev_driver *di = &driver_info; static struct sr_dev_driver *di = &flukedmm_driver_info;
static const struct flukedmm_profile supported_flukedmm[] = { static const struct flukedmm_profile supported_flukedmm[] = {
{ FLUKE_187, "187" }, { FLUKE_187, "187" },
@ -307,7 +307,7 @@ static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
return SR_OK; return SR_OK;
} }
SR_PRIV struct sr_dev_driver driver_info = { SR_PRIV struct sr_dev_driver flukedmm_driver_info = {
.name = "fluke-dmm", .name = "fluke-dmm",
.longname = "Fluke 18x/28x series DMMs", .longname = "Fluke 18x/28x series DMMs",
.api_version = 1, .api_version = 1,

6
hwdriver.c
View File

@ -86,6 +86,9 @@ extern SR_PRIV struct sr_dev_driver genericdmm_driver_info;
#ifdef HAVE_HW_AGILENT_DMM #ifdef HAVE_HW_AGILENT_DMM
extern SR_PRIV struct sr_dev_driver agdmm_driver_info; extern SR_PRIV struct sr_dev_driver agdmm_driver_info;
#endif #endif
#ifdef HAVE_HW_FLUKE_DMM
extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
#endif
static struct sr_dev_driver *drivers_list[] = { static struct sr_dev_driver *drivers_list[] = {
#ifdef HAVE_LA_DEMO #ifdef HAVE_LA_DEMO
@ -120,6 +123,9 @@ static struct sr_dev_driver *drivers_list[] = {
#endif #endif
#ifdef HAVE_HW_AGILENT_DMM #ifdef HAVE_HW_AGILENT_DMM
&agdmm_driver_info, &agdmm_driver_info,
#endif
#ifdef HAVE_HW_FLUKE_DMM
&flukedmm_driver_info,
#endif #endif
NULL, NULL,
}; };