saleae-logic16: Initial driver skeleton.
This commit is contained in:
Marcus Comstedt
Uwe Hermann
parent
56e76981bc
commit
c463dcf06c
11
configure.ac
11
configure.ac
|
|
@ -184,6 +184,15 @@ AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2],
|
|||
[HW_RIGOL_DS1XX2="$enableval"],
|
||||
[HW_RIGOL_DS1XX2=$HW_ENABLED_DEFAULT])
|
||||
|
||||
AC_ARG_ENABLE(saleae-logic16, AC_HELP_STRING([--enable-saleae-logic16],
|
||||
[enable Saleae Logic16 support [default=yes]]),
|
||||
[HW_SALEAE_LOGIC16="$enableval"],
|
||||
[HW_SALEAE_LOGIC16=yes])
|
||||
AM_CONDITIONAL(HW_SALEAE_LOGIC16, test x$HW_SALEAE_LOGIC16 = xyes)
|
||||
if test "x$HW_SALEAE_LOGIC16" = "xyes"; then
|
||||
AC_DEFINE(HAVE_HW_SALEAE_LOGIC16, 1, [Saleae Logic16 support])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
|
||||
[enable serial DMM support [default=yes]]),
|
||||
[HW_SERIAL_DMM="$enableval"],
|
||||
|
|
@ -491,6 +500,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
|
|||
hardware/lascar-el-usb/Makefile
|
||||
hardware/mic-985xx/Makefile
|
||||
hardware/rigol-ds1xx2/Makefile
|
||||
hardware/saleae-logic16/Makefile
|
||||
hardware/tondaj-sl-814/Makefile
|
||||
hardware/victor-dmm/Makefile
|
||||
hardware/common/dmm/Makefile
|
||||
|
|
@ -558,6 +568,7 @@ echo " - link-mso19 (EXPERIMENTAL)....... $HW_LINK_MSO19"
|
|||
echo " - mic-985xx....................... $HW_MIC_985XX"
|
||||
echo " - openbench-logic-sniffer......... $HW_OLS"
|
||||
echo " - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2"
|
||||
echo " - saleae-logic16.................. $HW_SALEAE_LOGIC16"
|
||||
echo " - serial-dmm...................... $HW_SERIAL_DMM"
|
||||
echo " - tondaj-sl-814................... $HW_TONDAJ_SL_814"
|
||||
echo " - uni-t-dmm....................... $HW_UNI_T_DMM"
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ SUBDIRS = \
|
|||
mic-985xx \
|
||||
openbench-logic-sniffer \
|
||||
rigol-ds1xx2 \
|
||||
saleae-logic16 \
|
||||
serial-dmm \
|
||||
tondaj-sl-814 \
|
||||
uni-t-dmm \
|
||||
|
|
@ -134,6 +135,10 @@ if HW_RIGOL_DS1XX2
|
|||
libsigrokhardware_la_LIBADD += rigol-ds1xx2/libsigrok_hw_rigol_ds1xx2.la
|
||||
endif
|
||||
|
||||
if HW_SALEAE_LOGIC16
|
||||
libsigrokhardware_la_LIBADD += saleae-logic16/libsigrok_hw_saleae_logic16.la
|
||||
endif
|
||||
|
||||
if HW_SERIAL_DMM
|
||||
libsigrokhardware_la_LIBADD += serial-dmm/libsigrok_hw_serial_dmm.la
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
##
|
||||
## This file is part of the libsigrok project.
|
||||
##
|
||||
## Copyright (C) 2013 Marcus Comstedt <marcus@mc.pp.se>
|
||||
##
|
||||
## 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_SALEAE_LOGIC16
|
||||
|
||||
# Local lib, this is NOT meant to be installed!
|
||||
noinst_LTLIBRARIES = libsigrok_hw_saleae_logic16.la
|
||||
|
||||
libsigrok_hw_saleae_logic16_la_SOURCES = \
|
||||
api.c \
|
||||
protocol.c \
|
||||
protocol.h
|
||||
|
||||
libsigrok_hw_saleae_logic16_la_CFLAGS = \
|
||||
-I$(top_srcdir)
|
||||
|
||||
endif
|
||||
|
|
@ -0,0 +1,190 @@
|
|||
/*
|
||||
* This file is part of the libsigrok project.
|
||||
*
|
||||
* Copyright (C) 2013 Marcus Comstedt <marcus@mc.pp.se>
|
||||
*
|
||||
* 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 saleae_logic16_driver_info;
|
||||
static struct sr_dev_driver *di = &saleae_logic16_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)
|
||||
{
|
||||
struct drv_context *drvc;
|
||||
|
||||
drvc = di->priv;
|
||||
|
||||
return drvc->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)
|
||||
{
|
||||
int ret;
|
||||
|
||||
(void)sdi;
|
||||
(void)data;
|
||||
|
||||
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)
|
||||
{
|
||||
int ret;
|
||||
|
||||
(void)data;
|
||||
|
||||
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)
|
||||
{
|
||||
int ret;
|
||||
|
||||
(void)sdi;
|
||||
(void)data;
|
||||
|
||||
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 saleae_logic16_driver_info = {
|
||||
.name = "saleae-logic16",
|
||||
.longname = "Saleae Logic16",
|
||||
.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,
|
||||
};
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
/*
|
||||
* This file is part of the libsigrok project.
|
||||
*
|
||||
* Copyright (C) 2013 Marcus Comstedt <marcus@mc.pp.se>
|
||||
*
|
||||
* 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 saleae_logic16_receive_data(int fd, int revents, void *cb_data)
|
||||
{
|
||||
(void)fd;
|
||||
|
||||
const struct sr_dev_inst *sdi;
|
||||
struct dev_context *devc;
|
||||
|
||||
if (!(sdi = cb_data))
|
||||
return TRUE;
|
||||
|
||||
if (!(devc = sdi->priv))
|
||||
return TRUE;
|
||||
|
||||
if (revents == G_IO_IN) {
|
||||
/* TODO */
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
/*
|
||||
* This file is part of the libsigrok project.
|
||||
*
|
||||
* Copyright (C) 2013 Marcus Comstedt <marcus@mc.pp.se>
|
||||
*
|
||||
* 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_SALEAE_LOGIC16_PROTOCOL_H
|
||||
#define LIBSIGROK_HARDWARE_SALEAE_LOGIC16_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 "saleae-logic16: "
|
||||
#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
|
||||
#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
|
||||
#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
|
||||
#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
|
||||
#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
|
||||
#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
|
||||
|
||||
/** Private, per-device-instance driver context. */
|
||||
struct dev_context {
|
||||
/* Model-specific information */
|
||||
|
||||
/* Acquisition settings */
|
||||
|
||||
/* Operational state */
|
||||
|
||||
/* Temporary state across callbacks */
|
||||
|
||||
};
|
||||
|
||||
SR_PRIV int saleae_logic16_receive_data(int fd, int revents, void *cb_data);
|
||||
|
||||
#endif
|
||||
|
|
@ -139,6 +139,9 @@ extern SR_PRIV struct sr_dev_driver ols_driver_info;
|
|||
#ifdef HAVE_HW_RIGOL_DS1XX2
|
||||
extern SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;
|
||||
#endif
|
||||
#ifdef HAVE_HW_SALEAE_LOGIC16
|
||||
extern SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
|
||||
#endif
|
||||
#ifdef HAVE_HW_TONDAJ_SL_814
|
||||
extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
|
||||
#endif
|
||||
|
|
@ -249,6 +252,9 @@ static struct sr_dev_driver *drivers_list[] = {
|
|||
#ifdef HAVE_HW_RIGOL_DS1XX2
|
||||
&rigol_ds1xx2_driver_info,
|
||||
#endif
|
||||
#ifdef HAVE_HW_SALEAE_LOGIC16
|
||||
&saleae_logic16_driver_info,
|
||||
#endif
|
||||
#ifdef HAVE_HW_TONDAJ_SL_814
|
||||
&tondaj_sl_814_driver_info,
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue