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_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "pattern"},
{SR_HWCAP_RLE, SR_T_BOOL, "Run Length Encoding", "rle"},
{0, 0, NULL, NULL},
};
#ifdef HAVE_LA_DEMO
extern SR_PRIV struct sr_dev_driver demo_driver_info;
#endif
-#ifdef HAVE_LA_SALEAE_LOGIC
-extern SR_PRIV struct sr_dev_driver saleae_logic_driver_info;
-#endif
#ifdef HAVE_LA_OLS
extern SR_PRIV struct sr_dev_driver ols_driver_info;
#endif
#ifdef HAVE_LA_FX2LAFW
extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
#endif
+#ifdef HAVE_HW_HANTEK_DSO
+extern SR_PRIV struct sr_dev_driver hantek_dso_plugin_info;
+#endif
static struct sr_dev_driver *drivers_list[] = {
#ifdef HAVE_LA_DEMO
&demo_driver_info,
#endif
-#ifdef HAVE_LA_SALEAE_LOGIC
- &saleae_logic_driver_info,
-#endif
#ifdef HAVE_LA_OLS
&ols_driver_info,
#endif
#endif
#ifdef HAVE_LA_FX2LAFW
&fx2lafw_driver_info,
+#endif
+#ifdef HAVE_HW_HANTEK_DSO
+ &hantek_dso_plugin_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 the list of supported hardware drivers.
*
* @return Pointer to the NULL-terminated list of hardware driver pointers.
*/
-SR_API struct sr_dev_driver **sr_hw_list(void)
+SR_API struct sr_dev_driver **sr_driver_list(void)
{
return drivers_list;
}
*
* @return The number of devices found and instantiated by the driver.
*/
-SR_API int sr_hw_init(struct sr_dev_driver *driver)
+SR_API int sr_driver_init(struct sr_dev_driver *driver)
{
int num_devs, num_probes, i, j;
int num_initialized_devs = 0;
int i;
struct sr_dev_driver **drivers;
- drivers = sr_hw_list();
+ drivers = sr_driver_list();
for (i = 0; drivers[i]; i++) {
if (drivers[i]->cleanup)
drivers[i]->cleanup();
* FALSE otherwise. Also, if 'driver' is NULL or the respective driver
* returns an invalid capability list, FALSE is returned.
*/
-SR_API gboolean sr_hw_has_hwcap(struct sr_dev_driver *driver, int hwcap)
+SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap)
{
int *hwcaps, i;
return NULL;
}
-/* unnecessary level of indirection follows. */
+/* Unnecessary level of indirection follows. */
-SR_PRIV void sr_source_remove(int fd)
+SR_PRIV int sr_source_remove(int fd)
{
- sr_session_source_remove(fd);
+ return sr_session_source_remove(fd);
}
-SR_PRIV void sr_source_add(int fd, int events, int timeout,
- sr_receive_data_callback rcv_cb, void *user_data)
+SR_PRIV int sr_source_add(int fd, int events, int timeout,
+ sr_receive_data_callback_t cb, void *cb_data)
{
- sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
+ return sr_session_source_add(fd, events, timeout, cb, cb_data);
}