X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=c68d6e0c2167347d68f30283b8f065066f741606;hb=c09f0b578c0e9c03590cb814f66004bb3f6815ff;hp=554dc5df2b05e549c089c35a848e70ac4c013116;hpb=6f1be0a2d40b3998abd8d10b5479e4538bc4ff1e;p=libsigrok.git diff --git a/hwplugin.c b/hwplugin.c index 554dc5df..c68d6e0c 100644 --- a/hwplugin.c +++ b/hwplugin.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2010 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * * 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 @@ -17,156 +17,208 @@ * along with this program. If not, see . */ -#include "config.h" #include #include #include #include #include #include -#include - -/* The list of loaded plugins lives here. */ -GSList *plugins; +#include "sigrok.h" +#include "sigrok-internal.h" /* - * This enumerates which plugin capabilities correspond to user-settable + * This enumerates which driver capabilities correspond to user-settable * options. */ /* TODO: This shouldn't be a global. */ -struct sr_hwcap_option sr_hwcap_options[] = { +SR_API struct sr_hwcap_option sr_hwcap_options[] = { {SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"}, {SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"}, {SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"}, + {SR_HWCAP_RLE, SR_T_BOOL, "Run Length Encoding", "rle"}, {0, 0, NULL, NULL}, }; #ifdef HAVE_LA_DEMO -extern struct sr_device_plugin demo_plugin_info; +extern SR_PRIV struct sr_dev_driver demo_driver_info; #endif #ifdef HAVE_LA_SALEAE_LOGIC -extern struct sr_device_plugin saleae_logic_plugin_info; +extern SR_PRIV struct sr_dev_driver saleae_logic_driver_info; #endif #ifdef HAVE_LA_OLS -extern struct sr_device_plugin ols_plugin_info; +extern SR_PRIV struct sr_dev_driver ols_driver_info; #endif #ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE -extern struct sr_device_plugin zeroplus_logic_cube_plugin_info; +extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info; #endif #ifdef HAVE_LA_ASIX_SIGMA -extern struct sr_device_plugin asix_sigma_plugin_info; +extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info; +#endif +#ifdef HAVE_LA_CHRONOVU_LA8 +extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info; #endif #ifdef HAVE_LA_LINK_MSO19 -extern struct sr_device_plugin link_mso19_plugin_info; +extern SR_PRIV struct sr_dev_driver link_mso19_driver_info; #endif #ifdef HAVE_LA_ALSA -extern struct sr_device_plugin alsa_plugin_info; +extern SR_PRIV struct sr_dev_driver alsa_driver_info; +#endif +#ifdef HAVE_LA_FX2LAFW +extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info; #endif - -/* TODO: No linked list needed, this can be a simple array. */ -int load_hwplugins(void) -{ +static struct sr_dev_driver *drivers_list[] = { #ifdef HAVE_LA_DEMO - plugins = g_slist_append(plugins, (gpointer *)&demo_plugin_info); + &demo_driver_info, #endif #ifdef HAVE_LA_SALEAE_LOGIC - plugins = - g_slist_append(plugins, (gpointer *)&saleae_logic_plugin_info); + &saleae_logic_driver_info, #endif #ifdef HAVE_LA_OLS - plugins = g_slist_append(plugins, (gpointer *)&ols_plugin_info); + &ols_driver_info, #endif #ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE - plugins = g_slist_append(plugins, - (gpointer *)&zeroplus_logic_cube_plugin_info); + &zeroplus_logic_cube_driver_info, #endif #ifdef HAVE_LA_ASIX_SIGMA - plugins = g_slist_append(plugins, (gpointer *)&asix_sigma_plugin_info); + &asix_sigma_driver_info, +#endif +#ifdef HAVE_LA_CHRONOVU_LA8 + &chronovu_la8_driver_info, #endif #ifdef HAVE_LA_LINK_MSO19 - plugins = g_slist_append(plugins, (gpointer *)&link_mso19_plugin_info); + &link_mso19_driver_info, #endif #ifdef HAVE_LA_ALSA - plugins = g_slist_append(plugins, (gpointer *)&alsa_plugin_info); + &alsa_driver_info, +#endif +#ifdef HAVE_LA_FX2LAFW + &fx2lafw_driver_info, #endif + NULL, +}; + +/** + * Return the list of loaded hardware drivers. + * + * The list of drivers is initialized from sr_init(), and can only be reset + * by calling sr_exit(). + * + * @return Pointer to the NULL-terminated list of hardware driver pointers. + */ +SR_API struct sr_dev_driver **sr_hw_list(void) +{ + return drivers_list; +} +/** + * Initialize a hardware driver. + * + * The specified driver is initialized, and all devices discovered by the + * driver are instantiated. + * + * @param driver The driver to initialize. + * + * @return The number of devices found and instantiated by the driver. + */ +SR_API int sr_hw_init(struct sr_dev_driver *driver) +{ + int num_devs, num_probes, i, j; + int num_initialized_devs = 0; + struct sr_dev *dev; + char **probe_names; + + sr_dbg("initializing %s driver", driver->name); + num_devs = driver->init(NULL); + for (i = 0; i < num_devs; i++) { + num_probes = GPOINTER_TO_INT( + driver->dev_info_get(i, SR_DI_NUM_PROBES)); + probe_names = (char **)driver->dev_info_get(i, + SR_DI_PROBE_NAMES); + + if (!probe_names) { + sr_warn("hwdriver: %s: driver %s does not return a " + "list of probe names", __func__, driver->name); + continue; + } + + dev = sr_dev_new(driver, i); + for (j = 0; j < num_probes; j++) + sr_dev_probe_add(dev, probe_names[j]); + num_initialized_devs++; + } - return SR_OK; + return num_initialized_devs; } -GSList *list_hwplugins(void) +SR_PRIV void sr_hw_cleanup_all(void) { - return plugins; + int i; + struct sr_dev_driver **drivers; + + drivers = sr_hw_list(); + for (i = 0; drivers[i]; i++) { + if (drivers[i]->cleanup) + drivers[i]->cleanup(); + } } -struct sr_device_instance *sr_device_instance_new(int index, int status, +SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status, const char *vendor, const char *model, const char *version) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; - if (!(sdi = malloc(sizeof(struct sr_device_instance)))) + if (!(sdi = g_try_malloc(sizeof(struct sr_dev_inst)))) { + sr_err("hwdriver: %s: sdi malloc failed", __func__); return NULL; + } sdi->index = index; sdi->status = status; - sdi->instance_type = -1; - sdi->vendor = vendor ? strdup(vendor) : strdup("(unknown)"); - sdi->model = model ? strdup(model) : NULL; - sdi->version = version ? strdup(version) : NULL; + sdi->inst_type = -1; + sdi->vendor = vendor ? g_strdup(vendor) : NULL; + sdi->model = model ? g_strdup(model) : NULL; + sdi->version = version ? g_strdup(version) : NULL; sdi->priv = NULL; - sdi->usb = NULL; return sdi; } -struct sr_device_instance *sr_get_device_instance(GSList *device_instances, - int device_index) +SR_PRIV struct sr_dev_inst *sr_dev_inst_get(GSList *dev_insts, int dev_index) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; GSList *l; - for (l = device_instances; l; l = l->next) { - sdi = (struct sr_device_instance *)(l->data); - if (sdi->index == device_index) + for (l = dev_insts; l; l = l->next) { + sdi = (struct sr_dev_inst *)(l->data); + if (sdi->index == dev_index) return sdi; } - g_warning("could not find device index %d instance", device_index); + sr_warn("could not find device index %d instance", dev_index); return NULL; } -void sr_device_instance_free(struct sr_device_instance *sdi) +SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi) { - switch (sdi->instance_type) { -#ifdef HAVE_LIBUSB_1_0 - case SR_USB_INSTANCE: - sr_usb_device_instance_free(sdi->usb); - break; -#endif - case SR_SERIAL_INSTANCE: - sr_serial_device_instance_free(sdi->serial); - break; - default: - /* No specific type, nothing extra to free. */ - break; - } - - free(sdi->vendor); - free(sdi->model); - free(sdi->version); - free(sdi); + g_free(sdi->priv); + g_free(sdi->vendor); + g_free(sdi->model); + g_free(sdi->version); + g_free(sdi); } #ifdef HAVE_LIBUSB_1_0 -struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus, +SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus, uint8_t address, struct libusb_device_handle *hdl) { - struct sr_usb_device_instance *udi; + struct sr_usb_dev_inst *udi; - if (!(udi = malloc(sizeof(struct sr_usb_device_instance)))) + if (!(udi = g_try_malloc(sizeof(struct sr_usb_dev_inst)))) { + sr_err("hwdriver: %s: udi malloc failed", __func__); return NULL; + } udi->bus = bus; udi->address = address; @@ -175,53 +227,72 @@ struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus, return udi; } -void sr_usb_device_instance_free(struct sr_usb_device_instance *usb) +SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb) { /* Avoid compiler warnings. */ - usb = usb; + (void)usb; /* Nothing to do for this device instance type. */ } #endif -struct sr_serial_device_instance *sr_serial_device_instance_new( - const char *port, int fd) +SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port, + int fd) { - struct sr_serial_device_instance *serial; + struct sr_serial_dev_inst *serial; - if (!(serial = malloc(sizeof(struct sr_serial_device_instance)))) + if (!(serial = g_try_malloc(sizeof(struct sr_serial_dev_inst)))) { + sr_err("hwdriver: %s: serial malloc failed", __func__); return NULL; + } - serial->port = strdup(port); + serial->port = g_strdup(port); serial->fd = fd; return serial; } -void sr_serial_device_instance_free(struct sr_serial_device_instance *serial) +SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial) { - free(serial->port); + g_free(serial->port); } -int sr_find_hwcap(int *capabilities, int hwcap) +/** + * Find out if a hardware driver has a specific capability. + * + * @param driver The hardware driver in which to search for the capability. + * @param hwcap The capability to find in the list. + * + * @return TRUE if found, FALSE otherwise. + */ +SR_API gboolean sr_hw_has_hwcap(struct sr_dev_driver *driver, int hwcap) { - int i; + int *hwcaps, i; - for (i = 0; capabilities[i]; i++) { - if (capabilities[i] == hwcap) + hwcaps = driver->hwcap_get_all(); + for (i = 0; hwcaps[i]; i++) { + if (hwcaps[i] == hwcap) return TRUE; } return FALSE; } -struct sr_hwcap_option *sr_find_hwcap_option(int hwcap) +/** + * Get a hardware driver capability option. + * + * @param hwcap The capability to get. + * + * @return A pointer to a struct with information about the parameter, or NULL + * if the capability was not found. + */ +SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap) { int i; - for (i = 0; sr_hwcap_options[i].capability; i++) { - if (sr_hwcap_options[i].capability == hwcap) + for (i = 0; sr_hwcap_options[i].hwcap; i++) { + if (sr_hwcap_options[i].hwcap == hwcap) return &sr_hwcap_options[i]; } @@ -230,13 +301,13 @@ struct sr_hwcap_option *sr_find_hwcap_option(int hwcap) /* unnecessary level of indirection follows. */ -void sr_source_remove(int fd) +SR_PRIV void sr_source_remove(int fd) { sr_session_source_remove(fd); } -void sr_source_add(int fd, int events, int timeout, - receive_data_callback rcv_cb, void *user_data) +SR_PRIV void sr_source_add(int fd, int events, int timeout, + sr_receive_data_callback rcv_cb, void *user_data) { sr_session_source_add(fd, events, timeout, rcv_cb, user_data); }