X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=91f12560074d3c9dfc8eb01681800802c70d4efe;hb=ca314e060f653e6a0b5ec0f58914bac4d426217f;hp=048a0afc6e3d2909853e4b49ca7c91accd92c249;hpb=4b1a9d5d8641080bf10e269aa12a3fc17460365f;p=libsigrok.git
diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 048a0afc..91f12560 100644
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -17,11 +17,6 @@
* along with this program. If not, see .
*/
-/** @file
- * Gossen Metrawatt Metrahit 1x/2x drivers
- * @internal
- */
-
#include
#include
#include "protocol.h"
@@ -37,10 +32,13 @@ static const uint32_t scanopts[] = {
SR_CONF_SERIALCOMM,
};
+static const uint32_t drvopts[] = {
+ SR_CONF_MULTIMETER,
+ SR_CONF_THERMOMETER, /**< All GMC 1x/2x multimeters seem to support this */
+};
+
/** Hardware capabilities for Metrahit 1x/2x devices in send mode. */
static const uint32_t devopts_sm[] = {
- SR_CONF_MULTIMETER,
- SR_CONF_THERMOMETER, /**< All GMC 1x/2x multimeters seem to support this */
SR_CONF_CONTINUOUS,
SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
@@ -48,8 +46,6 @@ static const uint32_t devopts_sm[] = {
/** Hardware capabilities for Metrahit 2x devices in bidirectional Mode. */
static const uint32_t devopts_bd[] = {
- SR_CONF_MULTIMETER,
- SR_CONF_THERMOMETER, /**< All GMC 1x/2x multimeters seem to support this */
SR_CONF_CONTINUOUS,
SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
@@ -118,7 +114,7 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial)
for (cnt = 0; cnt < 4; cnt++) {
byte = read_byte(serial, timeout_us);
if ((byte == -1) ||
- ((byte & MSGID_MASK) != MSGID_DATA))
+ ((byte & MSGID_MASK) != MSGID_DATA))
{
model = METRAHIT_NONE;
bytecnt = 100;
@@ -156,8 +152,6 @@ static GSList *scan_1x_2x_rs232(struct sr_dev_driver *di, GSList *options)
conn = serialcomm = NULL;
serialcomm_given = FALSE;
- sr_spew("scan_1x_2x_rs232() called!");
-
for (l = options; l; l = l->next) {
src = l->data;
switch (src->key) {
@@ -239,8 +233,6 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options)
conn = serialcomm = NULL;
devices = NULL;
- sr_spew("scan_2x_bd232() called!");
-
for (l = options; l; l = l->next) {
src = l->data;
switch (src->key) {
@@ -318,13 +310,9 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options)
return std_scan_complete(di, devices);
exit_err:
- sr_info("scan_2x_bd232(): Error!");
-
- if (serial)
- sr_serial_dev_inst_free(serial);
+ sr_serial_dev_inst_free(serial);
g_free(devc);
- if (sdi)
- sr_dev_inst_free(sdi);
+ sr_dev_inst_free(sdi);
return NULL;
}
@@ -333,19 +321,16 @@ static int dev_close(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- std_serial_dev_close(sdi);
+ devc = sdi->priv;
- sdi->status = SR_ST_INACTIVE;
- if ((devc = sdi->priv))
- devc->model = METRAHIT_NONE;
+ devc->model = METRAHIT_NONE;
- return SR_OK;
+ return std_serial_dev_close(sdi);
}
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
- int ret;
struct dev_context *devc;
(void)cg;
@@ -355,7 +340,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
devc = sdi->priv;
- ret = SR_OK;
switch (key) {
case SR_CONF_LIMIT_SAMPLES:
case SR_CONF_LIMIT_MSEC:
@@ -367,25 +351,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
return SR_ERR_NA;
}
- return ret;
-}
-
-/** Implementation of config_list, auxiliary function for common parts. */
-static int config_list_common(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
-{
- (void)sdi;
- (void)cg;
-
- switch (key) {
- case SR_CONF_SCAN_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
- break;
- default:
- return SR_ERR_NA;
- }
-
return SR_OK;
}
@@ -393,32 +358,14 @@ static int config_list_common(uint32_t key, GVariant **data, const struct sr_dev
static int config_list_sm(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
- switch (key) {
- case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts_sm, ARRAY_SIZE(devopts_sm), sizeof(uint32_t));
- break;
- default:
- return config_list_common(key, data, sdi, cg);
- }
-
- return SR_OK;
+ return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts_sm);
}
/** Implementation of config_list for Metrahit 2x bidirectional mode */
static int config_list_bd(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
- switch (key) {
- case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts_bd, ARRAY_SIZE(devopts_bd), sizeof(uint32_t));
- break;
- default:
- return config_list_common(key, data, sdi, cg);
- }
-
- return SR_OK;
+ return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts_bd);
}
static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi)
@@ -426,9 +373,6 @@ static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi)
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
devc = sdi->priv;
devc->settings_ok = FALSE;
devc->buflen = 0;
@@ -436,7 +380,6 @@ static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi)
sr_sw_limits_acquisition_start(&devc->limits);
std_session_send_df_header(sdi);
- /* Poll every 40ms, or whenever some data comes in. */
serial = sdi->conn;
serial_source_add(sdi->session, serial, G_IO_IN, 40,
gmc_mh_1x_2x_receive_data, (void *)sdi);
@@ -449,9 +392,6 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi)
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
devc = sdi->priv;
devc->settings_ok = FALSE;
devc->buflen = 0;
@@ -459,7 +399,6 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi)
sr_sw_limits_acquisition_start(&devc->limits);
std_session_send_df_header(sdi);
- /* Poll every 40ms, or whenever some data comes in. */
serial = sdi->conn;
serial_source_add(sdi->session, serial, G_IO_IN, 40,
gmc_mh_2x_receive_data, (void *)sdi);
@@ -476,7 +415,7 @@ static struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
.cleanup = std_cleanup,
.scan = scan_1x_2x_rs232,
.dev_list = std_dev_list,
- .dev_clear = NULL,
+ .dev_clear = std_dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list_sm,
@@ -496,7 +435,7 @@ static struct sr_dev_driver gmc_mh_2x_bd232_driver_info = {
.cleanup = std_cleanup,
.scan = scan_2x_bd232,
.dev_list = std_dev_list,
- .dev_clear = NULL,
+ .dev_clear = std_dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list_bd,