X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=d362f13b76c88083c704d855afc2110a394aa01b;hb=refs%2Fheads%2Fdslogic;hp=d8748e93b27bedda303c1ca9847750bd7141438b;hpb=4b97c74e0b5c19ad0ee04620b618461248ab69d7;p=libsigrok.git diff --git a/hwdriver.c b/hwdriver.c index d8748e93..d362f13b 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -1,7 +1,7 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * - * Copyright (C) 2010-2012 Bert Vermeulen + * Copyright (C) 2013 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,14 +27,14 @@ #include "libsigrok.h" #include "libsigrok-internal.h" -/* Message logging helpers with driver-specific prefix string. */ -#define DRIVER_LOG_DOMAIN "hwdriver: " -#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args) -#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args) -#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args) -#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args) -#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args) -#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args) +/* 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) /** * @file @@ -57,10 +57,16 @@ static struct sr_config_info sr_config_info_data[] = { "Serial communication", NULL}, {SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate", "Sample rate", NULL}, - {SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio", + {SR_CONF_CLOCK_TYPE, SR_T_BOOL, "clocktype", + "Using External Clock", NULL}, + {SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio", "Pre-trigger capture ratio", NULL}, - {SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern", - "Pattern generator mode", NULL}, + {SR_CONF_DEVICE_MODE, SR_T_CHAR, "device", + "Device Mode", NULL}, + {SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern", + "Pattern mode", NULL}, + {SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype", + "Trigger types", NULL}, {SR_CONF_RLE, SR_T_BOOL, "rle", "Run Length Encoding", NULL}, {SR_CONF_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope", @@ -79,154 +85,26 @@ static struct sr_config_info sr_config_info_data[] = { "Volts/div", NULL}, {SR_CONF_COUPLING, SR_T_CHAR, "coupling", "Coupling", NULL}, + {SR_CONF_DATALOG, SR_T_BOOL, "datalog", + "Datalog", NULL}, {0, 0, NULL, NULL, NULL}, }; /** @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_RIGOL_DS1XX2 -extern SR_PRIV struct sr_dev_driver rigol_ds1xx2_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 -#ifdef HAVE_LA_ASIX_SIGMA -extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info; -#endif -#ifdef HAVE_LA_CHRONOVU_LA8 -extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info; -#endif -#ifdef HAVE_LA_LINK_MSO19 -extern SR_PRIV struct sr_dev_driver link_mso19_driver_info; -#endif -#ifdef HAVE_HW_ALSA -extern SR_PRIV struct sr_dev_driver alsa_driver_info; -#endif -#ifdef HAVE_LA_FX2LAFW -extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info; -#endif -#ifdef HAVE_HW_HANTEK_DSO -extern SR_PRIV struct sr_dev_driver hantek_dso_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_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; -extern SR_PRIV struct sr_dev_driver uni_t_ut61e_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; +#ifdef HAVE_LA_DSLOGIC +extern SR_PRIV struct sr_dev_driver DSLogic_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_RIGOL_DS1XX2 - &rigol_ds1xx2_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 -#ifdef HAVE_LA_ASIX_SIGMA - &asix_sigma_driver_info, -#endif -#ifdef HAVE_LA_CHRONOVU_LA8 - &chronovu_la8_driver_info, -#endif -#ifdef HAVE_LA_LINK_MSO19 - &link_mso19_driver_info, -#endif -#ifdef HAVE_HW_ALSA - &alsa_driver_info, -#endif -#ifdef HAVE_LA_FX2LAFW - &fx2lafw_driver_info, -#endif -#ifdef HAVE_HW_HANTEK_DSO - &hantek_dso_driver_info, -#endif -#ifdef HAVE_HW_AGILENT_DMM - &agdmm_driver_info, -#endif -#ifdef HAVE_HW_FLUKE_DMM - &flukedmm_driver_info, -#endif -#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, - &uni_t_ut61e_ser_driver_info, -#endif -#ifdef HAVE_HW_UNI_T_DMM - &uni_t_ut61d_driver_info, - &voltcraft_vc820_driver_info, +#ifdef HAVE_LA_DSLOGIC + &DSLogic_driver_info, #endif NULL, }; @@ -337,26 +215,45 @@ SR_PRIV void sr_hw_cleanup_all(void) } } -SR_PRIV struct sr_config *sr_config_make(int key, const void *value) +/** A floating reference can be passed in for data. */ +SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data) { struct sr_config *src; if (!(src = g_try_malloc(sizeof(struct sr_config)))) return NULL; src->key = key; - src->value = value; + src->data = g_variant_ref_sink(data); return src; } +SR_PRIV void sr_config_free(struct sr_config *src) +{ + + if (!src || !src->data) { + sr_err("%s: invalid data!", __func__); + return; + } + + g_variant_unref(src->data); + g_free(src); + +} + /** * Returns information about the given driver or device instance. * * @param driver The sr_dev_driver struct to query. * @param key The configuration key (SR_CONF_*). - * @param data Pointer where the value will be stored. Must not be NULL. - * @param sdi If the key is specific to a device, this must contain a - * pointer to the struct sr_dev_inst to be checked. + * @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, @@ -364,7 +261,7 @@ SR_PRIV struct sr_config *sr_config_make(int key, const void *value) * as an indication that it's not applicable. */ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key, - const void **data, const struct sr_dev_inst *sdi) + GVariant **data, const struct sr_dev_inst *sdi) { int ret; @@ -374,7 +271,11 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key, if (!driver->config_get) return SR_ERR_ARG; - ret = driver->config_get(key, data, sdi); + if ((ret = driver->config_get(key, data, sdi)) == 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); + } return ret; } @@ -384,26 +285,29 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key, * * @param sdi The device instance. * @param key The configuration key (SR_CONF_*). - * @param value The new value for the key, as a pointer to whatever type - * is appropriate for that key. + * @param data The new value for the key, as a GVariant with GVariantType + * appropriate to that key. A floating reference can be passed + * in; its refcount will be sunk and unreferenced after use. * * @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_set(const struct sr_dev_inst *sdi, int key, - const void *value) +SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, GVariant *data) { int ret; - if (!sdi || !sdi->driver || !value) - return SR_ERR; + g_variant_ref_sink(data); - if (!sdi->driver->config_set) - return SR_ERR_ARG; + if (!sdi || !sdi->driver || !data) + ret = SR_ERR; + 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, value, sdi); + g_variant_unref(data); return ret; } @@ -413,10 +317,13 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, * * @param driver The sr_dev_driver struct to query. * @param key The configuration key (SR_CONF_*). - * @param data A pointer to a list of values, in whatever format is - * appropriate for that key. - * @param sdi If the key is specific to a device, this must contain a - * pointer to the struct sr_dev_inst to be checked. + * @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, @@ -424,17 +331,16 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, * as an indication that it's not applicable. */ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key, - const void **data, const struct sr_dev_inst *sdi) + GVariant **data, const struct sr_dev_inst *sdi) { int ret; if (!driver || !data) - return SR_ERR; - - if (!driver->config_list) - return SR_ERR_ARG; - - ret = driver->config_list(key, data, sdi); + ret = SR_ERR; + else if (!driver->config_list) + ret = SR_ERR_ARG; + else if ((ret = driver->config_list(key, data, sdi)) == SR_OK) + g_variant_ref_sink(*data); return ret; } @@ -442,7 +348,7 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key, /** * Get information about a configuration key. * - * @param opt The configuration key. + * @param key The configuration key. * * @return A pointer to a struct sr_config_info, or NULL if the key * was not found. @@ -491,7 +397,7 @@ SR_PRIV int sr_source_remove(int fd) SR_PRIV int sr_source_add(int fd, int events, int timeout, sr_receive_data_callback_t cb, void *cb_data) { - return sr_session_source_add(fd, events, timeout, cb, cb_data); + return sr_session_source_add(fd, events, timeout, cb, cb_data); } /** @} */