From: Uwe Hermann Date: Mon, 16 Feb 2015 00:49:47 +0000 (+0100) Subject: baylibre-acme: Minor coding-style, cosmetics. X-Git-Tag: libsigrok-0.4.0~629 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=391e23a97fe5b919f7f0716702bd1b151c601f66;p=libsigrok.git baylibre-acme: Minor coding-style, cosmetics. --- diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c index 1fda2b24..999f89fb 100644 --- a/src/hardware/baylibre-acme/api.c +++ b/src/hardware/baylibre-acme/api.c @@ -31,7 +31,7 @@ static const uint32_t devopts[] = { SR_CONF_POWER_OFF | SR_CONF_GET | SR_CONF_SET, }; -#define MAX_SAMPLE_RATE 500 /* In Hz */ +#define MAX_SAMPLE_RATE 500 /* In Hz */ static const uint64_t samplerates[] = { SR_HZ(1), @@ -63,7 +63,7 @@ static GSList *scan(GSList *options) sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi->status = SR_ST_INACTIVE; - sdi->model = g_strdup("Acme cape"); + sdi->model = g_strdup("ACME cape"); sdi->driver = di; sdi->priv = devc; @@ -82,36 +82,29 @@ static GSList *scan(GSList *options) * detect a temperature probe. */ status = bl_acme_detect_probe(bl_acme_get_enrg_addr(i), - PROBE_NUM(i), - ENRG_PROBE_NAME); + PROBE_NUM(i), ENRG_PROBE_NAME); if (status) { /* Energy probe detected. */ - status = bl_acme_register_probe(sdi, - PROBE_ENRG, - bl_acme_get_enrg_addr(i), - PROBE_NUM(i)); + status = bl_acme_register_probe(sdi, PROBE_ENRG, + bl_acme_get_enrg_addr(i), PROBE_NUM(i)); if (!status) { sr_err("Error registering power probe %d", PROBE_NUM(i)); continue; } - } else if (i >= TEMP_PRB_START_INDEX) { status = bl_acme_detect_probe(bl_acme_get_temp_addr(i), - PROBE_NUM(i), - TEMP_PROBE_NAME); + PROBE_NUM(i), TEMP_PROBE_NAME); if (status) { /* Temperature probe detected. */ status = bl_acme_register_probe(sdi,PROBE_TEMP, - bl_acme_get_temp_addr(i), - PROBE_NUM(i)); + bl_acme_get_temp_addr(i), PROBE_NUM(i)); if (!status) { sr_err("Error registering temp " "probe %d", PROBE_NUM(i)); continue; } } - } } @@ -225,8 +218,7 @@ static int config_set(uint32_t key, GVariant *data, case SR_CONF_LIMIT_SAMPLES: devc->limit_samples = g_variant_get_uint64(data); devc->limit_msec = 0; - sr_dbg("Setting sample limit to %" PRIu64, - devc->limit_samples); + sr_dbg("Setting sample limit to %" PRIu64, devc->limit_samples); break; case SR_CONF_LIMIT_MSEC: devc->limit_msec = g_variant_get_uint64(data) * 1000; @@ -275,16 +267,12 @@ static int config_list(uint32_t key, GVariant **data, switch (key) { case SR_CONF_DEVICE_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, - ARRAY_SIZE(devopts), - sizeof(uint32_t)); + devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); break; case SR_CONF_SAMPLERATE: g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), - samplerates, - ARRAY_SIZE(samplerates), - sizeof(uint64_t)); + samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t)); g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar); *data = g_variant_builder_end(&gvb); break; @@ -318,8 +306,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) g_io_channel_set_buffered(devc->channel, FALSE); sr_session_source_add_channel(sdi->session, devc->channel, - G_IO_IN | G_IO_ERR, 1, - bl_acme_receive_data, (void *)sdi); + G_IO_IN | G_IO_ERR, 1, bl_acme_receive_data, (void *)sdi); /* Send header packet to the session bus. */ std_session_send_df_header(sdi, LOG_PREFIX); diff --git a/src/hardware/baylibre-acme/gpio.c b/src/hardware/baylibre-acme/gpio.c index f7348cdf..7af4ebf5 100644 --- a/src/hardware/baylibre-acme/gpio.c +++ b/src/hardware/baylibre-acme/gpio.c @@ -36,14 +36,14 @@ static int open_and_write(const gchar *path, const gchar *buf) fd = g_fopen(path, "w"); if (!fd) { - sr_err("error opening %s: %s", path, strerror(errno)); + sr_err("Error opening %s: %s", path, strerror(errno)); return -1; } wr = g_fprintf(fd, "%s", buf); fclose(fd); if (wr < 0) { - sr_err("error writing to %s: %s", path, strerror(errno)); + sr_err("Error writing to %s: %s", path, strerror(errno)); return -1; } @@ -117,7 +117,7 @@ SR_PRIV int sr_gpio_get_value(int gpio) g_string_printf(path, "/sys/class/gpio/gpio%d/value", gpio); fd = g_fopen(path->str, "r"); if (!fd) { - sr_err("error opening %s: %s", path->str, strerror(errno)); + sr_err("Error opening %s: %s", path->str, strerror(errno)); g_string_free(path, TRUE); return -1; } @@ -125,7 +125,7 @@ SR_PRIV int sr_gpio_get_value(int gpio) status = fscanf(fd, "%d", &ret); fclose(fd); if (status != 1) { - sr_err("error reading from %s: %s", path, strerror(errno)); + sr_err("Error reading from %s: %s", path, strerror(errno)); g_string_free(path, TRUE); return -1; } diff --git a/src/hardware/baylibre-acme/gpio.h b/src/hardware/baylibre-acme/gpio.h index 8a6fde18..8e91fde6 100644 --- a/src/hardware/baylibre-acme/gpio.h +++ b/src/hardware/baylibre-acme/gpio.h @@ -22,8 +22,8 @@ * of this directory if any other driver would happen to want to use them. */ -#ifndef LIBSIGROK_GPIO_H -#define LIBSIGROK_GPIO_H +#ifndef LIBSIGROK_HARDWARE_BAYLIBRE_ACME_GPIO_H +#define LIBSIGROK_HARDWARE_BAYLIBRE_ACME_GPIO_H enum { GPIO_DIR_IN, @@ -34,8 +34,8 @@ SR_PRIV int sr_gpio_export(unsigned gpio); SR_PRIV int sr_gpio_set_direction(unsigned gpio, unsigned direction); SR_PRIV int sr_gpio_set_value(unsigned gpio, unsigned value); SR_PRIV int sr_gpio_get_value(int gpio); -/* These functions export given gpio if it's not already exported. */ +/* These functions export given GPIO if it's not already exported. */ SR_PRIV int sr_gpio_setval_export(int gpio, int value); SR_PRIV int sr_gpio_getval_export(int gpio); -#endif /* LIBSIGROK_GPIO_H */ +#endif diff --git a/src/hardware/baylibre-acme/protocol.c b/src/hardware/baylibre-acme/protocol.c index 419a9eba..66a22ad4 100644 --- a/src/hardware/baylibre-acme/protocol.c +++ b/src/hardware/baylibre-acme/protocol.c @@ -18,9 +18,9 @@ */ #include -#include /* strtol() */ +#include #include -#include /* open(), etc... */ +#include #include #include "protocol.h" #include "gpio.h" @@ -45,7 +45,7 @@ static const uint8_t temp_i2c_addrs[] = { }; static const uint32_t pws_gpios[] = { - 486, 498, 502, 482, 478, 506, 510, 474 + 486, 498, 502, 482, 478, 506, 510, 474, }; static const uint32_t pws_info_gpios[] = { @@ -114,10 +114,9 @@ SR_PRIV gboolean bl_acme_detect_probe(unsigned int addr, prb_num, err->message); g_string_free(path, TRUE); return ret; - } - if (strncmp(buf, prb_name, strlen(prb_name)) == 0) { + if (!strncmp(buf, prb_name, strlen(prb_name))) { /* * Correct driver registered on this address - but is * there an actual probe connected? @@ -145,7 +144,7 @@ static int get_hwmon_index(unsigned int addr) probe_hwmon_path(addr, path); dir = g_dir_open(path->str, 0, &err); - if (dir == NULL) { + if (!dir) { sr_err("Error opening %s: %s", path->str, err->message); g_string_free(path, TRUE); return -1; @@ -167,8 +166,7 @@ static int get_hwmon_index(unsigned int addr) return hwmon; } -static void append_channel(struct sr_dev_inst *sdi, - struct sr_channel_group *cg, +static void append_channel(struct sr_dev_inst *sdi, struct sr_channel_group *cg, int index, int type) { struct channel_priv *cp; @@ -195,7 +193,7 @@ static void append_channel(struct sr_dev_inst *sdi, name = g_strdup_printf("P%d_TEMP_OUT", index); break; default: - sr_err("Bug in the code: invalid channel type!"); + sr_err("Invalid channel type: %d.", type); return; } @@ -240,7 +238,7 @@ SR_PRIV gboolean bl_acme_register_probe(struct sr_dev_inst *sdi, int type, append_channel(sdi, cg, prb_num, TEMP_IN); append_channel(sdi, cg, prb_num, TEMP_OUT); } else { - sr_err("Bug in the code: invalid probe type!"); + sr_err("Invalid probe type: %d.", type); } sdi->channel_groups = g_slist_append(sdi->channel_groups, cg); @@ -272,12 +270,11 @@ static int get_shunt_path(const struct sr_channel_group *cg, GString *path) /* * The shunt_resistor sysfs attribute is available * in the Linux kernel since version 3.20. We have - * to notify the user if this attribute is not - * present. + * to notify the user if this attribute is not present. */ status = g_file_test(path->str, G_FILE_TEST_EXISTS); if (!status) { - sr_err("shunt_resistance attribute not present please update " + sr_err("shunt_resistance attribute not present, please update " "your kernel to version >=3.20"); return SR_ERR_NA; } @@ -313,8 +310,7 @@ out: return ret; } -SR_PRIV int bl_acme_set_shunt(const struct sr_channel_group *cg, - uint64_t shunt) +SR_PRIV int bl_acme_set_shunt(const struct sr_channel_group *cg, uint64_t shunt) { GString *path = g_string_sized_new(64);; int status, ret = SR_OK; @@ -402,7 +398,7 @@ static int channel_to_mq(struct sr_channel *ch) return SR_MQ_CURRENT; case ENRG_VOL: return SR_MQ_VOLTAGE; - case TEMP_IN: + case TEMP_IN: /* Fallthrough */ case TEMP_OUT: return SR_MQ_TEMPERATURE; default: @@ -423,7 +419,7 @@ static int channel_to_unit(struct sr_channel *ch) return SR_UNIT_AMPERE; case ENRG_VOL: return SR_UNIT_VOLT; - case TEMP_IN: + case TEMP_IN: /* Fallthrough */ case TEMP_OUT: return SR_UNIT_CELSIUS; default: @@ -437,9 +433,9 @@ static float adjust_data(int val, int type) switch (type) { case ENRG_PWR: return ((float)val) / 1000000.0; - case ENRG_CURR: - case ENRG_VOL: - case TEMP_IN: + case ENRG_CURR: /* Fallthrough */ + case ENRG_VOL: /* Fallthrough */ + case TEMP_IN: /* Fallthrough */ case TEMP_OUT: return ((float)val) / 1000.0; default: @@ -463,12 +459,11 @@ static float read_sample(struct sr_channel *ch) case TEMP_IN: file = "temp1_input"; break; case TEMP_OUT: file = "temp2_input"; break; default: - sr_err("Bug in the code: invalid channel type!"); + sr_err("Invalid channel type: %d.", chp->ch_type); return -1.0; } - snprintf(path, sizeof(path), - "/sys/class/hwmon/hwmon%d/%s", + snprintf(path, sizeof(path), "/sys/class/hwmon/hwmon%d/%s", chp->probe->hwmon_num, file); fd = open(path, O_RDONLY); if (fd < 0) { @@ -480,7 +475,7 @@ static float read_sample(struct sr_channel *ch) len = read(fd, buf, sizeof(buf)); close(fd); if (len < 0) { - sr_err("error reading from %s: %s", path, strerror(errno)); + sr_err("Error reading from %s: %s", path, strerror(errno)); ch->enabled = FALSE; return -1.0; } @@ -517,8 +512,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data) analog.data = &valf; /* - * Reading from sysfs takes some time - try to - * keep up with samplerate. + * Reading from sysfs takes some time - try to keep up with samplerate. */ if (devc->samples_read) { cur_time = g_get_monotonic_time(); diff --git a/src/hardware/baylibre-acme/protocol.h b/src/hardware/baylibre-acme/protocol.h index 6e65772b..3972aa2c 100644 --- a/src/hardware/baylibre-acme/protocol.h +++ b/src/hardware/baylibre-acme/protocol.h @@ -22,7 +22,7 @@ #include #include -#include /* pipe() */ +#include #include "libsigrok.h" #include "libsigrok-internal.h" @@ -42,7 +42,7 @@ #define TEMP_PROBE_NAME "tmp435" /* For the user we number the probes starting from 1. */ -#define PROBE_NUM(n) ((n)+1) +#define PROBE_NUM(n) ((n) + 1) enum probe_type { PROBE_ENRG = 1,