rigol-ds1xx2: Initial driver skeleton.

This commit is contained in:
Martin Ling 2012-12-29 22:22:10 +01:00 committed by Uwe Hermann
parent aeabd30820
commit f4816ac6cc
7 changed files with 342 additions and 0 deletions

View File

@ -195,6 +195,15 @@ if test "x$LA_OLS" = "xyes"; then
AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
fi
AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2],
[enable Rigol DS1xx2 support [default=yes]]),
[HW_RIGOL_DS1XX2="$enableval"],
[HW_RIGOL_DS1XX2=yes])
AM_CONDITIONAL(HW_RIGOL_DS1XX2, test x$HW_RIGOL_DS1XX2 = xyes)
if test "x$HW_RIGOL_DS1XX2" = "xyes"; then
AC_DEFINE(HAVE_HW_RIGOL_DS1XX2, 1, [Rigol DS1xx2 support])
fi
AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
[enable serial DMM support [default=yes]]),
[HW_SERIAL_DMM="$enableval"],
@ -373,6 +382,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
hardware/common/Makefile
hardware/lascar-el-usb/Makefile
hardware/nexus-osciprime/Makefile
hardware/rigol-ds1xx2/Makefile
hardware/tondaj-sl-814/Makefile
hardware/victor-dmm/Makefile
hardware/common/dmm/Makefile
@ -429,6 +439,7 @@ echo " - Lascar EL-USB................... $HW_LASCAR_EL_USB"
echo " - Link MSO-19..................... $LA_LINK_MSO19"
echo " - Nexus Osciprime................. $HW_NEXUS_OSCIPRIME"
echo " - Openbench Logic Sniffer......... $LA_OLS"
echo " - Rigol DS1xx2.................... $HW_RIGOL_DS1XX2"
echo " - Serial DMM...................... $HW_SERIAL_DMM"
echo " - Tondaj SL-814................... $HW_TONDAJ_SL_814"
echo " - UNI-T DMM....................... $HW_UNI_T_DMM"

View File

@ -33,6 +33,7 @@ SUBDIRS = \
link-mso19 \
nexus-osciprime \
openbench-logic-sniffer \
rigol-ds1xx2 \
serial-dmm \
tondaj-sl-814 \
uni-t-dmm \
@ -98,6 +99,10 @@ if LA_OLS
libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la
endif
if HW_RIGOL_DS1XX2
libsigrokhardware_la_LIBADD += rigol-ds1xx2/libsigrok_hw_rigol_ds1xx2.la
endif
if HW_SERIAL_DMM
libsigrokhardware_la_LIBADD += serial-dmm/libsigrokhwserialdmm.la
endif

View File

@ -0,0 +1,33 @@
##
## This file is part of the libsigrok project.
##
## Copyright (C) 2012 Martin Ling <martin-git@earth.li>
##
## 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_RIGOL_DS1XX2
# Local lib, this is NOT meant to be installed!
noinst_LTLIBRARIES = libsigrok_hw_rigol_ds1xx2.la
libsigrok_hw_rigol_ds1xx2_la_SOURCES = \
api.c \
protocol.c \
protocol.h
libsigrok_hw_rigol_ds1xx2_la_CFLAGS = \
-I$(top_srcdir)
endif

192
hardware/rigol-ds1xx2/api.c Normal file
View File

