X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fchronovu-la%2Fapi.c;h=0c94b398586629a57659310720cdfa5acc0b4e7e;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=5914ef21d4ca3faf812d01bf47b3f78d1f464a76;hpb=208c1d35435626a11afa1ab301b2071b2a4e187b;p=libsigrok.git
diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index 5914ef21..0c94b398 100644
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -14,16 +14,12 @@
* 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
#include "protocol.h"
-SR_PRIV struct sr_dev_driver chronovu_la_driver_info;
-static struct sr_dev_driver *di = &chronovu_la_driver_info;
-
static const uint32_t drvopts[] = {
SR_CONF_LOGIC_ANALYZER,
};
@@ -47,8 +43,6 @@ static const int32_t trigger_matches[] = {
SR_TRIGGER_FALLING,
};
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
-
static void clear_helper(void *priv)
{
struct dev_context *devc;
@@ -64,25 +58,17 @@ static int dev_clear(const struct sr_dev_driver *di)
return std_dev_clear(di, clear_helper);
}
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
static int add_device(int model, struct libusb_device_descriptor *des,
- const char *serial_num, const char *connection_id,
- libusb_device *usbdev, GSList **devices)
+ const char *serial_num, const char *connection_id, libusb_device *usbdev,
+ GSList **devices)
{
int ret;
unsigned int i;
struct sr_dev_inst *sdi;
- struct drv_context *drvc;
struct dev_context *devc;
ret = SR_OK;
- drvc = di->context;
-
/* Allocate memory for our private device context. */
devc = g_malloc0(sizeof(struct dev_context));
@@ -92,7 +78,6 @@ static int add_device(int model, struct libusb_device_descriptor *des,
devc->cur_samplerate = 0; /* Set later (different for LA8/LA16). */
devc->limit_msec = 0;
devc->limit_samples = 0;
- devc->cb_data = NULL;
memset(devc->mangled_buf, 0, BS);
devc->final_buf = NULL;
devc->trigger_pattern = 0x0000; /* Irrelevant, see trigger_mask. */
@@ -118,14 +103,13 @@ static int add_device(int model, struct libusb_device_descriptor *des,
/* Register the device with libsigrok. */
sdi = g_malloc0(sizeof(struct sr_dev_inst));
- sdi->status = SR_ST_INITIALIZING;
+ sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup("ChronoVu");
sdi->model = g_strdup(devc->prof->modelname);
sdi->serial_num = g_strdup(serial_num);
sdi->connection_id = g_strdup(connection_id);
sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(usbdev),
libusb_get_device_address(usbdev), NULL);
- sdi->driver = di;
sdi->priv = devc;
for (i = 0; i < devc->prof->num_channels; i++)
@@ -133,7 +117,6 @@ static int add_device(int model, struct libusb_device_descriptor *des,
cv_channel_names[i]);
*devices = g_slist_append(*devices, sdi);
- drvc->instances = g_slist_append(drvc->instances, sdi);
if (ret == SR_OK)
return SR_OK;
@@ -158,7 +141,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
char product[64], serial_num[64], connection_id[64];
drvc = di->context;
- drvc->instances = NULL;
conn = NULL;
for (l = options; l; l = l->next) {
@@ -243,12 +225,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
libusb_free_device_list(devlist, 1);
g_slist_free_full(conn_devices, (GDestroyNotify)sr_usb_dev_inst_free);
- return devices;
-}
-
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
- return ((struct drv_context *)(di->context))->instances;
+ return std_scan_complete(di, devices);
}
static int dev_open(struct sr_dev_inst *sdi)
@@ -256,8 +233,7 @@ static int dev_open(struct sr_dev_inst *sdi)
struct dev_context *devc;
int ret;
- if (!(devc = sdi->priv))
- return SR_ERR_BUG;
+ devc = sdi->priv;
/* Allocate memory for the FTDI context and initialize it. */
if (!(devc->ftdic = ftdi_new())) {
@@ -296,15 +272,12 @@ static int dev_open(struct sr_dev_inst *sdi)
/* Wait 100ms. */
g_usleep(100 * 1000);
- sdi->status = SR_ST_ACTIVE;
-
- if (ret == SR_OK)
- return SR_OK;
+ return SR_OK;
err_ftdi_free:
ftdi_free(devc->ftdic); /* Close device (if open), free FTDI context. */
devc->ftdic = NULL;
- return ret;
+ return SR_ERR;
}
static int dev_close(struct sr_dev_inst *sdi)
@@ -312,22 +285,16 @@ static int dev_close(struct sr_dev_inst *sdi)
int ret;
struct dev_context *devc;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_OK;
-
devc = sdi->priv;
- if (devc->ftdic && (ret = ftdi_usb_close(devc->ftdic)) < 0)
+ if (!devc->ftdic)
+ return SR_ERR_BUG;
+
+ if ((ret = ftdi_usb_close(devc->ftdic)) < 0)
sr_err("Failed to close FTDI device (%d): %s.",
ret, ftdi_get_error_string(devc->ftdic));
- sdi->status = SR_ST_INACTIVE;
-
- return SR_OK;
-}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
+ return (ret == 0) ? SR_OK : SR_ERR;
}
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -347,8 +314,9 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
*data = g_variant_new_string(str);
break;
case SR_CONF_SAMPLERATE:
- if (!sdi || !(devc = sdi->priv))
+ if (!sdi)
return SR_ERR_BUG;
+ devc = sdi->priv;
*data = g_variant_new_uint64(devc->cur_samplerate);
break;
default:
@@ -365,11 +333,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
(void)cg;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
- if (!(devc = sdi->priv))
- return SR_ERR_BUG;
+ devc = sdi->priv;
switch (key) {
case SR_CONF_SAMPLERATE:
@@ -416,8 +380,9 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
break;
case SR_CONF_SAMPLERATE:
- if (!sdi || !sdi->priv || !(devc = sdi->priv))
+ if (!sdi)
return SR_ERR_BUG;
+ devc = sdi->priv;
cv_fill_samplerates_if_needed(sdi);
g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
@@ -478,7 +443,7 @@ static int receive_data(int fd, int revents, void *cb_data)
/* Get one block of data. */
if ((ret = cv_read_block(devc)) < 0) {
sr_err("Failed to read data block: %d.", ret);
- dev_acquisition_stop(sdi, sdi);
+ sr_dev_acquisition_stop(sdi);
return FALSE;
}
@@ -499,22 +464,19 @@ static int receive_data(int fd, int revents, void *cb_data)
* full 8MByte first, only then the whole buffer contains valid data.
*/
for (i = 0; i < NUM_BLOCKS; i++)
- cv_send_block_to_session_bus(devc, i);
+ cv_send_block_to_session_bus(sdi, i);
- dev_acquisition_stop(sdi, sdi);
+ sr_dev_acquisition_stop(sdi);
return TRUE;
}
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
uint8_t buf[8];
int bytes_to_write, bytes_written;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
devc = sdi->priv;
if (!devc->ftdic) {
@@ -562,9 +524,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
sr_dbg("Hardware acquisition started successfully.");
- devc->cb_data = cb_data;
-
- std_session_send_df_header(sdi, LOG_PREFIX);
+ std_session_send_df_header(sdi);
/* Time when we should be done (for detecting trigger timeouts). */
devc->done = (devc->divcount + 1) * devc->prof->trigger_constant +
@@ -578,25 +538,22 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
- (void)cb_data;
-
- sr_dbg("Stopping acquisition.");
sr_session_source_remove(sdi->session, -1);
- std_session_send_df_end(sdi, LOG_PREFIX);
+ std_session_send_df_end(sdi);
return SR_OK;
}
-SR_PRIV struct sr_dev_driver chronovu_la_driver_info = {
+static struct sr_dev_driver chronovu_la_driver_info = {
.name = "chronovu-la",
.longname = "ChronoVu LA8/LA16",
.api_version = 1,
- .init = init,
- .cleanup = cleanup,
+ .init = std_init,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
+ .dev_list = std_dev_list,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
@@ -607,3 +564,4 @@ SR_PRIV struct sr_dev_driver chronovu_la_driver_info = {
.dev_acquisition_stop = dev_acquisition_stop,
.context = NULL,
};
+SR_REGISTER_DEV_DRIVER(chronovu_la_driver_info);