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

brymen-bm86x: Initial driver skeleton.

This commit is contained in:
Aurelien Jacobs 2014-02-08 22:40:36 +01:00 committed by Bert Vermeulen
parent 8bbdd364d3
commit 8d9c8554a5
7 changed files with 331 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -109,6 +109,15 @@ AC_ARG_ENABLE(atten-pps3xxx, AC_HELP_STRING([--enable-atten-pps3xxx],
[HW_ATTEN_PPS3XXX="$enableval"],
[HW_ATTEN_PPS3XXX=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(brymen-bm86x, AC_HELP_STRING([--enable-brymen-bm86x],
[enable Brymen BM86X support [default=yes]]),
[HW_BRYMEN_BM86X="$enableval"],
[HW_BRYMEN_BM86X=$HW_ENABLED_DEFAULT])
AM_CONDITIONAL(HW_BRYMEN_BM86X, test x$HW_BRYMEN_BM86X = xyes)
if test "x$HW_BRYMEN_BM86X" = "xyes"; then
AC_DEFINE(HAVE_HW_BRYMEN_BM86X, 1, [Brymen BM86X support])
fi
AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
[enable Brymen DMM support [default=yes]]),
[HW_BRYMEN_DMM="$enableval"],
@ -606,6 +615,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
hardware/appa-55ii/Makefile
hardware/asix-sigma/Makefile
hardware/atten-pps3xxx/Makefile
hardware/brymen-bm86x/Makefile
hardware/brymen-dmm/Makefile
hardware/cem-dt-885x/Makefile
hardware/center-3xx/Makefile
@ -677,6 +687,7 @@ echo " - alsa............................ $HW_ALSA"
echo " - appa-55ii....................... $HW_APPA_55II"
echo " - asix-sigma...................... $HW_ASIX_SIGMA"
echo " - atten-pps3xxx................... $HW_ATTEN_PPS3XXX"
echo " - brymen-bm86x.................... $HW_BRYMEN_BM86X"
echo " - brymen-dmm...................... $HW_BRYMEN_DMM"
echo " - cem-dt-885x..................... $HW_CEM_DT_885X"
echo " - center-3xx...................... $HW_CENTER_3XX"

5
hardware/Makefile.am
View File

@ -24,6 +24,7 @@ SUBDIRS = \
appa-55ii \
asix-sigma \
atten-pps3xxx \
brymen-bm86x \
brymen-dmm \
cem-dt-885x \
center-3xx \
@ -83,6 +84,10 @@ if HW_ATTEN_PPS3XXX
libsigrokhardware_la_LIBADD += atten-pps3xxx/libsigrok_hw_atten_pps3xxx.la
endif
if HW_BRYMEN_BM86X
libsigrokhardware_la_LIBADD += brymen-bm86x/libsigrok_hw_brymen_bm86x.la
endif
if HW_BRYMEN_DMM
libsigrokhardware_la_LIBADD += brymen-dmm/libsigrok_hw_brymen_dmm.la
endif

33
hardware/brymen-bm86x/Makefile.am Normal file
View File

@ -0,0 +1,33 @@
##
## 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/>.
##
if HW_BRYMEN_BM86X
# Local lib, this is NOT meant to be installed!
noinst_LTLIBRARIES = libsigrok_hw_brymen_bm86x.la
libsigrok_hw_brymen_bm86x_la_SOURCES = \
api.c \
protocol.c \
protocol.h
libsigrok_hw_brymen_bm86x_la_CFLAGS = \
-I$(top_srcdir)
endif

191
hardware/brymen-bm86x/api.c Normal file
View File

@ -0,0 +1,191 @@
/*
* 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 "protocol.h"
SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info;
static struct sr_dev_driver *di = &brymen_bm86x_driver_info;
static int init(struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
}
static GSList *scan(GSList *options)
{
struct drv_context *drvc;
GSList *devices;
(void)options;
devices = NULL;
drvc = di->priv;
drvc->instances = NULL;
/* TODO: scan for devices, either based on a SR_CONF_CONN option
* or on a USB scan. */
return devices;
}
static GSList *dev_list(void)
{
return ((struct drv_context *)(di->priv))->instances;
}
static int dev_clear(void)
{
return std_dev_clear(di, NULL);
}
static int dev_open(struct sr_dev_inst *sdi)
{
(void)sdi;
/* TODO: get handle from sdi->conn and open it. */
sdi->status = SR_ST_ACTIVE;
return SR_OK;
}
static int dev_close(struct sr_dev_inst *sdi)
{
(void)sdi;
/* TODO: get handle from sdi->conn and close it. */
sdi->status = SR_ST_INACTIVE;
return SR_OK;
}
static int cleanup(void)
{
dev_clear();
/* TODO: free other driver resources, if any. */
return SR_OK;
}
static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_probe_group *probe_group)
{
int ret;
(void)sdi;
(void)data;
(void)probe_group;
ret = SR_OK;
switch (key) {
/* TODO */
default:
return SR_ERR_NA;
}
return ret;
}
static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_probe_group *probe_group)
{
int ret;
(void)data;
(void)probe_group;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
ret = SR_OK;
switch (key) {
/* TODO */
default:
ret = SR_ERR_NA;
}
return ret;
}
static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_probe_group *probe_group)
{
int ret;
(void)sdi;
(void)data;
(void)probe_group;
ret = SR_OK;
switch (key) {
/* TODO */
default:
return SR_ERR_NA;
}
return ret;
}
static int dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{
(void)sdi;
(void)cb_data;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
/* TODO: configure hardware, reset acquisition state, set up
* callbacks and send header packet. */
return SR_OK;
}
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
(void)cb_data;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
/* TODO: stop acquisition. */
return SR_OK;
}
SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info = {
.name = "brymen-bm86x",
.longname = "Brymen BM86X",
.api_version = 1,
.init = init,
.cleanup = cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = 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,
.priv = NULL,
};

