X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fchronovu-la%2Fapi.c;h=11721ebe6bbc72d0a6933ff8c880cd7eefa5f865;hb=2ea1fdf12113311cbe1a4316e9e2efe4d8ac40f0;hp=329b45bd305148165a68e6b1a647a9002a9c56e8;hpb=e32862ebccac5ae063abc68d9ce13a66ad46bb97;p=libsigrok.git
diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index 329b45bd..11721ebe 100644
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -14,8 +14,7 @@
* 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
@@ -61,20 +60,17 @@ static int dev_clear(const struct sr_dev_driver *di)
return std_dev_clear(di, clear_helper);
}
-static int add_device(struct sr_dev_driver *di, int model,
- struct libusb_device_descriptor *des, const char *serial_num,
- const char *connection_id, libusb_device *usbdev, GSList **devices)
+static int add_device(int model, struct libusb_device_descriptor *des,
+ 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));
@@ -116,7 +112,6 @@ static int add_device(struct sr_dev_driver *di, int model,
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++)
@@ -124,7 +119,6 @@ static int add_device(struct sr_dev_driver *di, int model,
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;
@@ -149,7 +143,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) {
@@ -225,7 +218,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), connection_id);
- if ((ret = add_device(di, model, &des, serial_num, connection_id,
+ if ((ret = add_device(model, &des, serial_num, connection_id,
devlist[i], &devices)) < 0) {
sr_dbg("Failed to add device: %d.", ret);
}
@@ -234,7 +227,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;
+ return std_scan_complete(di, devices);
}
static int dev_open(struct sr_dev_inst *sdi)
@@ -543,7 +536,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
sr_dbg("Hardware acquisition started successfully.");
- 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 +
@@ -561,12 +554,12 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
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,
@@ -584,3 +577,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);