X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=83582ad2310abeb7c3bf9210a6cca41fc7ebf231;hb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;hp=48b91ac9b6cd9700f84ed7fc7d826321c0228d0f;hpb=bfd48770fc18dae79d140120e6af3b7ac4bdb2ee;p=libsigrok.git diff --git a/hwdriver.c b/hwdriver.c index 48b91ac9..83582ad2 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -27,14 +27,7 @@ #include "libsigrok.h" #include "libsigrok-internal.h" -/* Message logging helpers with subsystem-specific prefix string. */ -#define LOG_PREFIX "hwdriver: " -#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) -#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args) -#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args) -#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args) -#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args) -#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args) +#define LOG_PREFIX "hwdriver" /** * @file @@ -107,6 +100,9 @@ static struct sr_config_info sr_config_info_data[] = { }; /** @cond PRIVATE */ +#ifdef HAVE_HW_APPA_55II +extern SR_PRIV struct sr_dev_driver appa_55ii_driver_info; +#endif #ifdef HAVE_HW_BRYMEN_DMM extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info; #endif @@ -123,6 +119,12 @@ extern SR_PRIV struct sr_dev_driver colead_slm_driver_info; #ifdef HAVE_HW_DEMO extern SR_PRIV struct sr_dev_driver demo_driver_info; #endif +#ifdef HAVE_HW_GMC_MH_1X_2X +extern SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info; +#endif +#ifdef HAVE_HW_HAMEG_HMO +extern SR_PRIV struct sr_dev_driver hameg_hmo_driver_info; +#endif #ifdef HAVE_HW_IKALOGIC_SCANALOGIC2 extern SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info; #endif @@ -145,8 +147,8 @@ extern SR_PRIV struct sr_dev_driver norma_dmm_driver_info; #ifdef HAVE_HW_OLS extern SR_PRIV struct sr_dev_driver ols_driver_info; #endif -#ifdef HAVE_HW_RIGOL_DS1XX2 -extern SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info; +#ifdef HAVE_HW_RIGOL_DS +extern SR_PRIV struct sr_dev_driver rigol_ds_driver_info; #endif #ifdef HAVE_HW_SALEAE_LOGIC16 extern SR_PRIV struct sr_dev_driver saleae_logic16_driver_info; @@ -191,6 +193,7 @@ extern SR_PRIV struct sr_dev_driver agdmm_driver_info; extern SR_PRIV struct sr_dev_driver flukedmm_driver_info; #endif #ifdef HAVE_HW_SERIAL_DMM +extern SR_PRIV struct sr_dev_driver bbcgm_m2110_driver_info; 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; @@ -198,6 +201,7 @@ 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 metex_m4650cr_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; @@ -205,6 +209,7 @@ extern SR_PRIV struct sr_dev_driver radioshack_22_805_driver_info; extern SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info; extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_m3650d_driver_info; +extern SR_PRIV struct sr_dev_driver voltcraft_m4650cr_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc830_ser_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info; @@ -223,10 +228,14 @@ extern SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info; +extern SR_PRIV struct sr_dev_driver tenma_72_7745_driver_info; #endif /** @endcond */ static struct sr_dev_driver *drivers_list[] = { +#ifdef HAVE_HW_APPA_55II + &appa_55ii_driver_info, +#endif #ifdef HAVE_HW_BRYMEN_DMM &brymen_bm857_driver_info, #endif @@ -243,6 +252,12 @@ static struct sr_dev_driver *drivers_list[] = { #ifdef HAVE_HW_DEMO &demo_driver_info, #endif +#ifdef HAVE_HW_GMC_MH_1X_2X + &gmc_mh_1x_2x_rs232_driver_info, +#endif +#ifdef HAVE_HW_HAMEG_HMO + &hameg_hmo_driver_info, +#endif #ifdef HAVE_HW_IKALOGIC_SCANALOGIC2 &ikalogic_scanalogic2_driver_info, #endif @@ -265,8 +280,8 @@ static struct sr_dev_driver *drivers_list[] = { #ifdef HAVE_HW_OLS &ols_driver_info, #endif -#ifdef HAVE_HW_RIGOL_DS1XX2 - &rigol_ds1xx2_driver_info, +#ifdef HAVE_HW_RIGOL_DS + &rigol_ds_driver_info, #endif #ifdef HAVE_HW_SALEAE_LOGIC16 &saleae_logic16_driver_info, @@ -311,6 +326,7 @@ static struct sr_dev_driver *drivers_list[] = { &flukedmm_driver_info, #endif #ifdef HAVE_HW_SERIAL_DMM + &bbcgm_m2110_driver_info, &digitek_dt4000zc_driver_info, &tekpower_tp4000zc_driver_info, &metex_me31_driver_info, @@ -318,6 +334,7 @@ static struct sr_dev_driver *drivers_list[] = { &mastech_mas345_driver_info, &va_va18b_driver_info, &metex_m3640d_driver_info, + &metex_m4650cr_driver_info, &peaktech_4370_driver_info, &pce_pce_dm32_driver_info, &radioshack_22_168_driver_info, @@ -325,6 +342,7 @@ static struct sr_dev_driver *drivers_list[] = { &radioshack_22_812_driver_info, &tecpel_dmm_8061_ser_driver_info, &voltcraft_m3650d_driver_info, + &voltcraft_m4650cr_driver_info, &voltcraft_vc820_ser_driver_info, &voltcraft_vc830_ser_driver_info, &voltcraft_vc840_ser_driver_info, @@ -343,6 +361,7 @@ static struct sr_dev_driver *drivers_list[] = { &voltcraft_vc820_driver_info, &voltcraft_vc830_driver_info, &voltcraft_vc840_driver_info, + &tenma_72_7745_driver_info, #endif NULL, }; @@ -485,23 +504,27 @@ SR_PRIV void sr_config_free(struct sr_config *src) * Returns information about the given driver or device instance. * * @param driver The sr_dev_driver struct to query. + * @param sdi (optional) If the key is specific to a device, this must + * contain a pointer to the struct sr_dev_inst to be checked. + * Otherwise it must be NULL. + * @param probe_group The probe group on the device for which to list the + * values, or NULL. * @param key The configuration key (SR_CONF_*). * @param data Pointer to a GVariant where the value will be stored. Must * not be NULL. The caller is given ownership of the GVariant * and must thus decrease the refcount after use. However if * this function returns an error code, the field should be * considered unused, and should not be unreferenced. - * @param sdi (optional) If the key is specific to a device, this must - * contain a pointer to the struct sr_dev_inst to be checked. - * Otherwise it must be NULL. * * @return SR_OK upon success or SR_ERR in case of error. Note SR_ERR_ARG * may be returned by the driver indicating it doesn't know that key, * but this is not to be flagged as an error by the caller; merely * as an indication that it's not applicable. */ -SR_API int sr_config_get(const struct sr_dev_driver *driver, int key, - GVariant **data, const struct sr_dev_inst *sdi) +SR_API int sr_config_get(const struct sr_dev_driver *driver, + const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group, + int key, GVariant **data) { int ret; @@ -511,7 +534,7 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key, if (!driver->config_get) return SR_ERR_ARG; - if ((ret = driver->config_get(key, data, sdi)) == SR_OK) { + if ((ret = driver->config_get(key, data, sdi, probe_group)) == SR_OK) { /* Got a floating reference from the driver. Sink it here, * caller will need to unref when done with it. */ g_variant_ref_sink(*data); @@ -524,6 +547,8 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key, * Set a configuration key in a device instance. * * @param sdi The device instance. + * @param probe_group The probe group on the device for which to list the + * values, or NULL. * @param key The configuration key (SR_CONF_*). * @param data The new value for the key, as a GVariant with GVariantType * appropriate to that key. A floating reference can be passed @@ -534,7 +559,9 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key, * but this is not to be flagged as an error by the caller; merely * as an indication that it's not applicable. */ -SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, GVariant *data) +SR_API int sr_config_set(const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group, + int key, GVariant *data) { int ret; @@ -545,7 +572,7 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, GVariant *data) else if (!sdi->driver->config_set) ret = SR_ERR_ARG; else - ret = sdi->driver->config_set(key, data, sdi); + ret = sdi->driver->config_set(key, data, sdi, probe_group); g_variant_unref(data); @@ -556,22 +583,26 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, GVariant *data) * List all possible values for a configuration key. * * @param driver The sr_dev_driver struct to query. + * @param sdi (optional) If the key is specific to a device, this must + * contain a pointer to the struct sr_dev_inst to be checked. + * @param probe_group The probe group on the device for which to list the + * values, or NULL. * @param key The configuration key (SR_CONF_*). * @param data A pointer to a GVariant where the list will be stored. The * caller is given ownership of the GVariant and must thus * unref the GVariant after use. However if this function * returns an error code, the field should be considered * unused, and should not be unreferenced. - * @param sdi (optional) If the key is specific to a device, this must - * contain a pointer to the struct sr_dev_inst to be checked. * * @return SR_OK upon success or SR_ERR in case of error. Note SR_ERR_ARG * may be returned by the driver indicating it doesn't know that key, * but this is not to be flagged as an error by the caller; merely * as an indication that it's not applicable. */ -SR_API int sr_config_list(const struct sr_dev_driver *driver, int key, - GVariant **data, const struct sr_dev_inst *sdi) +SR_API int sr_config_list(const struct sr_dev_driver *driver, + const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group, + int key, GVariant **data) { int ret; @@ -579,7 +610,7 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key, ret = SR_ERR; else if (!driver->config_list) ret = SR_ERR_ARG; - else if ((ret = driver->config_list(key, data, sdi)) == SR_OK) + else if ((ret = driver->config_list(key, data, sdi, probe_group)) == SR_OK) g_variant_ref_sink(*data); return ret;