sr/cli/gtk/qt: s/hw/driver/ in some places.
authorUwe Hermann <uwe@hermann-uwe.de>
Wed, 29 Feb 2012 18:56:15 +0000 (19:56 +0100)
committerUwe Hermann <uwe@hermann-uwe.de>
Thu, 1 Mar 2012 22:49:25 +0000 (23:49 +0100)
parsers.c
sigrok-cli.c

index 47f11a0bee454ecbbd139e81161bae273a14a18a..fca926f3d321e5145dc00cffd9b8db1d5bce5bbf 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -164,11 +164,11 @@ struct sr_dev *parse_devstring(const char *devstring)
                 * no need to let them all scan
                 */
                dev = NULL;
-               drivers = sr_hw_list();
+               drivers = sr_driver_list();
                for (i = 0; drivers[i]; i++) {
                        if (strcmp(drivers[i]->name, devstring))
                                continue;
-                       num_devs = sr_hw_init(drivers[i]);
+                       num_devs = sr_driver_init(drivers[i]);
                        if (num_devs == 1) {
                                devs = sr_dev_list();
                                dev = devs->data;
index 4bd2de41b7095f1800781cb57abae7a57dcf7dda..461899e14f255c6fc0768c7b4a5360ce79f3183c 100644 (file)
@@ -95,7 +95,7 @@ static void show_version(void)
        printf("sigrok-cli %s\n\n", VERSION);
 
        printf("Supported hardware drivers:\n");
-       drivers = sr_hw_list();
+       drivers = sr_driver_list();
        for (i = 0; drivers[i]; i++) {
                printf("  %-20s %s\n", drivers[i]->name, drivers[i]->longname);
        }
@@ -836,7 +836,7 @@ static void run_session(void)
             return;
 
        if (opt_continuous) {
-               if (!sr_hw_has_hwcap(dev->driver, SR_HWCAP_CONTINUOUS)) {
+               if (!sr_driver_hwcap_exists(dev->driver, SR_HWCAP_CONTINUOUS)) {
                        printf("This device does not support continuous sampling.");
                        sr_session_destroy();
                        return;
@@ -868,7 +868,7 @@ static void run_session(void)
                        return;
                }
 
-               if (sr_hw_has_hwcap(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
+               if (sr_driver_hwcap_exists(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
                        if (dev->driver->dev_config_set(dev->driver_index,
                            SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
                                printf("Failed to configure time limit.\n");