X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=455f02aa6c4d31225a4926fc37d1d365a328bc5d;hb=6375e1c3eba6243bcaa28f0eee5452cc6f9ae2fd;hp=207052cffc9a23486544dc73ac7984ff60f3b429;hpb=7b870c38e3040fec1165a623ae3986e4fb342218;p=libsigrok.git diff --git a/hwdriver.c b/hwdriver.c index 207052cf..455f02aa 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -23,9 +23,16 @@ #include #include #include +#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */ #include "libsigrok.h" #include "libsigrok-internal.h" +/** + * @file + * + * Hardware driver handling in libsigrok. + */ + /** * @defgroup grp_driver Hardware drivers * @@ -61,12 +68,27 @@ static struct sr_hwcap_option sr_devopts[] = { }; /** @cond PRIVATE */ +#ifdef HAVE_HW_COLEAD_SLM +extern SR_PRIV struct sr_dev_driver colead_slm_driver_info; +#endif #ifdef HAVE_LA_DEMO extern SR_PRIV struct sr_dev_driver demo_driver_info; #endif +#ifdef HAVE_HW_LASCAR_EL_USB +extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info; +#endif +#ifdef HAVE_HW_NEXUS_OSCIPRIME +extern SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info; +#endif #ifdef HAVE_LA_OLS extern SR_PRIV struct sr_dev_driver ols_driver_info; #endif +#ifdef HAVE_HW_TONDAJ_SL_814 +extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info; +#endif +#ifdef HAVE_HW_VICTOR_DMM +extern SR_PRIV struct sr_dev_driver victor_dmm_driver_info; +#endif #ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info; #endif @@ -79,7 +101,7 @@ extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info; #ifdef HAVE_LA_LINK_MSO19 extern SR_PRIV struct sr_dev_driver link_mso19_driver_info; #endif -#ifdef HAVE_LA_ALSA +#ifdef HAVE_HW_ALSA extern SR_PRIV struct sr_dev_driver alsa_driver_info; #endif #ifdef HAVE_LA_FX2LAFW @@ -88,27 +110,55 @@ extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info; #ifdef HAVE_HW_HANTEK_DSO extern SR_PRIV struct sr_dev_driver hantek_dso_driver_info; #endif -#ifdef HAVE_HW_GENERICDMM -extern SR_PRIV struct sr_dev_driver genericdmm_driver_info; -#endif #ifdef HAVE_HW_AGILENT_DMM extern SR_PRIV struct sr_dev_driver agdmm_driver_info; #endif #ifdef HAVE_HW_FLUKE_DMM extern SR_PRIV struct sr_dev_driver flukedmm_driver_info; #endif -#ifdef HAVE_HW_RADIOSHACK_DMM -extern SR_PRIV struct sr_dev_driver radioshackdmm_driver_info; +#ifdef HAVE_HW_SERIAL_DMM +extern SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info; +extern SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info; +extern SR_PRIV struct sr_dev_driver metex_me31_driver_info; +extern SR_PRIV struct sr_dev_driver peaktech_3410_driver_info; +extern SR_PRIV struct sr_dev_driver mastech_mas345_driver_info; +extern SR_PRIV struct sr_dev_driver va_va18b_driver_info; +extern SR_PRIV struct sr_dev_driver metex_m3640d_driver_info; +extern SR_PRIV struct sr_dev_driver peaktech_4370_driver_info; +extern SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info; +extern SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info; +extern SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info; +extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info; +extern SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info; +#endif +#ifdef HAVE_HW_UNI_T_DMM +extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info; +extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info; #endif /** @endcond */ static struct sr_dev_driver *drivers_list[] = { +#ifdef HAVE_HW_COLEAD_SLM + &colead_slm_driver_info, +#endif #ifdef HAVE_LA_DEMO &demo_driver_info, #endif +#ifdef HAVE_HW_LASCAR_EL_USB + &lascar_el_usb_driver_info, +#endif +#ifdef HAVE_HW_NEXUS_OSCIPRIME + &nexus_osciprime_driver_info, +#endif #ifdef HAVE_LA_OLS &ols_driver_info, #endif +#ifdef HAVE_HW_TONDAJ_SL_814 + &tondaj_sl_814_driver_info, +#endif +#ifdef HAVE_HW_VICTOR_DMM + &victor_dmm_driver_info, +#endif #ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE &zeroplus_logic_cube_driver_info, #endif @@ -121,7 +171,7 @@ static struct sr_dev_driver *drivers_list[] = { #ifdef HAVE_LA_LINK_MSO19 &link_mso19_driver_info, #endif -#ifdef HAVE_LA_ALSA +#ifdef HAVE_HW_ALSA &alsa_driver_info, #endif #ifdef HAVE_LA_FX2LAFW @@ -130,17 +180,30 @@ static struct sr_dev_driver *drivers_list[] = { #ifdef HAVE_HW_HANTEK_DSO &hantek_dso_driver_info, #endif -#ifdef HAVE_HW_GENERICDMM - &genericdmm_driver_info, -#endif #ifdef HAVE_HW_AGILENT_DMM &agdmm_driver_info, #endif #ifdef HAVE_HW_FLUKE_DMM &flukedmm_driver_info, #endif -#ifdef HAVE_HW_RADIOSHACK_DMM - &radioshackdmm_driver_info, +#ifdef HAVE_HW_SERIAL_DMM + &digitek_dt4000zc_driver_info, + &tekpower_tp4000zc_driver_info, + &metex_me31_driver_info, + &peaktech_3410_driver_info, + &mastech_mas345_driver_info, + &va_va18b_driver_info, + &metex_m3640d_driver_info, + &peaktech_4370_driver_info, + &pce_pce_dm32_driver_info, + &radioshack_22_168_driver_info, + &radioshack_22_812_driver_info, + &voltcraft_vc820_ser_driver_info, + &voltcraft_vc840_ser_driver_info, +#endif +#ifdef HAVE_HW_UNI_T_DMM + &uni_t_ut61d_driver_info, + &voltcraft_vc820_driver_info, #endif NULL, }; @@ -159,15 +222,17 @@ SR_API struct sr_dev_driver **sr_driver_list(void) /** * Initialize a hardware driver. * + * @param ctx A libsigrok context object allocated by a previous call to + * sr_init(). * @param driver The driver to initialize. * * @return SR_OK if all went well, or an error code otherwise. */ -SR_API int sr_driver_init(struct sr_dev_driver *driver) +SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver) { if (driver->init) - return driver->init(); + return driver->init(ctx); return SR_OK; }