]> sigrok.org Git - libsigrok.git/commitdiff
brymen-bm86x: retire libusb using driver, has moved to serial-dmm
authorGerhard Sittig <redacted>
Sun, 9 Jun 2019 08:48:21 +0000 (10:48 +0200)
committerGerhard Sittig <redacted>
Thu, 13 Jun 2019 17:32:51 +0000 (19:32 +0200)
Remove the src/hardware/brymen-bm86x/ hierarchy of source files. Its
functionality has moved to the bm86x packet parser and the serial-dmm
device driver.

Makefile.am
configure.ac
src/hardware/brymen-bm86x/api.c [deleted file]
src/hardware/brymen-bm86x/protocol.c [deleted file]
src/hardware/brymen-bm86x/protocol.h [deleted file]

index 0f748f3e15baa5bd9c5160632a8eef186bb87ed9..4275973992fa8275fd9da5950b006fcb7e37219d 100644 (file)
@@ -250,12 +250,6 @@ src_libdrivers_la_SOURCES += \
        src/hardware/beaglelogic/beaglelogic_native.c \
        src/hardware/beaglelogic/beaglelogic_tcp.c
 endif
-if HW_BRYMEN_BM86X
-src_libdrivers_la_SOURCES += \
-       src/hardware/brymen-bm86x/protocol.h \
-       src/hardware/brymen-bm86x/protocol.c \
-       src/hardware/brymen-bm86x/api.c
-endif
 if HW_BRYMEN_DMM
 src_libdrivers_la_SOURCES += \
        src/hardware/brymen-dmm/parser.c \
index df00ab67634f436c8291d77d4e82fc2dfde44c0e..b23d52bde192bcfb883ece54dd14bca2d30bf5f1 100644 (file)
@@ -254,7 +254,6 @@ SR_DRIVER([ASIX SIGMA/SIGMA2], [asix-sigma], [libftdi])
 SR_DRIVER([Atten PPS3xxx], [atten-pps3xxx], [serial_comm])
 SR_DRIVER([BayLibre ACME], [baylibre-acme], [sys_timerfd_h])
 SR_DRIVER([BeagleLogic], [beaglelogic], [sys_mman_h sys_ioctl_h])
-SR_DRIVER([Brymen BM86x], [brymen-bm86x], [libusb])
 SR_DRIVER([Brymen DMM], [brymen-dmm], [serial_comm])
 SR_DRIVER([CEM DT-885x], [cem-dt-885x], [serial_comm])
 SR_DRIVER([Center 3xx], [center-3xx], [serial_comm])
diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
deleted file mode 100644 (file)
index a6c45e3..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * This file is part of the libsigrok project.
- *
- * Copyright (C) 2014 Aurelien Jacobs <aurel@gnuage.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include "protocol.h"
-
-#define BRYMEN_BC86X "0820.0001"
-
-static const uint32_t scanopts[] = {
-       SR_CONF_CONN,
-};
-
-static const uint32_t drvopts[] = {
-       SR_CONF_MULTIMETER,
-};
-
-static const uint32_t devopts[] = {
-       SR_CONF_CONTINUOUS,
-       SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
-       SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
-};
-
-static GSList *scan(struct sr_dev_driver *di, GSList *options)
-{
-       GSList *usb_devices, *devices, *l;
-       struct drv_context *drvc;
-       struct dev_context *devc;
-       struct sr_dev_inst *sdi;
-       struct sr_usb_dev_inst *usb;
-       struct sr_config *src;
-       const char *conn;
-
-       drvc = di->context;
-
-       conn = BRYMEN_BC86X;
-       for (l = options; l; l = l->next) {
-               src = l->data;
-               switch (src->key) {
-               case SR_CONF_CONN:
-                       conn = g_variant_get_string(src->data, NULL);
-                       break;
-               }
-       }
-
-       devices = NULL;
-       if (!(usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn)))
-               return NULL;
-
-       for (l = usb_devices; l; l = l->next) {
-               usb = l->data;
-
-               sdi = g_malloc0(sizeof(struct sr_dev_inst));
-               sdi->status = SR_ST_INACTIVE;
-               sdi->vendor = g_strdup("Brymen");
-               sdi->model = g_strdup("BM869");
-               devc = g_malloc0(sizeof(struct dev_context));
-               sdi->priv = devc;
-               sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
-               sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "P2");
-
-               sdi->inst_type = SR_INST_USB;
-               sdi->conn = usb;
-
-               sr_sw_limits_init(&devc->sw_limits);
-
-               devices = g_slist_append(devices, sdi);
-       }
-
-       return std_scan_complete(di, devices);
-}
-
-static int dev_open(struct sr_dev_inst *sdi)
-{
-       struct sr_dev_driver *di = sdi->driver;
-       struct drv_context *drvc = di->context;
-       struct sr_usb_dev_inst *usb;
-       struct dev_context *devc;
-       int ret;
-
-       usb = sdi->conn;
-       devc = sdi->priv;
-
-       if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) < 0)
-               return SR_ERR;
-
-       if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
-               ret = libusb_detach_kernel_driver(usb->devhdl, 0);
-               if (ret < 0) {
-                       sr_err("Failed to detach kernel driver: %s.",
-                              libusb_error_name(ret));
-                       return SR_ERR;
-               }
-               devc->detached_kernel_driver = 1;
-       }
-
-       if ((ret = libusb_claim_interface(usb->devhdl, 0)) < 0) {
-               sr_err("Failed to claim interface 0: %s.",
-                      libusb_error_name(ret));
-               return SR_ERR;
-       }
-
-       return SR_OK;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
-       struct sr_usb_dev_inst *usb;
-       struct dev_context *devc;
-       int ret;
-
-       usb = sdi->conn;
-       devc = sdi->priv;
-
-       if (!usb->devhdl)
-               return SR_OK;
-
-       if ((ret = libusb_release_interface(usb->devhdl, 0)))
-               sr_err("Failed to release interface 0: %s.\n", libusb_error_name(ret));
-
-       if (!ret && devc->detached_kernel_driver) {
-               if ((ret = libusb_attach_kernel_driver(usb->devhdl, 0)))
-                       sr_err("Failed to attach kernel driver: %s.\n",
-                              libusb_error_name(ret));
-               else
-                       devc->detached_kernel_driver = 0;
-       }
-
-       libusb_close(usb->devhdl);
-
-       return (ret == 0) ? SR_OK : SR_ERR;
-}
-
-static int config_get(uint32_t key, GVariant **data,
-       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
-{
-       struct dev_context *devc = sdi->priv;
-
-       (void)cg;
-
-       return sr_sw_limits_config_get(&devc->sw_limits, key, data);
-}
-
-static int config_set(uint32_t key, GVariant *data,
-       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
-{
-       struct dev_context *devc;
-
-       (void)cg;
-
-       devc = sdi->priv;
-
-       return sr_sw_limits_config_set(&devc->sw_limits, key, data);
-}
-
-static int config_list(uint32_t key, GVariant **data,
-       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
-{
-       return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
-}
-
-static int dev_acquisition_start(const struct sr_dev_inst *sdi)
-{
-       struct dev_context *devc;
-
-       devc = sdi->priv;
-
-       sr_sw_limits_acquisition_start(&devc->sw_limits);
-
-       std_session_send_df_header(sdi);
-
-       sr_session_source_add(sdi->session, -1, 0, 10,
-                       brymen_bm86x_receive_data, (void *)sdi);
-
-       return SR_OK;
-}
-
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       std_session_send_df_end(sdi);
-
-       sr_session_source_remove(sdi->session, -1);
-
-       return SR_OK;
-}
-
-static struct sr_dev_driver brymen_bm86x_driver_info = {
-       .name = "brymen-bm86x-usb",
-       .longname = "Brymen BM86X",
-       .api_version = 1,
-       .init = std_init,
-       .cleanup = std_cleanup,
-       .scan = scan,
-       .dev_list = std_dev_list,
-       .dev_clear = std_dev_clear,
-       .config_get = config_get,
-       .config_set = config_set,
-       .config_list = config_list,
-       .dev_open = dev_open,
-       .dev_close = dev_close,
-       .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
-       .context = NULL,
-};
-SR_REGISTER_DEV_DRIVER(brymen_bm86x_driver_info);
diff --git a/src/hardware/brymen-bm86x/protocol.c b/src/hardware/brymen-bm86x/protocol.c
deleted file mode 100644 (file)
index 097b887..0000000
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * This file is part of the libsigrok project.
- *
- * Copyright (C) 2014 Aurelien Jacobs <aurel@gnuage.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <string.h>
-#include <math.h>
-#include "protocol.h"
-
-#define USB_TIMEOUT 500
-
-static const char char_map[128] = {
-       [0x20] = '-',
-       [0x5F] = '0',
-       [0x50] = '1',
-       [0x6D] = '2',
-       [0x7C] = '3',
-       [0x72] = '4',
-       [0x3E] = '5',
-       [0x3F] = '6',
-       [0x54] = '7',
-       [0x7F] = '8',
-       [0x7E] = '9',
-       [0x0F] = 'C',
-       [0x27] = 'F',
-       [0x0B] = 'L',
-       [0x79] = 'd',
-       [0x10] = 'i',
-       [0x39] = 'o',
-};
-
-static int brymen_bm86x_parse_digits(const unsigned char *buf, int length,
-                                     char *str, float *floatval,
-                                     char *temp_unit, int *digits, int flag)
-{
-       char c, *p = str;
-       int i, ret;
-
-       *digits = INT_MIN;
-
-       if (buf[0] & flag)
-               *p++ = '-';
-       for (i = 0; i < length; i++) {
-               if (i && i < 5 && buf[i+1] & 0x01) {
-                       *p++ = '.';
-                       *digits = 0;
-               }
-               c = char_map[buf[i+1] >> 1];
-               if (i == 5 && (c == 'C' || c == 'F'))
-                       *temp_unit = c;
-               else if (c) {
-                       *p++ = c;
-                       (*digits)++;
-               }
-       }
-       *p = 0;
-
-       if (*digits < 0)
-               *digits = 0;
-
-       if ((ret = sr_atof_ascii(str, floatval))) {
-               sr_dbg("invalid float string: '%s'", str);
-               return ret;
-       }
-
-       return SR_OK;
-}
-
-static void brymen_bm86x_parse(unsigned char *buf, float *floatval,
-                               struct sr_datafeed_analog *analog)
-{
-       char str[16], temp_unit;
-       int ret1, ret2, digits[2], over_limit;
-
-       ret1 = brymen_bm86x_parse_digits(buf+2, 6, str, &floatval[0],
-                                        &temp_unit, &digits[0], 0x80);
-       over_limit = strstr(str, "0L") || strstr(str, "0.L");
-       ret2 = brymen_bm86x_parse_digits(buf+9, 4, str, &floatval[1],
-                                        &temp_unit, &digits[1], 0x10);
-
-       /* main display */
-       if (ret1 == SR_OK || over_limit) {
-               /* SI unit */
-               if (buf[8] & 0x01) {
-                       analog[0].meaning->mq = SR_MQ_VOLTAGE;
-                       analog[0].meaning->unit = SR_UNIT_VOLT;
-                       if (!strcmp(str, "diod")) {
-                               analog[0].meaning->mqflags |= SR_MQFLAG_DIODE;
-                               analog[0].meaning->mqflags |= SR_MQFLAG_DC;
-                       }
-               } else if (buf[14] & 0x80) {
-                       analog[0].meaning->mq = SR_MQ_CURRENT;
-                       analog[0].meaning->unit = SR_UNIT_AMPERE;
-               } else if (buf[14] & 0x20) {
-                       analog[0].meaning->mq = SR_MQ_CAPACITANCE;
-                       analog[0].meaning->unit = SR_UNIT_FARAD;
-               } else if (buf[14] & 0x10) {
-                       analog[0].meaning->mq = SR_MQ_CONDUCTANCE;
-                       analog[0].meaning->unit = SR_UNIT_SIEMENS;
-               } else if (buf[15] & 0x01) {
-                       analog[0].meaning->mq = SR_MQ_FREQUENCY;
-                       analog[0].meaning->unit = SR_UNIT_HERTZ;
-               } else if (buf[10] & 0x01) {
-                       analog[0].meaning->mq = SR_MQ_CONTINUITY;
-                       analog[0].meaning->unit = SR_UNIT_OHM;
-               } else if (buf[15] & 0x10) {
-                       analog[0].meaning->mq = SR_MQ_RESISTANCE;
-                       analog[0].meaning->unit = SR_UNIT_OHM;
-               } else if (buf[15] & 0x02) {
-                       analog[0].meaning->mq = SR_MQ_POWER;
-                       analog[0].meaning->unit = SR_UNIT_DECIBEL_MW;
-               } else if (buf[15] & 0x80) {
-                       analog[0].meaning->mq = SR_MQ_DUTY_CYCLE;
-                       analog[0].meaning->unit = SR_UNIT_PERCENTAGE;
-               } else if (buf[ 2] & 0x0A) {
-                       analog[0].meaning->mq = SR_MQ_TEMPERATURE;
-                       if (temp_unit == 'F')
-                               analog[0].meaning->unit = SR_UNIT_FAHRENHEIT;
-                       else
-                               analog[0].meaning->unit = SR_UNIT_CELSIUS;
-               }
-
-               /* when MIN MAX and AVG are displayed at the same time, remove them */
-               if ((buf[1] & 0xE0) == 0xE0)
-                       buf[1] &= ~0xE0;
-
-               /* AC/DC/Auto flags */
-               if (buf[1] & 0x10)  analog[0].meaning->mqflags |= SR_MQFLAG_DC;
-               if (buf[2] & 0x01)  analog[0].meaning->mqflags |= SR_MQFLAG_AC;
-               if (buf[1] & 0x01)  analog[0].meaning->mqflags |= SR_MQFLAG_AUTORANGE;
-               if (buf[1] & 0x08)  analog[0].meaning->mqflags |= SR_MQFLAG_HOLD;
-               if (buf[1] & 0x20)  analog[0].meaning->mqflags |= SR_MQFLAG_MAX;
-               if (buf[1] & 0x40)  analog[0].meaning->mqflags |= SR_MQFLAG_MIN;
-               if (buf[1] & 0x80)  analog[0].meaning->mqflags |= SR_MQFLAG_AVG;
-               if (buf[3] & 0x01)  analog[0].meaning->mqflags |= SR_MQFLAG_RELATIVE;
-
-               /* when dBm is displayed, remove the m suffix so that it is
-                  not considered as the 10e-3 SI prefix */
-               if (buf[15] & 0x02)
-                       buf[15] &= ~0x04;
-
-               /* SI prefix */
-               if (buf[14] & 0x40)  { floatval[0] *= 1e-9; digits[0] += 9; } /* n */
-               if (buf[15] & 0x08)  { floatval[0] *= 1e-6; digits[0] += 6; } /* µ */
-               if (buf[15] & 0x04)  { floatval[0] *= 1e-3; digits[0] += 3; } /* m */
-               if (buf[15] & 0x40)  { floatval[0] *= 1e3;  digits[0] -= 3; } /* k */
-               if (buf[15] & 0x20)  { floatval[0] *= 1e6;  digits[0] -= 6; } /* M */
-
-               if (over_limit)      floatval[0] = INFINITY;
-
-               analog[0].encoding->digits  = digits[0];
-               analog[0].spec->spec_digits = digits[0];
-       }
-
-       /* secondary display */
-       if (ret2 == SR_OK) {
-               /* SI unit */
-               if (buf[14] & 0x08) {
-                       analog[1].meaning->mq = SR_MQ_VOLTAGE;
-                       analog[1].meaning->unit = SR_UNIT_VOLT;
-               } else if (buf[9] & 0x04) {
-                       analog[1].meaning->mq = SR_MQ_CURRENT;
-                       analog[1].meaning->unit = SR_UNIT_AMPERE;
-               } else if (buf[9] & 0x08) {
-                       analog[1].meaning->mq = SR_MQ_CURRENT;
-                       analog[1].meaning->unit = SR_UNIT_PERCENTAGE;
-               } else if (buf[14] & 0x04) {
-                       analog[1].meaning->mq = SR_MQ_FREQUENCY;
-                       analog[1].meaning->unit = SR_UNIT_HERTZ;
-               } else if (buf[9] & 0x40) {
-                       analog[1].meaning->mq = SR_MQ_TEMPERATURE;
-                       if (temp_unit == 'F')
-                               analog[1].meaning->unit = SR_UNIT_FAHRENHEIT;
-                       else
-                               analog[1].meaning->unit = SR_UNIT_CELSIUS;
-               }
-
-               /* AC flag */
-               if (buf[9] & 0x20)  analog[1].meaning->mqflags |= SR_MQFLAG_AC;
-
-               /* SI prefix */
-               if (buf[ 9] & 0x01)  { floatval[1] *= 1e-6; digits[1] += 6; } /* µ */
-               if (buf[ 9] & 0x02)  { floatval[1] *= 1e-3; digits[1] += 3; } /* m */
-               if (buf[14] & 0x02)  { floatval[1] *= 1e3;  digits[1] -= 3; } /* k */
-               if (buf[14] & 0x01)  { floatval[1] *= 1e6;  digits[1] -= 6; } /* M */
-
-               analog[1].encoding->digits  = digits[1];
-               analog[1].spec->spec_digits = digits[1];
-       }
-
-       if (buf[9] & 0x80)
-               sr_spew("Battery is low.");
-}
-
-static void brymen_bm86x_handle_packet(const struct sr_dev_inst *sdi,
-                                       unsigned char *buf)
-{
-       struct dev_context *devc;
-       struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog[2];
-       struct sr_analog_encoding encoding[2];
-       struct sr_analog_meaning meaning[2];
-       struct sr_analog_spec spec[2];
-       struct sr_channel *channel;
-       int sent_ch1, sent_ch2;
-       float floatval[2];
-
-       devc = sdi->priv;
-
-       /* Note: digits/spec_digits will be overridden later. */
-       sr_analog_init(&analog[0], &encoding[0], &meaning[0], &spec[0], 0);
-       sr_analog_init(&analog[1], &encoding[1], &meaning[1], &spec[1], 0);
-
-       brymen_bm86x_parse(buf, floatval, analog);
-       sent_ch1 = sent_ch2 = 0;
-
-       channel = sdi->channels->data;
-       if (analog[0].meaning->mq != 0 && channel->enabled) {
-               /* Got a measurement. */
-               sent_ch1 = 1;
-               analog[0].num_samples = 1;
-               analog[0].data = &floatval[0];
-               analog[0].meaning->channels = g_slist_append(NULL, channel);
-               packet.type = SR_DF_ANALOG;
-               packet.payload = &analog[0];
-               sr_session_send(sdi, &packet);
-               g_slist_free(analog[0].meaning->channels);
-       }
-
-       channel = sdi->channels->next->data;
-       if (analog[1].meaning->mq != 0 && channel->enabled) {
-               /* Got a measurement. */
-               sent_ch2 = 1;
-               analog[1].num_samples = 1;
-               analog[1].data = &floatval[1];
-               analog[1].meaning->channels = g_slist_append(NULL, channel);
-               packet.type = SR_DF_ANALOG;
-               packet.payload = &analog[1];
-               sr_session_send(sdi, &packet);
-               g_slist_free(analog[1].meaning->channels);
-       }
-
-       if (sent_ch1 || sent_ch2)
-               sr_sw_limits_update_samples_read(&devc->sw_limits, 1);
-}
-
-static int brymen_bm86x_send_command(const struct sr_dev_inst *sdi)
-{
-       struct sr_usb_dev_inst *usb;
-       unsigned char buf[] = { 0x00, 0x86, 0x66 };
-       int ret;
-
-       usb = sdi->conn;
-
-       sr_dbg("Sending HID set report.");
-       ret = libusb_control_transfer(usb->devhdl,
-                                     LIBUSB_REQUEST_TYPE_CLASS |
-                                     LIBUSB_RECIPIENT_INTERFACE |
-                                     LIBUSB_ENDPOINT_OUT,
-                                     9,     /* bRequest: HID set_report */
-                                     0x300, /* wValue: HID feature, report num 0 */
-                                     0,     /* wIndex: interface 0 */
-                                     buf, sizeof(buf), USB_TIMEOUT);
-
-       if (ret < 0) {
-               sr_err("HID feature report error: %s.", libusb_error_name(ret));
-               return SR_ERR;
-       }
-
-       if (ret != sizeof(buf)) {
-               sr_err("Short packet: sent %d/%zu bytes.", ret, sizeof(buf));
-               return SR_ERR;
-       }
-
-       return SR_OK;
-}
-
-static int brymen_bm86x_read_interrupt(const struct sr_dev_inst *sdi)
-{
-       struct dev_context *devc;
-       struct sr_usb_dev_inst *usb;
-       unsigned char buf[24];
-       int ret, transferred;
-
-       devc = sdi->priv;
-       usb = sdi->conn;
-
-       sr_dbg("Reading HID interrupt report.");
-       /* Get data from EP1 using an interrupt transfer. */
-       ret = libusb_interrupt_transfer(usb->devhdl,
-                                       LIBUSB_ENDPOINT_IN | 1, /* EP1, IN */
-                                       buf, sizeof(buf),
-                                       &transferred, USB_TIMEOUT);
-
-       if (ret == LIBUSB_ERROR_TIMEOUT) {
-               if (++devc->interrupt_pending > 3)
-                       devc->interrupt_pending = 0;
-               return SR_OK;
-       }
-
-       if (ret < 0) {
-               sr_err("USB receive error: %s.", libusb_error_name(ret));
-               return SR_ERR;
-       }
-
-       if (transferred != sizeof(buf)) {
-               sr_err("Short packet: received %d/%zu bytes.", transferred, sizeof(buf));
-               return SR_ERR;
-       }
-
-       devc->interrupt_pending = 0;
-       brymen_bm86x_handle_packet(sdi, buf);
-
-       return SR_OK;
-}
-
-SR_PRIV int brymen_bm86x_receive_data(int fd, int revents, void *cb_data)
-{
-       struct sr_dev_inst *sdi;
-       struct dev_context *devc;
-
-       (void)fd;
-       (void)revents;
-
-       if (!(sdi = cb_data))
-               return TRUE;
-
-       if (!(devc = sdi->priv))
-               return TRUE;
-
-       if (!devc->interrupt_pending) {
-               if (brymen_bm86x_send_command(sdi))
-                       return FALSE;
-               devc->interrupt_pending = 1;
-       }
-
-       if (brymen_bm86x_read_interrupt(sdi))
-               return FALSE;
-
-       if (sr_sw_limits_check(&devc->sw_limits))
-               sr_dev_acquisition_stop(sdi);
-
-       return TRUE;
-}
diff --git a/src/hardware/brymen-bm86x/protocol.h b/src/hardware/brymen-bm86x/protocol.h
deleted file mode 100644 (file)
index c5c4d59..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the libsigrok project.
- *
- * Copyright (C) 2014 Aurelien Jacobs <aurel@gnuage.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef LIBSIGROK_HARDWARE_BRYMEN_BM86X_PROTOCOL_H
-#define LIBSIGROK_HARDWARE_BRYMEN_BM86X_PROTOCOL_H
-
-#include <stdint.h>
-#include <glib.h>
-#include <libsigrok/libsigrok.h>
-#include "libsigrok-internal.h"
-
-#define LOG_PREFIX "brymen-bm86x"
-
-struct dev_context {
-       struct sr_sw_limits sw_limits;
-       int detached_kernel_driver; /**< Whether kernel driver was detached or not */
-       int interrupt_pending;
-};
-
-SR_PRIV int brymen_bm86x_receive_data(int fd, int revents, void *cb_data);
-
-#endif