X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fprotocol.c;h=53b29b719aad62dda7f3735c0a582a70044f4c63;hb=7f4d69305b1d86cbe3785b5d041dcac1351f0731;hp=8e730f15d0f26e5933512f86fa7da4cdddc3d4e6;hpb=7e5a048ff26d516291c3d382c7d70bdbf42628d3;p=libsigrok.git
diff --git a/src/hardware/baylibre-acme/protocol.c b/src/hardware/baylibre-acme/protocol.c
index 8e730f15..53b29b71 100644
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -17,18 +17,34 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
#include
+#include
#include
#include "protocol.h"
#include "gpio.h"
+#define ACME_REV_A 1
+#define ACME_REV_B 2
+
+enum channel_type {
+ ENRG_PWR = 1,
+ ENRG_CURR,
+ ENRG_VOL,
+ TEMP_IN,
+ TEMP_OUT,
+};
+
struct channel_group_priv {
+ uint8_t rev;
int hwmon_num;
int probe_type;
int index;
+ int has_pws;
+ uint32_t pws_gpio;
};
struct channel_priv {
@@ -38,6 +54,22 @@ struct channel_priv {
struct channel_group_priv *probe;
};
+#define EEPROM_SERIAL_SIZE 16
+#define EEPROM_TAG_SIZE 32
+
+#define EEPROM_PROBE_TYPE_USB 1
+#define EEPROM_PROBE_TYPE_JACK 2
+#define EEPROM_PROBE_TYPE_HE10 3
+
+struct probe_eeprom {
+ int type;
+ int rev;
+ unsigned long shunt;
+ uint8_t pwr_sw;
+ uint8_t serial[EEPROM_SERIAL_SIZE];
+ char tag[EEPROM_TAG_SIZE];
+} __attribute__((packed));
+
static const uint8_t enrg_i2c_addrs[] = {
0x40, 0x41, 0x44, 0x45, 0x42, 0x43, 0x46, 0x47,
};
@@ -46,14 +78,18 @@ static const uint8_t temp_i2c_addrs[] = {
0x0, 0x0, 0x0, 0x0, 0x4c, 0x49, 0x4f, 0x4b,
};
-static const uint32_t pws_gpios[] = {
+static const uint32_t revA_pws_gpios[] = {
486, 498, 502, 482, 478, 506, 510, 474,
};
-static const uint32_t pws_info_gpios[] = {
+static const uint32_t revA_pws_info_gpios[] = {
487, 499, 503, 483, 479, 507, 511, 475,
};
+static const uint32_t revB_pws_gpios[] = {
+ 489, 491, 493, 495, 497, 499, 501, 503,
+};
+
#define MOHM_TO_UOHM(x) ((x) * 1000)
#define UOHM_TO_MOHM(x) ((x) / 1000)
@@ -100,6 +136,13 @@ static void probe_hwmon_path(unsigned int addr, GString *path)
"/sys/class/i2c-adapter/i2c-1/1-00%02x/hwmon", addr);
}
+static void probe_eeprom_path(unsigned int addr, GString *path)
+{
+ g_string_printf(path,
+ "/sys/class/i2c-dev/i2c-1/device/1-00%02x/eeprom",
+ addr + 0x10);
+}
+
SR_PRIV gboolean bl_acme_detect_probe(unsigned int addr,
int prb_num, const char *prb_name)
{
@@ -211,12 +254,66 @@ static void append_channel(struct sr_dev_inst *sdi, struct sr_channel_group *cg,
cg->channels = g_slist_append(cg->channels, ch);
}
+static int read_probe_eeprom(unsigned int addr, struct probe_eeprom *eeprom)
+{
+ static const ssize_t len = sizeof(struct probe_eeprom);
+
+ GString *path = g_string_sized_new(64);
+ ssize_t rd;
+ int fd;
+
+ probe_eeprom_path(addr, path);
+ fd = g_open(path->str, O_RDONLY);
+ g_string_free(path, TRUE);
+ if (fd < 0)
+ return -1;
+
+ rd = read(fd, eeprom, len);
+ g_close(fd, NULL);
+ if (rd != len)
+ return -1;
+
+ /*
+ * All integer types are in network byte order. Convert them to
+ * host order before proceeding.
+ */
+ eeprom->type = ntohl(eeprom->type);
+ eeprom->rev = ntohl(eeprom->rev);
+ eeprom->shunt = ntohl(eeprom->shunt);
+
+ /* Check if we have some sensible values. */
+ if (eeprom->rev != 'B')
+ /* 'B' is the only supported revision with EEPROM for now. */
+ return -1;
+
+ if (eeprom->type != EEPROM_PROBE_TYPE_USB &&
+ eeprom->type != EEPROM_PROBE_TYPE_JACK &&
+ eeprom->type != EEPROM_PROBE_TYPE_HE10)
+ return -1;
+
+ return 0;
+}
+
+/* Some i2c slave addresses on revision B probes differ from revision A. */
+static int revB_addr_to_num(unsigned int addr)
+{
+ switch (addr) {
+ case 0x44: return 5;
+ case 0x45: return 6;
+ case 0x42: return 3;
+ case 0x43: return 4;
+ default: return addr - 0x3f;
+ }
+}
+
SR_PRIV gboolean bl_acme_register_probe(struct sr_dev_inst *sdi, int type,
unsigned int addr, int prb_num)
{
struct sr_channel_group *cg;
struct channel_group_priv *cgp;
- int hwmon;
+ struct probe_eeprom eeprom;
+ int hwmon, status;
+ uint32_t gpio;
/* Obtain the hwmon index. */
hwmon = get_hwmon_index(addr);
@@ -225,11 +322,39 @@ SR_PRIV gboolean bl_acme_register_probe(struct sr_dev_inst *sdi, int type,
cg = g_malloc0(sizeof(struct sr_channel_group));
cgp = g_malloc0(sizeof(struct channel_group_priv));
+ cg->priv = cgp;
+
+ /*
+ * See if we can read the EEPROM contents. If not, assume it's
+ * a revision A probe.
+ */
+ status = read_probe_eeprom(addr, &eeprom);
+ cgp->rev = status < 0 ? ACME_REV_A : ACME_REV_B;
+
+ prb_num = cgp->rev == ACME_REV_A ? prb_num : revB_addr_to_num(addr);
+
cgp->hwmon_num = hwmon;
cgp->probe_type = type;
cgp->index = prb_num - 1;
cg->name = g_strdup_printf("Probe_%d", prb_num);
- cg->priv = cgp;
+
+ if (cgp->rev == ACME_REV_A) {
+ gpio = revA_pws_info_gpios[cgp->index];
+ cgp->has_pws = sr_gpio_getval_export(gpio);
+ cgp->pws_gpio = revA_pws_gpios[cgp->index];
+ } else {
+ cgp->has_pws = eeprom.pwr_sw;
+ cgp->pws_gpio = revB_pws_gpios[cgp->index];
+
+ /*
+ * For revision B we can already try to set the shunt
+ * resistance according to the EEPROM contents.
+ *
+ * Keep the default value if shunt in EEPROM == 0.
+ */
+ if (eeprom.shunt > 0)
+ bl_acme_set_shunt(cg, UOHM_TO_MOHM(eeprom.shunt));
+ }
if (type == PROBE_ENRG) {
append_channel(sdi, cg, prb_num, ENRG_PWR);
@@ -258,7 +383,7 @@ SR_PRIV int bl_acme_probe_has_pws(const struct sr_channel_group *cg)
{
struct channel_group_priv *cgp = cg->priv;
- return sr_gpio_getval_export(pws_info_gpios[cgp->index]);
+ return cgp->has_pws;
}
/*
@@ -380,7 +505,7 @@ SR_PRIV int bl_acme_set_shunt(const struct sr_channel_group *cg, uint64_t shunt)
*/
fd = g_fopen(path->str, "w");
if (!fd) {
- sr_err("Error opening %s: %s", path->str, strerror(errno));
+ sr_err("Error opening %s: %s", path->str, g_strerror(errno));
ret = SR_ERR_IO;
goto out;
}
@@ -406,7 +531,7 @@ SR_PRIV int bl_acme_read_power_state(const struct sr_channel_group *cg,
return SR_ERR_ARG;
}
- val = sr_gpio_getval_export(pws_gpios[cgp->index]);
+ val = sr_gpio_getval_export(cgp->pws_gpio);
*off = val ? FALSE : TRUE;
return SR_OK;
@@ -425,10 +550,10 @@ SR_PRIV int bl_acme_set_power_off(const struct sr_channel_group *cg,
return SR_ERR_ARG;
}
- val = sr_gpio_setval_export(pws_gpios[cgp->index], off ? 0 : 1);
+ val = sr_gpio_setval_export(cgp->pws_gpio, off ? 0 : 1);
if (val < 0) {
sr_err("Error setting power-off state: gpio: %d",
- pws_gpios[cgp->index]);
+ cgp->pws_gpio);
return SR_ERR_IO;
}
@@ -507,8 +632,8 @@ static float read_sample(struct sr_channel *ch)
len = read(fd, buf, sizeof(buf));
if (len < 0) {
- sr_err("Error reading from channel %s (hwmon: %s): %s",
- ch->name, chp->probe->hwmon_num, strerror(errno));
+ sr_err("Error reading from channel %s (hwmon: %d): %s",
+ ch->name, chp->probe->hwmon_num, g_strerror(errno));
ch->enabled = FALSE;
return -1.0;
}
@@ -540,7 +665,7 @@ SR_PRIV int bl_acme_open_channel(struct sr_channel *ch)
fd = open(path, O_RDONLY);
if (fd < 0) {
- sr_err("Error opening %s: %s", path, strerror(errno));
+ sr_err("Error opening %s: %s", path, g_strerror(errno));
ch->enabled = FALSE;
return SR_ERR;
}