BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

baylibre-acme: Minor coding-style, cosmetics.

This commit is contained in:
Uwe Hermann 2015-02-16 01:49:47 +01:00
parent 740ad48ac8
commit 391e23a97f
5 changed files with 41 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/hardware/baylibre-acme/api.c
View File

@ -63,7 +63,7 @@ static GSList *scan(GSList *options)
sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_INACTIVE; sdi->status = SR_ST_INACTIVE;
sdi->model = g_strdup("Acme cape"); sdi->model = g_strdup("ACME cape");
sdi->driver = di; sdi->driver = di;
sdi->priv = devc; sdi->priv = devc;
@ -82,36 +82,29 @@ static GSList *scan(GSList *options)
* detect a temperature probe. * detect a temperature probe.
*/ */
status = bl_acme_detect_probe(bl_acme_get_enrg_addr(i), status = bl_acme_detect_probe(bl_acme_get_enrg_addr(i),
PROBE_NUM(i), PROBE_NUM(i), ENRG_PROBE_NAME);
ENRG_PROBE_NAME);
if (status) { if (status) {
/* Energy probe detected. */ /* Energy probe detected. */
status = bl_acme_register_probe(sdi, status = bl_acme_register_probe(sdi, PROBE_ENRG,
PROBE_ENRG, bl_acme_get_enrg_addr(i), PROBE_NUM(i));
bl_acme_get_enrg_addr(i),
PROBE_NUM(i));
if (!status) { if (!status) {
sr_err("Error registering power probe %d", sr_err("Error registering power probe %d",
PROBE_NUM(i)); PROBE_NUM(i));
continue; continue;
} }
} else if (i >= TEMP_PRB_START_INDEX) { } else if (i >= TEMP_PRB_START_INDEX) {
status = bl_acme_detect_probe(bl_acme_get_temp_addr(i), status = bl_acme_detect_probe(bl_acme_get_temp_addr(i),
PROBE_NUM(i), PROBE_NUM(i), TEMP_PROBE_NAME);
TEMP_PROBE_NAME);
if (status) { if (status) {
/* Temperature probe detected. */ /* Temperature probe detected. */
status = bl_acme_register_probe(sdi,PROBE_TEMP, status = bl_acme_register_probe(sdi,PROBE_TEMP,
bl_acme_get_temp_addr(i), bl_acme_get_temp_addr(i), PROBE_NUM(i));
PROBE_NUM(i));
if (!status) { if (!status) {
sr_err("Error registering temp " sr_err("Error registering temp "
"probe %d", PROBE_NUM(i)); "probe %d", PROBE_NUM(i));
continue; continue;
} }
} }
} }
} }
@ -225,8 +218,7 @@ static int config_set(uint32_t key, GVariant *data,
case SR_CONF_LIMIT_SAMPLES: case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = g_variant_get_uint64(data); devc->limit_samples = g_variant_get_uint64(data);
devc->limit_msec = 0; devc->limit_msec = 0;
sr_dbg("Setting sample limit to %" PRIu64, sr_dbg("Setting sample limit to %" PRIu64, devc->limit_samples);
devc->limit_samples);
break; break;
case SR_CONF_LIMIT_MSEC: case SR_CONF_LIMIT_MSEC:
devc->limit_msec = g_variant_get_uint64(data) * 1000; devc->limit_msec = g_variant_get_uint64(data) * 1000;
@ -275,16 +267,12 @@ static int config_list(uint32_t key, GVariant **data,
switch (key) { switch (key) {
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts, devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
ARRAY_SIZE(devopts),
sizeof(uint32_t));
break; break;
case SR_CONF_SAMPLERATE: case SR_CONF_SAMPLERATE:
g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
samplerates, samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t));
ARRAY_SIZE(samplerates),
sizeof(uint64_t));
g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar); g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar);
*data = g_variant_builder_end(&gvb); *data = g_variant_builder_end(&gvb);
break; 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); g_io_channel_set_buffered(devc->channel, FALSE);
sr_session_source_add_channel(sdi->session, devc->channel, sr_session_source_add_channel(sdi->session, devc->channel,
G_IO_IN | G_IO_ERR, 1, G_IO_IN | G_IO_ERR, 1, bl_acme_receive_data, (void *)sdi);
bl_acme_receive_data, (void *)sdi);
/* Send header packet to the session bus. */ /* Send header packet to the session bus. */
std_session_send_df_header(sdi, LOG_PREFIX); std_session_send_df_header(sdi, LOG_PREFIX);

