summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
inline | side by side (from parent 1:
c0eea11)
Check the relevant arguments for != NULL before calling the actual
driver-specific function, so that the driver can safely assume those
arguments are non-NULL. This removes the need to duplicate these
checks in every driver.
Also, do some minor whitespace and consistency improvements.
13 files changed:
(void)options;
drvc = di->priv;
(void)options;
drvc = di->priv;
clear_instances();
if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
clear_instances();
if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
(void)options;
drvc = di->priv;
(void)options;
drvc = di->priv;
devices = NULL;
/* Allocate memory for our private device context. */
devices = NULL;
/* Allocate memory for our private device context. */
devices = g_slist_append(devices, sdi);
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
drvc->instances = g_slist_append(drvc->instances, sdi);
- sr_spew("Device init successful.");
-
/* Close device. We'll reopen it again when we need it. */
(void) la8_close(devc); /* Log, but ignore errors. */
/* Close device. We'll reopen it again when we need it. */
(void) la8_close(devc); /* Log, but ignore errors. */
GSList *devices, *l;
const char *conn, *serialcomm;
GSList *devices, *l;
const char *conn, *serialcomm;
drvc = di->priv;
drvc->instances = NULL;
drvc = di->priv;
drvc->instances = NULL;
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
src = l->data;
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
src = l->data;
return NULL;
if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
return NULL;
if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
- sr_dbg("failed to malloc devc");
+ sr_dbg("Device context malloc failed.");
(void)options;
drvc = di->priv;
(void)options;
drvc = di->priv;
devices = NULL;
sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
devices = NULL;
sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
- devcnt = 0;
- devices = 0;
drvc = di->priv;
drvc->instances = NULL;
drvc = di->priv;
drvc->instances = NULL;
+ devcnt = 0;
+ devices = 0;
+
clear_instances();
/* Find all Hantek DSO devices and upload firmware to all of them. */
clear_instances();
/* Find all Hantek DSO devices and upload firmware to all of them. */
- if (!(drvc = di->priv)) {
- sr_err("Driver was not initialized.");
- return NULL;
- }
/* USB scan is always authoritative. */
clear_instances();
/* USB scan is always authoritative. */
clear_instances();
- if (!(drvc = di->priv)) {
- sr_err("Driver was not initialized.");
- return NULL;
- }
/* USB scan is always authoritative. */
clear_instances();
/* USB scan is always authoritative. */
clear_instances();
char buf[8];
(void)options;
char buf[8];
(void)options;
devices = NULL;
conn = serialcomm = NULL;
devices = NULL;
conn = serialcomm = NULL;
drvc = di->priv;
drvc->instances = NULL;
drvc = di->priv;
drvc->instances = NULL;
dir = g_dir_open("/sys/class/usb/", 0, NULL);
if (dir == NULL)
dir = g_dir_open("/sys/class/usb/", 0, NULL);
if (dir == NULL)
GSList *devices, *l;
const char *conn, *serialcomm;
GSList *devices, *l;
const char *conn, *serialcomm;
drvc = di->priv;
drvc->instances = NULL;
drvc = di->priv;
drvc->instances = NULL;
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
if (!(src = l->data)) {
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
if (!(src = l->data)) {
- if (!(drvc = di->priv)) {
- sr_err("Driver was not initialized.");
- return NULL;
- }
/* USB scan is always authoritative. */
clear_instances();
/* USB scan is always authoritative. */
clear_instances();
(void)options;
drvc = di->priv;
(void)options;
drvc = di->priv;
devices = NULL;
clear_instances();
devices = NULL;
clear_instances();
* The order in which the system is scanned for devices is not specified. The
* caller should not assume or rely on any specific order.
*
* The order in which the system is scanned for devices is not specified. The
* caller should not assume or rely on any specific order.
*
- * @param driver The driver.
- * @param options A list of struct sr_hwopt options to pass to the driver's
- * scanner.
+ * Before calling sr_driver_scan(), the user must have previously initialized
+ * the driver by calling sr_driver_init().
- * @return A GSList * of struct sr_dev_inst, or NULL if no devices were found.
- * This list must be freed by the caller, but without freeing the data
- * pointed to in the list.
+ * @param driver The driver that should scan. This must be a pointer to one of
+ * the entries returned by sr_driver_list(). Must not be NULL.
+ * @param options A list of 'struct sr_hwopt' options to pass to the driver's
+ * scanner. Can be NULL/empty.
+ *
+ * @return A GSList * of 'struct sr_dev_inst', or NULL if no devices were
+ * found (or errors were encountered). This list must be freed by the
+ * caller using g_slist_free(), but without freeing the data pointed
+ * to in the list.
*/
SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
{
*/
SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
{
- if (driver->scan)
- return driver->scan(options);
+ if (!driver) {
+ sr_err("Invalid driver, can't scan for devices.");
+ return NULL;
+ }
+ if (!driver->priv) {
+ sr_err("Driver not initialized, can't scan for devices.");
+ return NULL;
+ }
+
+ l = driver->scan(options);
+
+ sr_spew("Scan of '%s' found %d devices.", driver->name,
+ g_slist_length(l));
+
+ return l;