X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=0ffd6f2eeae77e17bbf0d86046b42771917d6a30;hb=a0ecd83bc6e07ea412db5cd0108d50d89e36df8f;hp=b10164693f52adec61d8a8f457587c255055d0d1;hpb=22b02383442ec55a11cc6dd2b4c467d1de0b5bd2;p=libsigrok.git diff --git a/hwplugin.c b/hwplugin.c index b1016469..0ffd6f2e 100644 --- a/hwplugin.c +++ b/hwplugin.c @@ -25,18 +25,21 @@ #include #include #include +#include /* The list of loaded plugins lives here. */ -GSList *plugins; +static GSList *plugins; /* * This enumerates which plugin capabilities correspond to user-settable * options. */ -struct hwcap_option hwcap_options[] = { +/* TODO: This shouldn't be a global. */ +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}, }; @@ -55,6 +58,9 @@ extern struct sr_device_plugin zeroplus_logic_cube_plugin_info; #ifdef HAVE_LA_ASIX_SIGMA extern struct sr_device_plugin asix_sigma_plugin_info; #endif +#ifdef HAVE_LA_CHRONOVU_LA8 +extern struct device_plugin chronovu_la8_plugin_info; +#endif #ifdef HAVE_LA_LINK_MSO19 extern struct sr_device_plugin link_mso19_plugin_info; #endif @@ -62,7 +68,6 @@ extern struct sr_device_plugin link_mso19_plugin_info; extern struct sr_device_plugin alsa_plugin_info; #endif - /* TODO: No linked list needed, this can be a simple array. */ int load_hwplugins(void) { @@ -83,6 +88,9 @@ int load_hwplugins(void) #ifdef HAVE_LA_ASIX_SIGMA plugins = g_slist_append(plugins, (gpointer *)&asix_sigma_plugin_info); #endif +#ifdef HAVE_LA_CHRONOVU_LA8 + plugins = g_slist_append(plugins, (gpointer *)&chronovu_la8_plugin_info); +#endif #ifdef HAVE_LA_LINK_MSO19 plugins = g_slist_append(plugins, (gpointer *)&link_mso19_plugin_info); #endif @@ -90,29 +98,55 @@ int load_hwplugins(void) plugins = g_slist_append(plugins, (gpointer *)&alsa_plugin_info); #endif - return SR_OK; } -GSList *list_hwplugins(void) +GSList *sr_list_hwplugins(void) { return plugins; } +int sr_init_hwplugins(struct sr_device_plugin *plugin) +{ + int num_devices, num_probes, i; + + g_message("initializing %s plugin", plugin->name); + num_devices = plugin->init(NULL); + for (i = 0; i < num_devices; i++) { + num_probes = GPOINTER_TO_INT( + plugin->get_device_info(i, SR_DI_NUM_PROBES)); + sr_device_new(plugin, i, num_probes); + } + + return num_devices; +} + +void sr_cleanup_hwplugins(void) +{ + struct sr_device_plugin *plugin; + GSList *l; + + for (l = plugins; l; l = l->next) { + plugin = l->data; + if (plugin->cleanup) + plugin->cleanup(); + } +} + struct sr_device_instance *sr_device_instance_new(int index, int status, const char *vendor, const char *model, const char *version) { struct sr_device_instance *sdi; - if (!(sdi = malloc(sizeof(struct sr_device_instance)))) + if (!(sdi = g_malloc(sizeof(struct sr_device_instance)))) 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->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; @@ -130,7 +164,7 @@ struct sr_device_instance *sr_get_device_instance(GSList *device_instances, if (sdi->index == device_index) return sdi; } - g_warning("could not find device index %d instance", device_index); + sr_warn("could not find device index %d instance", device_index); return NULL; } @@ -151,10 +185,13 @@ void sr_device_instance_free(struct sr_device_instance *sdi) break; } - free(sdi->vendor); - free(sdi->model); - free(sdi->version); - free(sdi); + if (sdi->priv) + g_free(sdi->priv); + + g_free(sdi->vendor); + g_free(sdi->model); + g_free(sdi->version); + g_free(sdi); } #ifdef HAVE_LIBUSB_1_0 @@ -177,7 +214,7 @@ struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus, void sr_usb_device_instance_free(struct sr_usb_device_instance *usb) { /* Avoid compiler warnings. */ - usb = usb; + (void)usb; /* Nothing to do for this device instance type. */ } @@ -203,7 +240,7 @@ void sr_serial_device_instance_free(struct sr_serial_device_instance *serial) free(serial->port); } -int find_hwcap(int *capabilities, int hwcap) +int sr_find_hwcap(int *capabilities, int hwcap) { int i; @@ -215,13 +252,13 @@ int find_hwcap(int *capabilities, int hwcap) return FALSE; } -struct hwcap_option *find_hwcap_option(int hwcap) +struct sr_hwcap_option *sr_find_hwcap_option(int hwcap) { int i; - for (i = 0; hwcap_options[i].capability; i++) { - if (hwcap_options[i].capability == hwcap) - return &hwcap_options[i]; + for (i = 0; sr_hwcap_options[i].capability; i++) { + if (sr_hwcap_options[i].capability == hwcap) + return &sr_hwcap_options[i]; } return NULL; @@ -229,17 +266,13 @@ struct hwcap_option *find_hwcap_option(int hwcap) /* unnecessary level of indirection follows. */ -void source_remove(int fd) +void sr_source_remove(int fd) { - - session_source_remove(fd); - + sr_session_source_remove(fd); } -void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb, - void *user_data) +void sr_source_add(int fd, int events, int timeout, + sr_receive_data_callback rcv_cb, void *user_data) { - - session_source_add(fd, events, timeout, rcv_cb, user_data); - + sr_session_source_add(fd, events, timeout, rcv_cb, user_data); }