X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fprotocol.c;h=7851f0ecb443f9c0c005e4da73b33391d794376c;hb=5faebab2903dc91949edc31f0a4b118d86090a30;hp=6f96d504601c1a65f227b7d63853997dbba40b46;hpb=93b118da4fec6976df924eb77121f07b361b8330;p=libsigrok.git diff --git a/src/hardware/gmc-mh-1x-2x/protocol.c b/src/hardware/gmc-mh-1x-2x/protocol.c index 6f96d504..7851f0ec 100644 --- a/src/hardware/gmc-mh-1x-2x/protocol.c +++ b/src/hardware/gmc-mh-1x-2x/protocol.c @@ -22,12 +22,13 @@ * @internal */ +#include #include #include #include "protocol.h" /* Internal Headers */ -static guchar calc_chksum_14(guchar* dta); +static guchar calc_chksum_14(guchar *dta); static int chk_msg14(struct sr_dev_inst *sdi); /** Set or clear flags in devc->mqflags. */ @@ -257,7 +258,7 @@ static void decode_ctmv_18(uint8_t ctmv, struct dev_context *devc) /** * Decode range/sign/acdc byte special chars, Metrahit 18. * - * @param[in] rs Rance/sign byte. + * @param[in] rs Range/sign byte. */ static void decode_rs_18(uint8_t rs, struct dev_context *devc) { @@ -651,12 +652,12 @@ static void clean_ctmv_rs_v(struct dev_context *devc) static void send_value(struct sr_dev_inst *sdi) { struct dev_context *devc; - struct sr_datafeed_analog analog; + struct sr_datafeed_analog_old analog; struct sr_datafeed_packet packet; devc = sdi->priv; - memset(&analog, 0, sizeof(struct sr_datafeed_analog)); + memset(&analog, 0, sizeof(struct sr_datafeed_analog_old)); analog.channels = sdi->channels; analog.num_samples = 1; analog.mq = devc->mq; @@ -665,7 +666,7 @@ static void send_value(struct sr_dev_inst *sdi) analog.data = &devc->value; memset(&packet, 0, sizeof(struct sr_datafeed_packet)); - packet.type = SR_DF_ANALOG; + packet.type = SR_DF_ANALOG_OLD; packet.payload = &analog; sr_session_send(devc->cb_data, &packet); @@ -856,7 +857,7 @@ static void process_msg_inf_13(struct sr_dev_inst *sdi) devc->value += pow(10.0, cnt) * dgt; } sr_spew("process_msg_inf_13() value=%f scale=%f scale1000=%d mq=%d " - "unit=%d mqflags=0x%02llx", devc->value, devc->scale, + "unit=%d mqflags=0x%02" PRIx64, devc->value, devc->scale, devc->scale1000, devc->mq, devc->unit, devc->mqflags); if (devc->value != NAN) devc->value *= devc->scale * pow(1000.0, devc->scale1000); @@ -872,7 +873,7 @@ static void process_msg_inf_13(struct sr_dev_inst *sdi) * @param buf Pointer to array of 14 data bytes. * @param[in] raw Write only data bytes, no interpretation. */ -void dump_msg14(guchar* buf, gboolean raw) +void dump_msg14(guchar *buf, gboolean raw) { if (!buf) return; @@ -896,11 +897,11 @@ void dump_msg14(guchar* buf, gboolean raw) * @param[in] dta Pointer to array of 13 data bytes. * @return Checksum. */ -static guchar calc_chksum_14(guchar* dta) +static guchar calc_chksum_14(guchar *dta) { guchar cnt, chs; - for (chs = 0, cnt = 0; cnt < 13; cnt++) + for (chs = 0, cnt = 0; cnt < (GMC_REPLY_SIZE - 1); cnt++) chs += dta[cnt]; return (64 - chs) & MASK_6BITS; @@ -937,7 +938,6 @@ static int chk_msg14(struct sr_dev_inst *sdi) } if (devc->buf[1] == 0) { /* Error msg from device! */ - retc = SR_ERR_ARG; switch (devc->buf[2]) { case 1: /* Not used */ sr_err("Device: Illegal error code!"); @@ -1002,7 +1002,7 @@ SR_PRIV int process_msg14(struct sr_dev_inst *sdi) sr_spew("Cmd %d unimplemented!", devc->buf[3]); break; case 3: /* Read firmware version and status */ - sr_spew("Cmd 3, Read firmware and status", devc->buf[3]); + sr_spew("Cmd 3, Read firmware and status"); switch (devc->cmd_idx) { case 0: devc->fw_ver_maj = devc->buf[5]; @@ -1073,7 +1073,7 @@ SR_PRIV int process_msg14(struct sr_dev_inst *sdi) devc->value += pow(10.0, cnt) * dgt; } sr_spew("process_msg14() value=%f scale=%f scale1000=%d mq=%d " - "unit=%d mqflags=0x%02llx", devc->value, devc->scale, + "unit=%d mqflags=0x%02" PRIx64, devc->value, devc->scale, devc->scale1000, devc->mq, devc->unit, devc->mqflags); if (devc->value != NAN) devc->value *= devc->scale * pow(1000.0, devc->scale1000); @@ -1236,7 +1236,7 @@ SR_PRIV int gmc_mh_2x_receive_data(int fd, int revents, void *cb_data) if (sdi->status == SR_ST_ACTIVE) { if (devc->response_pending) { gint64 elapsed_us = g_get_monotonic_time() - devc->req_sent_at; - if (elapsed_us > 1*1000*1000) /* Timeout! */ + if (elapsed_us > (1 * 1000 * 1000)) /* Timeout! */ devc->response_pending = FALSE; } if (!devc->response_pending) { @@ -1261,9 +1261,9 @@ SR_PRIV int gmc_mh_2x_receive_data(int fd, int revents, void *cb_data) * @param[in] params Further parameters (9 bytes) * @param[out] buf Buffer to create msg in (42 bytes). */ -void create_cmd_14(guchar addr, guchar func, guchar* params, guchar* buf) +void create_cmd_14(guchar addr, guchar func, guchar *params, guchar *buf) { - uint8_t dta[14]; /* Unencoded message */ + uint8_t dta[GMC_REPLY_SIZE]; /* Unencoded message */ int cnt; if (!params || !buf) @@ -1279,17 +1279,17 @@ void create_cmd_14(guchar addr, guchar func, guchar* params, guchar* buf) /* 4-12: Copy further parameters */ for (cnt = 0; cnt < 9; cnt++) - dta[cnt+4] = (params[cnt] & MASK_6BITS); + dta[cnt + 4] = (params[cnt] & MASK_6BITS); /* 13: Checksum (b complement) */ dta[13] = calc_chksum_14(dta); /* The whole message is packed into 3 bytes per byte now (lower 6 bits only) the most * peculiar way I have ever seen. Possibly to improve IR communication? */ - for (cnt = 0; cnt < 14; cnt++) { - buf[3*cnt] = (dta[cnt] & 0x01 ? 0x0f : 0) | (dta[cnt] & 0x02 ? 0xf0 : 0); - buf[3*cnt + 1] = (dta[cnt] & 0x04 ? 0x0f : 0) | (dta[cnt] & 0x08 ? 0xf0 : 0); - buf[3*cnt + 2] = (dta[cnt] & 0x10 ? 0x0f : 0) | (dta[cnt] & 0x20 ? 0xf0 : 0); + for (cnt = 0; cnt < GMC_REPLY_SIZE; cnt++) { + buf[(3 * cnt) + 0] = (dta[cnt] & 0x01 ? 0x0f : 0) | (dta[cnt] & 0x02 ? 0xf0 : 0); + buf[(3 * cnt) + 1] = (dta[cnt] & 0x04 ? 0x0f : 0) | (dta[cnt] & 0x08 ? 0xf0 : 0); + buf[(3 * cnt) + 2] = (dta[cnt] & 0x10 ? 0x0f : 0) | (dta[cnt] & 0x20 ? 0xf0 : 0); } } @@ -1311,7 +1311,8 @@ int req_meas14(const struct sr_dev_inst *sdi) devc->cmd_idx = 0; create_cmd_14(devc->addr, 8, params, msg); devc->req_sent_at = g_get_monotonic_time(); - if (serial_write_blocking(serial, msg, sizeof(msg), 0) < (int)sizeof(msg)) { + if (serial_write_blocking(serial, msg, sizeof(msg), + serial_timeout(serial, sizeof(msg))) < (int)sizeof(msg)) { return SR_ERR; } @@ -1340,21 +1341,25 @@ int req_stat14(const struct sr_dev_inst *sdi, gboolean power_on) if (power_on) { sr_info("Write some data and wait 3s to turn on powered off device..."); - if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0) + if (serial_write_blocking(serial, msg, sizeof(msg), + serial_timeout(serial, sizeof(msg))) < 0) return SR_ERR; - g_usleep(1*1000*1000); - if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0) + g_usleep(1 * 1000 * 1000); + if (serial_write_blocking(serial, msg, sizeof(msg), + serial_timeout(serial, sizeof(msg))) < 0) return SR_ERR; - g_usleep(1*1000*1000); - if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0) + g_usleep(1 * 1000 * 1000); + if (serial_write_blocking(serial, msg, sizeof(msg), + serial_timeout(serial, sizeof(msg))) < 0) return SR_ERR; - g_usleep(1*1000*1000); + g_usleep(1 * 1000 * 1000); serial_flush(serial); } /* Write message and wait for reply */ devc->req_sent_at = g_get_monotonic_time(); - if (serial_write_blocking(serial, msg, sizeof(msg), 0) < (int)sizeof(msg)) { + if (serial_write_blocking(serial, msg, sizeof(msg), + serial_timeout(serial, sizeof(msg))) < (int)sizeof(msg)) { return SR_ERR; } @@ -1531,10 +1536,11 @@ SR_PRIV int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *s params[0] = 5; params[1] = 5; create_cmd_14(devc->addr, 6, params, msg); - if (serial_write_blocking(sdi->conn, msg, sizeof(msg), 0) < 0) + if (serial_write_blocking(sdi->conn, msg, sizeof(msg), + serial_timeout(sdi->conn, sizeof(msg))) < 0) return SR_ERR; else - g_usleep(2000000); /* Wait to ensure transfer before interface switched off. */ + g_usleep(2 * 1000 * 1000); /* Wait to ensure transfer before interface switched off. */ break; case SR_CONF_LIMIT_MSEC: devc->limit_msec = g_variant_get_uint64(data);