8
src/hardware/baylibre-acme/gpio.c
View File

@ -36,14 +36,14 @@ static int open_and_write(const gchar *path, const gchar *buf)
fd = g_fopen(path, "w"); fd = g_fopen(path, "w");
if (!fd) { if (!fd) {
sr_err("error opening %s: %s", path, strerror(errno)); sr_err("Error opening %s: %s", path, strerror(errno));
return -1; return -1;
} }
wr = g_fprintf(fd, "%s", buf); wr = g_fprintf(fd, "%s", buf);
fclose(fd); fclose(fd);
if (wr < 0) { 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; 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); g_string_printf(path, "/sys/class/gpio/gpio%d/value", gpio);
fd = g_fopen(path->str, "r"); fd = g_fopen(path->str, "r");
if (!fd) { 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); g_string_free(path, TRUE);
return -1; return -1;
} }
@ -125,7 +125,7 @@ SR_PRIV int sr_gpio_get_value(int gpio)
status = fscanf(fd, "%d", &ret); status = fscanf(fd, "%d", &ret);
fclose(fd); fclose(fd);
if (status != 1) { 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); g_string_free(path, TRUE);
return -1; return -1;
} }

8
src/hardware/baylibre-acme/gpio.h
View File

@ -22,8 +22,8 @@
* of this directory if any other driver would happen to want to use them. * of this directory if any other driver would happen to want to use them.
*/ */
#ifndef LIBSIGROK_GPIO_H #ifndef LIBSIGROK_HARDWARE_BAYLIBRE_ACME_GPIO_H
#define LIBSIGROK_GPIO_H #define LIBSIGROK_HARDWARE_BAYLIBRE_ACME_GPIO_H
enum { enum {
GPIO_DIR_IN, 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_direction(unsigned gpio, unsigned direction);
SR_PRIV int sr_gpio_set_value(unsigned gpio, unsigned value); SR_PRIV int sr_gpio_set_value(unsigned gpio, unsigned value);
SR_PRIV int sr_gpio_get_value(int gpio); 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_setval_export(int gpio, int value);
SR_PRIV int sr_gpio_getval_export(int gpio); SR_PRIV int sr_gpio_getval_export(int gpio);
#endif /* LIBSIGROK_GPIO_H */ #endif

46
src/hardware/baylibre-acme/protocol.c
View File

@ -18,9 +18,9 @@
*/ */
#include <string.h> #include <string.h>
#include <stdlib.h> /* strtol() */ #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> /* open(), etc... */ #include <fcntl.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include "protocol.h" #include "protocol.h"
#include "gpio.h" #include "gpio.h"
@ -45,7 +45,7 @@ static const uint8_t temp_i2c_addrs[] = {
}; };
static const uint32_t pws_gpios[] = { 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[] = { 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); prb_num, err->message);
g_string_free(path, TRUE); g_string_free(path, TRUE);
return ret; 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 * Correct driver registered on this address - but is
* there an actual probe connected? * there an actual probe connected?
@ -145,7 +144,7 @@ static int get_hwmon_index(unsigned int addr)
probe_hwmon_path(addr, path); probe_hwmon_path(addr, path);
dir = g_dir_open(path->str, 0, &err); dir = g_dir_open(path->str, 0, &err);
if (dir == NULL) { if (!dir) {
sr_err("Error opening %s: %s", path->str, err->message); sr_err("Error opening %s: %s", path->str, err->message);
g_string_free(path, TRUE); g_string_free(path, TRUE);
return -1; return -1;
@ -167,8 +166,7 @@ static int get_hwmon_index(unsigned int addr)
return hwmon; return hwmon;
} }
static void append_channel(struct sr_dev_inst *sdi, static void append_channel(struct sr_dev_inst *sdi, struct sr_channel_group *cg,
struct sr_channel_group *cg,
int index, int type) int index, int type)
{ {
struct channel_priv *cp; 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); name = g_strdup_printf("P%d_TEMP_OUT", index);
break; break;
default: default:
sr_err("Bug in the code: invalid channel type!"); sr_err("Invalid channel type: %d.", type);
return; 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_IN);
append_channel(sdi, cg, prb_num, TEMP_OUT); append_channel(sdi, cg, prb_num, TEMP_OUT);
} else { } 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); 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 * The shunt_resistor sysfs attribute is available
* in the Linux kernel since version 3.20. We have * in the Linux kernel since version 3.20. We have
* to notify the user if this attribute is not * to notify the user if this attribute is not present.
* present.
*/ */
status = g_file_test(path->str, G_FILE_TEST_EXISTS); status = g_file_test(path->str, G_FILE_TEST_EXISTS);
if (!status) { 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"); "your kernel to version >=3.20");
return SR_ERR_NA; return SR_ERR_NA;
} }
@ -313,8 +310,7 @@ out:
return ret; return ret;
} }
SR_PRIV int bl_acme_set_shunt(const struct sr_channel_group *cg, SR_PRIV int bl_acme_set_shunt(const struct sr_channel_group *cg, uint64_t shunt)
uint64_t shunt)
{ {
GString *path = g_string_sized_new(64);; GString *path = g_string_sized_new(64);;
int status, ret = SR_OK; int status, ret = SR_OK;
@ -402,7 +398,7 @@ static int channel_to_mq(struct sr_channel *ch)
return SR_MQ_CURRENT; return SR_MQ_CURRENT;
case ENRG_VOL: case ENRG_VOL:
return SR_MQ_VOLTAGE; return SR_MQ_VOLTAGE;
case TEMP_IN: case TEMP_IN: /* Fallthrough */
case TEMP_OUT: case TEMP_OUT:
return SR_MQ_TEMPERATURE; return SR_MQ_TEMPERATURE;
default: default:
@ -423,7 +419,7 @@ static int channel_to_unit(struct sr_channel *ch)
return SR_UNIT_AMPERE; return SR_UNIT_AMPERE;
case ENRG_VOL: case ENRG_VOL:
return SR_UNIT_VOLT; return SR_UNIT_VOLT;
case TEMP_IN: case TEMP_IN: /* Fallthrough */
case TEMP_OUT: case TEMP_OUT:
return SR_UNIT_CELSIUS; return SR_UNIT_CELSIUS;
default: default:
@ -437,9 +433,9 @@ static float adjust_data(int val, int type)
switch (type) { switch (type) {
case ENRG_PWR: case ENRG_PWR:
return ((float)val) / 1000000.0; return ((float)val) / 1000000.0;
case ENRG_CURR: case ENRG_CURR: /* Fallthrough */
case ENRG_VOL: case ENRG_VOL: /* Fallthrough */
case TEMP_IN: case TEMP_IN: /* Fallthrough */
case TEMP_OUT: case TEMP_OUT:
return ((float)val) / 1000.0; return ((float)val) / 1000.0;
default: default:
@ -463,12 +459,11 @@ static float read_sample(struct sr_channel *ch)
case TEMP_IN: file = "temp1_input"; break; case TEMP_IN: file = "temp1_input"; break;
case TEMP_OUT: file = "temp2_input"; break; case TEMP_OUT: file = "temp2_input"; break;
default: default:
sr_err("Bug in the code: invalid channel type!"); sr_err("Invalid channel type: %d.", chp->ch_type);
return -1.0; return -1.0;
} }
snprintf(path, sizeof(path), snprintf(path, sizeof(path), "/sys/class/hwmon/hwmon%d/%s",
"/sys/class/hwmon/hwmon%d/%s",
chp->probe->hwmon_num, file); chp->probe->hwmon_num, file);
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
if (fd < 0) { if (fd < 0) {
@ -480,7 +475,7 @@ static float read_sample(struct sr_channel *ch)
len = read(fd, buf, sizeof(buf)); len = read(fd, buf, sizeof(buf));
close(fd); close(fd);
if (len < 0) { 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; ch->enabled = FALSE;
return -1.0; return -1.0;
} }
@ -517,8 +512,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
analog.data = &valf; analog.data = &valf;
/* /*
* Reading from sysfs takes some time - try to * Reading from sysfs takes some time - try to keep up with samplerate.
* keep up with samplerate.
*/ */
if (devc->samples_read) { if (devc->samples_read) {
cur_time = g_get_monotonic_time(); cur_time = g_get_monotonic_time();

4
src/hardware/baylibre-acme/protocol.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include <unistd.h> /* pipe() */ #include <unistd.h>
#include "libsigrok.h" #include "libsigrok.h"
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
@ -42,7 +42,7 @@
#define TEMP_PROBE_NAME "tmp435" #define TEMP_PROBE_NAME "tmp435"
/* For the user we number the probes starting from 1. */ /* 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 { enum probe_type {
PROBE_ENRG = 1, PROBE_ENRG = 1,