X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fprotocol.c;h=63ed2572f313288ec66ce168c9c82f9b956bfb4c;hb=c442ffda0fc6fa9bc3c5397a21ef1d04f01a64a1;hp=ffa3a2d87bde02d61b28b3dd065a252052ad6269;hpb=0c5f2abc6697504b5d760dfa56cc90bea180198f;p=libsigrok.git diff --git a/src/hardware/gmc-mh-1x-2x/protocol.c b/src/hardware/gmc-mh-1x-2x/protocol.c index ffa3a2d8..63ed2572 100644 --- a/src/hardware/gmc-mh-1x-2x/protocol.c +++ b/src/hardware/gmc-mh-1x-2x/protocol.c @@ -27,7 +27,7 @@ #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 +257,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) { @@ -568,22 +568,27 @@ static void decode_rs_2x_TR2(uint8_t rs, struct dev_context *devc) case SR_MQ_CURRENT: if (devc->scale1000 == -1) /* mA */ switch (range) { - case 0: case 1: /* 100, 300 µA */ + case 0: + case 1: /* 100, 300 µA */ devc->scale *= pow(10.0, -6); break; - case 2: case 3: /* 1, 3 mA */ + case 2: + case 3: /* 1, 3 mA */ devc->scale *= pow(10.0, -5); break; - case 4: case 5: /* 10, 30 mA */ + case 4: + case 5: /* 10, 30 mA */ devc->scale *= pow(10.0, -4); break; - case 6: case 7: /* 100, 300 mA */ + case 6: + case 7: /* 100, 300 mA */ devc->scale *= pow(10.0, -3); break; } else /* A */ switch (range) { - case 0: case 1: /* 1, 3 A */ + case 0: + case 1: /* 1, 3 A */ devc->scale *= pow(10.0, -5); break; case 2: /* 10 A */ @@ -651,7 +656,7 @@ static void send_value(struct sr_dev_inst *sdi) devc = sdi->priv; - memset(&analog, 0, sizeof(analog)); + memset(&analog, 0, sizeof(struct sr_datafeed_analog)); analog.channels = sdi->channels; analog.num_samples = 1; analog.mq = devc->mq; @@ -659,7 +664,7 @@ static void send_value(struct sr_dev_inst *sdi) analog.mqflags = devc->mqflags; analog.data = &devc->value; - memset(&packet, 0, sizeof(packet)); + memset(&packet, 0, sizeof(struct sr_datafeed_packet)); packet.type = SR_DF_ANALOG; packet.payload = &analog; sr_session_send(devc->cb_data, &packet); @@ -867,7 +872,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; @@ -891,11 +896,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; @@ -1231,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) { @@ -1256,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) @@ -1274,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); } } @@ -1337,13 +1342,13 @@ int req_stat14(const struct sr_dev_inst *sdi, gboolean 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) return SR_ERR; - g_usleep(1*1000*1000); + g_usleep(1 * 1000 * 1000); if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0) return SR_ERR; - g_usleep(1*1000*1000); + g_usleep(1 * 1000 * 1000); if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0) return SR_ERR; - g_usleep(1*1000*1000); + g_usleep(1 * 1000 * 1000); serial_flush(serial); } @@ -1529,7 +1534,7 @@ SR_PRIV int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *s if (serial_write_blocking(sdi->conn, msg, sizeof(msg), 0) < 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);