40
hardware/brymen-bm86x/protocol.c Normal file
View File

@ -0,0 +1,40 @@
/*
* 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 "protocol.h"
SR_PRIV int brymen_bm86x_receive_data(int fd, int revents, void *cb_data)
{
const struct sr_dev_inst *sdi;
struct dev_context *devc;
(void)fd;
if (!(sdi = cb_data))
return TRUE;
if (!(devc = sdi->priv))
return TRUE;
if (revents == G_IO_IN) {
/* TODO */
}
return TRUE;
}

45
hardware/brymen-bm86x/protocol.h Normal file
View File

@ -0,0 +1,45 @@
/*
* 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.h"
#include "libsigrok-internal.h"
/* Message logging helpers with subsystem-specific prefix string. */
#define LOG_PREFIX "brymen-bm86x"
/** Private, per-device-instance driver context. */
struct dev_context {
/* Model-specific information */
/* Acquisition settings */
/* Operational state */
/* Temporary state across callbacks */
};
SR_PRIV int brymen_bm86x_receive_data(int fd, int revents, void *cb_data);
#endif

6
hwdriver.c
View File

@ -130,6 +130,9 @@ extern SR_PRIV struct sr_dev_driver appa_55ii_driver_info;
#ifdef HAVE_HW_ATTEN_PPS3XXX
extern SR_PRIV struct sr_dev_driver atten_pps3203_driver_info;
#endif
#ifdef HAVE_HW_BRYMEN_BM86X
extern SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info;
#endif
#ifdef HAVE_HW_BRYMEN_DMM
extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
#endif
@ -283,6 +286,9 @@ static struct sr_dev_driver *drivers_list[] = {
#ifdef HAVE_HW_ATTEN_PPS3XXX
&atten_pps3203_driver_info,
#endif
#ifdef HAVE_HW_BRYMEN_BM86X
&brymen_bm86x_driver_info,
#endif
#ifdef HAVE_HW_BRYMEN_DMM
&brymen_bm857_driver_info,
#endif