@ -0,0 +1,192 @@
/*
* This file is part of the libsigrok project.
*
* Copyright (C) 2012 Martin Ling <martin-git@earth.li>
*
* 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 <glib.h>
#include "libsigrok.h"
#include "libsigrok-internal.h"
#include "protocol.h"
SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;
static struct sr_dev_driver *di = &rigol_ds1xx2_driver_info;
/* Properly close and free all devices. */
static int clear_instances(void)
{
struct sr_dev_inst *sdi;
struct drv_context *drvc;
struct dev_context *devc;
GSList *l;
if (!(drvc = di->priv))
return SR_OK;
for (l = drvc->instances; l; l = l->next) {
if (!(sdi = l->data))
continue;
if (!(devc = sdi->priv))
continue;
/* TODO */
sr_dev_inst_free(sdi);
}
g_slist_free(drvc->instances);
drvc->instances = NULL;
return SR_OK;
}
static int hw_init(void)
{
struct drv_context *drvc;
if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
sr_err("Driver context malloc failed.");
return SR_ERR_MALLOC;
}
/* TODO */
di->priv = drvc;
return SR_OK;
}
static GSList *hw_scan(GSList *options)
{
struct drv_context *drvc;
GSList *devices;
(void)options;
devices = NULL;
drvc = di->priv;
drvc->instances = NULL;
/* TODO */
return devices;
}
static GSList *hw_dev_list(void)
{
struct drv_context *drvc;
drvc = di->priv;
return drvc->instances;
}
static int hw_dev_open(struct sr_dev_inst *sdi)
{
/* TODO */
return SR_OK;
}
static int hw_dev_close(struct sr_dev_inst *sdi)
{
/* TODO */
return SR_OK;
}
static int hw_cleanup(void)
{
clear_instances();
/* TODO */
return SR_OK;
}
static int hw_info_get(int info_id, const void **data,
const struct sr_dev_inst *sdi)
{
switch (info_id) {
/* TODO */
default:
sr_err("Unknown info_id: %d.", info_id);
return SR_ERR_ARG;
}
return SR_OK;
}
static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
const void *value)
{
int ret;
if (sdi->status != SR_ST_ACTIVE) {
sr_err("Device inactive, can't set config options.");
return SR_ERR;
}
ret = SR_OK;
switch (hwcap) {
/* TODO */
default:
sr_err("Unknown hardware capability: %d.", hwcap);
ret = SR_ERR_ARG;
}
return ret;
}
static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{
/* TODO */
return SR_OK;
}
static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
(void)cb_data;
if (sdi->status != SR_ST_ACTIVE) {
sr_err("Device inactive, can't stop acquisition.");
return SR_ERR;
}
/* TODO */
return SR_OK;
}
SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info = {
.name = "rigol-ds1xx2",
.longname = "Rigol DS1xx2",
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
.scan = hw_scan,
.dev_list = hw_dev_list,
.dev_clear = clear_instances,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
.info_get = hw_info_get,
.dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
.priv = NULL,
};

View File

@ -0,0 +1,42 @@
/*
* This file is part of the libsigrok project.
*
* Copyright (C) 2012 Martin Ling <martin-git@earth.li>
*
* 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 <stdlib.h>
#include <glib.h>
#include "libsigrok.h"
#include "libsigrok-internal.h"
#include "protocol.h"
SR_PRIV int rigol_ds1xx2_receive_data(int fd, int revents, void *cb_data)
{
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;
}

View File

@ -0,0 +1,53 @@
/*
* This file is part of the libsigrok project.
*
* Copyright (C) 2012 Martin Ling <martin-git@earth.li>
*
* 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_RIGOL_DS1XX2_PROTOCOL_H
#define LIBSIGROK_HARDWARE_RIGOL_DS1XX2_PROTOCOL_H
#include <stdint.h>
#include "libsigrok.h"
#include "libsigrok-internal.h"
/* Message logging helpers with driver-specific prefix string. */
#define DRIVER_LOG_DOMAIN "rigol-ds1xx2: "
#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
/** Private, per-device-instance driver context. */
struct dev_context {
/** The current sampling limit (in number of samples). */
uint64_t limit_samples;
/** The current sampling limit (in ms). */
uint64_t limit_msec;
/** Opaque pointer passed in by the frontend. */
void *cb_data;
/** The current number of already received samples. */
uint64_t num_samples;
};
SR_PRIV int rigol_ds1xx2_receive_data(int fd, int revents, void *cb_data);
#endif

View File

@ -83,6 +83,9 @@ extern SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
#ifdef HAVE_LA_OLS
extern SR_PRIV struct sr_dev_driver ols_driver_info;
#endif
#ifdef HAVE_HW_RIGOL_DS1XX2
extern SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;
#endif
#ifdef HAVE_HW_TONDAJ_SL_814
extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
#endif
@ -154,6 +157,9 @@ static struct sr_dev_driver *drivers_list[] = {
#ifdef HAVE_LA_OLS
&ols_driver_info,
#endif
#ifdef HAVE_HW_RIGOL_DS1XX2
&rigol_ds1xx2_driver_info,
#endif
#ifdef HAVE_HW_TONDAJ_SL_814
&tondaj_sl_814_driver_info,
#endif