From: Bert Vermeulen Date: Sun, 22 Jul 2012 17:44:20 +0000 (+0200) Subject: sr: remove dead/obsolete code X-Git-Tag: dsupstream~769 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=a10ddf9ba04429d6762171a3bbbac12a7717ef59 sr: remove dead/obsolete code --- diff --git a/device.c b/device.c index 3f0b60d0..566a665d 100644 --- a/device.c +++ b/device.c @@ -22,216 +22,6 @@ #include "libsigrok.h" #include "libsigrok-internal.h" -static GSList *devs = NULL; - -/** - * Scan the system for attached logic analyzers / devices. - * - * This will try to autodetect all supported logic analyzer devices: - * - * - Those attached via USB (can be reliably detected via USB VID/PID). - * - * - Those using a (real or virtual) serial port (detected by sending - * device-specific commands to all OS-specific serial port devices such - * as /dev/ttyS*, /dev/ttyUSB*, /dev/ttyACM*, and others). - * The autodetection for this kind of devices can potentially be unreliable. - * - * Also, sending various bytes/commands to (all!) devices which happen to - * be attached to the system via a (real or virtual) serial port can be - * problematic. There is no way for libsigrok to know how unknown devices - * react to the bytes libsigrok sends. Potentially they could lead to the - * device getting into invalid/error states, losing/overwriting data, or... - * - * In addition to the detection, the devices that are found are also - * initialized automatically. On some devices, this involves a firmware upload, - * or other such measures. - * - * The order in which the system is scanned for devices is not specified. The - * caller should not assume or rely on any specific order. - * - * After the system has been scanned for devices, the list of detected (and - * supported) devices can be acquired via sr_dev_list(). - * - * TODO: Error checks? - * TODO: Option to only scan for specific devices or device classes. - * - * @return SR_OK upon success, SR_ERR_BUG upon internal errors. - */ -SR_API int sr_dev_scan(void) -{ - int i; - struct sr_dev_driver **drivers; - - drivers = sr_driver_list(); - if (!drivers[0]) { - sr_err("dev: %s: no supported hardware drivers", __func__); - return SR_ERR_BUG; - } - - /* - * Initialize all drivers first. Since the init() call may involve - * a firmware upload and associated delay, we may as well get all - * of these out of the way first. - */ - for (i = 0; drivers[i]; i++) - sr_driver_init(drivers[i]); - - return SR_OK; -} - -/** - * Return the list of logic analyzer devices libsigrok has detected. - * - * If the libsigrok-internal device list is empty, a scan for attached - * devices -- via a call to sr_dev_scan() -- is performed first. - * - * TODO: Error handling? - * - * @return The list (GSList) of detected devices, or NULL if none were found. - */ -SR_API GSList *sr_dev_list(void) -{ - if (!devs) - sr_dev_scan(); - - return devs; -} - -/** - * Create a new device. - * - * The device is added to the (libsigrok-internal) list of devices, but - * additionally a pointer to the newly created device is also returned. - * - * The device has no probes attached to it yet after this call. You can - * use sr_dev_probe_add() to add one or more probes. - * - * TODO: Should return int, so that we can return SR_OK, SR_ERR_* etc. - * - * It is the caller's responsibility to g_free() the allocated memory when - * no longer needed. TODO: Using which API function? - * - * @param driver TODO. - * If 'driver' is NULL, the created device is a "virtual" one. - * @param driver_index TODO - * - * @return Pointer to the newly allocated device, or NULL upon errors. - */ -SR_API struct sr_dev *sr_dev_new(const struct sr_dev_driver *driver, - int driver_index) -{ - struct sr_dev *dev; - - /* TODO: Check if driver_index valid? */ - - if (!(dev = g_try_malloc0(sizeof(struct sr_dev)))) { - sr_err("dev: %s: dev malloc failed", __func__); - return NULL; - } - - dev->driver = (struct sr_dev_driver *)driver; - dev->driver_index = driver_index; - devs = g_slist_append(devs, dev); - - return dev; -} - -/** - * Add a probe with the specified name to the specified device. - * - * The added probe is automatically enabled (the 'enabled' field is TRUE). - * - * The 'trigger' field of the added probe is set to NULL. A trigger can be - * added via sr_dev_trigger_set(). - * - * TODO: Are duplicate names allowed? - * TODO: Do we enforce a maximum probe number for a device? - * TODO: Error if the max. probe number for the specific LA is reached, e.g. - * if the caller tries to add more probes than the device actually has. - * - * @param dev The device to which to add a probe with the specified name. - * Must not be NULL. - * @param name The name of the probe to add to this device. Must not be NULL. - * TODO: Maximum length, allowed characters, etc. - * - * @return SR_OK upon success, SR_ERR_MALLOC upon memory allocation errors, - * or SR_ERR_ARG upon invalid arguments. - * If something other than SR_OK is returned, 'dev' is unchanged. - */ -SR_API int sr_dev_probe_add(struct sr_dev *dev, const char *name) -{ - struct sr_probe *p; - int probenum; - - if (!dev) { - sr_err("dev: %s: dev was NULL", __func__); - return SR_ERR_ARG; - } - - if (!name) { - sr_err("dev: %s: name was NULL", __func__); - return SR_ERR_ARG; - } - - /* TODO: Further checks to ensure name is valid. */ - - probenum = g_slist_length(dev->probes) + 1; - - if (!(p = g_try_malloc0(sizeof(struct sr_probe)))) { - sr_err("dev: %s: p malloc failed", __func__); - return SR_ERR_MALLOC; - } - - p->index = probenum; - p->enabled = TRUE; - p->name = g_strdup(name); - p->trigger = NULL; - dev->probes = g_slist_append(dev->probes, p); - - return SR_OK; -} - -/** - * Find the probe with the specified number in the specified device. - * - * TODO - * - * @param dev TODO. Must not be NULL. - * @param probenum The number of the probe whose 'struct sr_probe' we want. - * Note that the probe numbers start at 1 (not 0!). - * - * TODO: Should return int. - * TODO: probenum should be unsigned. - * - * @return A pointer to the requested probe's 'struct sr_probe', or NULL - * if the probe could not be found. - */ -SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev, - int probenum) -{ - GSList *l; - struct sr_probe *p, *found_probe; - - if (!dev) { - sr_err("dev: %s: dev was NULL", __func__); - return NULL; /* TODO: SR_ERR_ARG */ - } - - /* TODO: Sanity check on probenum. */ - - found_probe = NULL; - for (l = dev->probes; l; l = l->next) { - p = l->data; - /* TODO: Check for p != NULL. */ - if (p->index == probenum) { - found_probe = p; - break; - } - } - - return found_probe; -} - /** * Set the name of the specified probe in the specified device. * @@ -305,43 +95,6 @@ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum, return ret; } -/** - * Remove all triggers set up for the specified device. - * - * TODO: Better description. - * - * @param dev TODO - * - * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments. - * If something other than SR_OK is returned, 'dev' is unchanged. - */ -SR_API int sr_dev_trigger_remove_all(struct sr_dev *dev) -{ - struct sr_probe *p; - unsigned int pnum; /* TODO: uint16_t? */ - - if (!dev) { - sr_err("dev: %s: dev was NULL", __func__); - return SR_ERR_ARG; - } - - if (!dev->probes) { - sr_err("dev: %s: dev->probes was NULL", __func__); - return SR_ERR_ARG; - } - - for (pnum = 1; pnum <= g_slist_length(dev->probes); pnum++) { - p = sr_dev_probe_find(dev, pnum); - /* TODO: Silently ignore probes which cannot be found? */ - if (p) { - g_free(p->trigger); - p->trigger = NULL; - } - } - - return SR_OK; -} - /** * Add a trigger to the specified device (and the specified probe). * @@ -414,29 +167,3 @@ SR_API gboolean sr_dev_has_hwcap(const struct sr_dev_inst *sdi, int hwcap) return FALSE; } -/** - * Returns information about the given device. - * - * @param dev Pointer to the device to be checked. Must not be NULL. - * The device's 'driver' field must not be NULL either. - * @param id The type of information. - * @param data The return value. Must not be NULL. - * - * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR - * upon other errors. - */ -SR_API int sr_dev_info_get(const struct sr_dev *dev, int id, const void **data) -{ - if ((dev == NULL) || (dev->driver == NULL)) - return SR_ERR_ARG; - - if (data == NULL) - return SR_ERR_ARG; - - *data = dev->driver->dev_info_get(dev->driver_index, id); - - if (*data == NULL) - return SR_ERR; - - return SR_OK; -} diff --git a/proto.h b/proto.h index a882b64a..f8651a12 100644 --- a/proto.h +++ b/proto.h @@ -47,22 +47,13 @@ SR_API int sr_datastore_put(struct sr_datastore *ds, void *data, /*--- device.c --------------------------------------------------------------*/ -SR_API int sr_dev_scan(void); -SR_API GSList *sr_dev_list(void); -SR_API struct sr_dev *sr_dev_new(const struct sr_dev_driver *driver, - int driver_index); -SR_API int sr_dev_probe_add(struct sr_dev *dev, const char *name); -SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev, - int probenum); SR_API int sr_dev_probe_name_set(struct sr_dev *dev, int probenum, const char *name); SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum, gboolean state); -SR_API int sr_dev_trigger_remove_all(struct sr_dev *dev); SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum, const char *trigger); SR_API gboolean sr_dev_has_hwcap(const struct sr_dev_inst *sdi, int hwcap); -SR_API int sr_dev_info_get(const struct sr_dev *dev, int id, const void **data); /*--- filter.c --------------------------------------------------------------*/