X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fftdi-la%2Fapi.c;h=34f79bf71b71d0066621a422f3cfa45b27a756b5;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;hp=c258be14e2da2c66526ceea01d6aab8ad8ebc1c6;hpb=1f8f5bc08e0f684156baac513431b40d79ab4ea1;p=libsigrok.git diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c index c258be14..34f79bf7 100644 --- a/src/hardware/ftdi-la/api.c +++ b/src/hardware/ftdi-la/api.c @@ -24,8 +24,6 @@ #include "libsigrok-internal.h" #include "protocol.h" -SR_PRIV struct sr_dev_driver ftdi_la_driver_info; - static const uint32_t scanopts[] = { SR_CONF_CONN, }; @@ -84,11 +82,6 @@ static const struct ftdi_chip_desc *chip_descs[] = { &ft232r_desc, }; -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(di, sr_ctx, LOG_PREFIX); -} - static void scan_device(struct sr_dev_driver *di, struct libusb_device *dev, GSList **devices) { struct libusb_device_descriptor usb_desc; @@ -153,7 +146,7 @@ static void scan_device(struct sr_dev_driver *di, struct libusb_device *dev, GSL /* 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 = vendor; sdi->model = model; sdi->serial_num = serial_num; @@ -487,11 +480,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) return SR_OK; } -SR_PRIV struct sr_dev_driver ftdi_la_driver_info = { +static struct sr_dev_driver ftdi_la_driver_info = { .name = "ftdi-la", .longname = "FTDI LA", .api_version = 1, - .init = init, + .init = std_init, .cleanup = std_cleanup, .scan = scan, .dev_list = std_dev_list, @@ -505,3 +498,4 @@ SR_PRIV struct sr_dev_driver ftdi_la_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(ftdi_la_driver_info);