BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sr/cli/gtk/qt: s/hw/driver/ in some places.

This commit is contained in:
Uwe Hermann 2012-02-29 19:56:15 +01:00
parent c496ac97a8
commit cfe064d8e7
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
device.c
View File

@ -62,7 +62,7 @@ SR_API int sr_dev_scan(void)
int i; int i;
struct sr_dev_driver **drivers; struct sr_dev_driver **drivers;
drivers = sr_hw_list(); drivers = sr_driver_list();
if (!drivers[0]) { if (!drivers[0]) {
sr_err("dev: %s: no supported hardware drivers", __func__); sr_err("dev: %s: no supported hardware drivers", __func__);
return SR_ERR; /* TODO: More specific error? */ return SR_ERR; /* TODO: More specific error? */
@ -74,7 +74,7 @@ SR_API int sr_dev_scan(void)
* of these out of the way first. * of these out of the way first.
*/ */
for (i = 0; drivers[i]; i++) for (i = 0; drivers[i]; i++)
sr_hw_init(drivers[i]); sr_driver_init(drivers[i]);
return SR_OK; return SR_OK;
} }

13
hwdriver.c
View File

@ -99,14 +99,11 @@ static struct sr_dev_driver *drivers_list[] = {
}; };
/** /**
* Return the list of loaded hardware drivers. * Return the list of supported 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. * @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 drivers_list;
} }
@ -121,7 +118,7 @@ SR_API struct sr_dev_driver **sr_hw_list(void)
* *
* @return The number of devices found and instantiated by the driver. * @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_devs, num_probes, i, j;
int num_initialized_devs = 0; int num_initialized_devs = 0;
@ -156,7 +153,7 @@ SR_PRIV void sr_hw_cleanup_all(void)
int i; int i;
struct sr_dev_driver **drivers; struct sr_dev_driver **drivers;
drivers = sr_hw_list(); drivers = sr_driver_list();
for (i = 0; drivers[i]; i++) { for (i = 0; drivers[i]; i++) {
if (drivers[i]->cleanup) if (drivers[i]->cleanup)
drivers[i]->cleanup(); drivers[i]->cleanup();
@ -268,7 +265,7 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
* FALSE otherwise. Also, if 'driver' is NULL or the respective driver * FALSE otherwise. Also, if 'driver' is NULL or the respective driver
* returns an invalid capability list, FALSE is returned. * 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; int *hwcaps, i;

10
sigrok-proto.h
View File

@ -71,15 +71,15 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
/*--- hwdriver.c ------------------------------------------------------------*/ /*--- hwdriver.c ------------------------------------------------------------*/
SR_API struct sr_dev_driver **sr_hw_list(void); SR_API struct sr_dev_driver **sr_driver_list(void);
SR_API int sr_hw_init(struct sr_dev_driver *driver); SR_API int sr_driver_init(struct sr_dev_driver *driver);
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);
SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap); SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap);
/*--- session.c -------------------------------------------------------------*/ /*--- session.c -------------------------------------------------------------*/
typedef void (*sr_datafeed_callback) (struct sr_dev *dev, typedef void (*sr_datafeed_callback)(struct sr_dev *dev,
struct sr_datafeed_packet *packet); struct sr_datafeed_packet *packet);
/* Session setup */ /* Session setup */
SR_API int sr_session_load(const char *filename); SR_API int sr_session_load(const char *filename);