X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fprotocol.c;h=719a225f30b3f550563df3dfde5d6a112b557e39;hb=1a46cc62e2b528bcaeb1f8dc0c952a81b3bcba5c;hp=0c3b56f8b9840bd2e037bf073e5b03e1cb43587a;hpb=f3f19d1131025b68d29a11273b627c83d748e7ea;p=libsigrok.git diff --git a/src/hardware/gmc-mh-1x-2x/protocol.c b/src/hardware/gmc-mh-1x-2x/protocol.c index 0c3b56f8..719a225f 100644 --- a/src/hardware/gmc-mh-1x-2x/protocol.c +++ b/src/hardware/gmc-mh-1x-2x/protocol.c @@ -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) { @@ -1342,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); } @@ -1534,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);