X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fgmc-mh-1x-2x%2Fapi.c;h=0b05d2b582755d4cd7cdff2079bf04ff604aea3a;hb=873e0c1295b78022ef95f7dd537fa2557f72c681;hp=922f9fee98c4ccb82e3d4b28438f14129fa17bc9;hpb=d43b090816f61e77d8054084e85202de1a1ebeb7;p=libsigrok.git diff --git a/hardware/gmc-mh-1x-2x/api.c b/hardware/gmc-mh-1x-2x/api.c index 922f9fee..0b05d2b5 100644 --- a/hardware/gmc-mh-1x-2x/api.c +++ b/hardware/gmc-mh-1x-2x/api.c @@ -18,7 +18,6 @@ */ #include - #include "protocol.h" /* Serial communication parameters for Metrahit 1x/2x with 'RS232' adaptor */ @@ -27,6 +26,7 @@ #define VENDOR_GMC "Gossen Metrawatt" SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info; +static struct sr_dev_driver *di = &gmc_mh_1x_2x_rs232_driver_info; static const int32_t hwopts[] = { SR_CONF_CONN, @@ -40,20 +40,20 @@ static const int32_t hwcaps[] = { SR_CONF_CONTINUOUS, }; -/** Driver init function */ static int init_1x_2x_rs232(struct sr_context *sr_ctx) { - return std_init(sr_ctx, &gmc_mh_1x_2x_rs232_driver_info, LOG_PREFIX); + return std_init(sr_ctx, di, LOG_PREFIX); } - -/** Read single byte from serial port. - * \retval -1 Timeout or error. - * \retval other Byte. +/** + * Read single byte from serial port. + * + * @retval -1 Timeout or error. + * @retval other Byte. */ static int read_byte(struct sr_serial_dev_inst *serial, gint64 timeout) { - guint8 result = 0; + uint8_t result = 0; int rc = 0; for (;;) { @@ -68,11 +68,13 @@ static int read_byte(struct sr_serial_dev_inst *serial, gint64 timeout) } } -/** Try to detect GMC 1x/2x multimeter model in send mode for max. 1 second. - * \param serial Configured, open serial port. +/** + * Try to detect GMC 1x/2x multimeter model in send mode for max. 1 second. * - * \retval NULL Detection failed. - * \retval other Model code. + * @param serial Configured, open serial port. + * + * @retval NULL Detection failed. + * @retval other Model code. */ static enum model scan_model_sm(struct sr_serial_dev_inst *serial) { @@ -80,25 +82,27 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial) enum model model; gint64 timeout_us; - model = SR_METRAHIT_NONE; - timeout_us = g_get_monotonic_time() + 1*1000*1000; + model = METRAHIT_NONE; + timeout_us = g_get_monotonic_time() + 1 * 1000 * 1000; - /* Try to find message consisting of device code and several - * (at least 4) data bytes. */ + /* + * Try to find message consisting of device code and several + * (at least 4) data bytes. + */ for (bytecnt = 0; bytecnt < 100; bytecnt++) { byte = read_byte(serial, timeout_us); if ((byte == -1) || (timeout_us < g_get_monotonic_time())) break; if ((byte & MSGID_MASK) == MSGID_INF) { - if (!(model = sr_gmc_decode_model_sm(byte & MSGC_MASK))) + if (!(model = gmc_decode_model_sm(byte & MSGC_MASK))) break; - /* Now expect (at least) 4 data bytes */ + /* Now expect (at least) 4 data bytes. */ for (cnt = 0; cnt < 4; cnt++) { byte = read_byte(serial, timeout_us); if ((byte == -1) || ((byte & MSGID_MASK) != MSGID_DATA)) { - model = SR_METRAHIT_NONE; + model = METRAHIT_NONE; bytecnt = 100; break; } @@ -110,11 +114,14 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial) return model; } -/** Scan for Metrahit 1x and Metrahit 2x in send mode using Gossen Metrawatt - * 'RS232' interface. The older 1x models use 8192 and the newer 2x 9600 baud. - * The DMM usually sends up to about 20 messages per second. However, depending - * on configuration and measurement mode the intervals can be much larger and - * then the detection might not work. +/** + * Scan for Metrahit 1x and Metrahit 2x in send mode using Gossen Metrawatt + * 'RS232' interface. + * + * The older 1x models use 8192 baud and the newer 2x 9600 baud. + * The DMM usually sends up to about 20 messages per second. However, depending + * on configuration and measurement mode the intervals can be much larger and + * then the detection might not work. */ static GSList *scan_1x_2x_rs232(GSList *options) { @@ -128,13 +135,12 @@ static GSList *scan_1x_2x_rs232(GSList *options) const char *conn, *serialcomm; enum model model; gboolean serialcomm_given; - int cnt; devices = NULL; - drvc = (&gmc_mh_1x_2x_rs232_driver_info)->priv; + drvc = di->priv; drvc->instances = NULL; conn = serialcomm = NULL; - model = SR_METRAHIT_NONE; + model = METRAHIT_NONE; serialcomm_given = FALSE; sr_spew("scan_1x_2x_rs232() called!"); @@ -168,9 +174,11 @@ static GSList *scan_1x_2x_rs232(GSList *options) model = scan_model_sm(serial); - /* If detection failed and no user-supplied parameters, - * try second baud rate. */ - if ((model == SR_METRAHIT_NONE) && !serialcomm_given) { + /* + * If detection failed and no user-supplied parameters, + * try second baud rate. + */ + if ((model == METRAHIT_NONE) && !serialcomm_given) { serialcomm = SERIALCOMM_1X_RS232; g_free(serial->serialcomm); serial->serialcomm = g_strdup(serialcomm); @@ -180,10 +188,10 @@ static GSList *scan_1x_2x_rs232(GSList *options) } } - if (model != SR_METRAHIT_NONE) { - sr_spew("%s %s detected!", VENDOR_GMC, sr_gmc_model_str(model)); + if (model != METRAHIT_NONE) { + sr_spew("%s %s detected!", VENDOR_GMC, gmc_model_str(model)); if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR_GMC, - sr_gmc_model_str(model), ""))) + gmc_model_str(model), ""))) return NULL; if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { sr_err("Device context malloc failed."); @@ -198,7 +206,7 @@ static GSList *scan_1x_2x_rs232(GSList *options) sdi->conn = serial; sdi->priv = devc; - sdi->driver = &gmc_mh_1x_2x_rs232_driver_info; + sdi->driver = di; if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1"))) return NULL; sdi->probes = g_slist_append(sdi->probes, probe); @@ -209,27 +217,14 @@ static GSList *scan_1x_2x_rs232(GSList *options) return devices; } -/** Driver device list function */ static GSList *dev_list_1x_2x_rs232(void) { - return ((struct drv_context *)(gmc_mh_1x_2x_rs232_driver_info.priv)) - ->instances; + return ((struct drv_context *)(di->priv))->instances; } static int dev_clear_1x_2x_rs232(void) { - return std_dev_clear(&gmc_mh_1x_2x_rs232_driver_info, NULL); -} - -static int dev_open(struct sr_dev_inst *sdi) -{ - struct sr_serial_dev_inst *serial = sdi->conn; - if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) - return SR_ERR; - - sdi->status = SR_ST_ACTIVE; - - return SR_OK; + return std_dev_clear(di, NULL); } static int dev_close(struct sr_dev_inst *sdi) @@ -244,7 +239,7 @@ static int dev_close(struct sr_dev_inst *sdi) if ((devc = sdi->priv) && devc->elapsed_msec) { g_timer_destroy(devc->elapsed_msec); devc->elapsed_msec = NULL; - devc->model = SR_METRAHIT_NONE; + devc->model = METRAHIT_NONE; } return SR_OK; @@ -316,6 +311,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_probe_group *probe_group) { (void)sdi; + (void)probe_group; switch (key) { case SR_CONF_SCAN_OPTIONS: @@ -334,7 +330,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, } static int dev_acq_start_1x_2x_rs232(const struct sr_dev_inst *sdi, - void *cb_data) + void *cb_data) { struct dev_context *devc; struct sr_serial_dev_inst *serial; @@ -389,7 +385,7 @@ SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = { .config_get = config_get, .config_set = config_set, .config_list = config_list, - .dev_open = dev_open, + .dev_open = std_serial_dev_open, .dev_close = dev_close, .dev_acquisition_start = dev_acq_start_1x_2x_rs232, .dev_acquisition_stop = dev_acq_stop,