Fix 'aquisition' typo in a few places.

[libsigrok.git] / hardware / demo / demo.c

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 3d59ae5f7d71357401539a23c5d74ec283d4e8f0..329fd170e79cf62868c6fc97fc82f65cf1fa45f2 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -166,11 +166,6 @@ static struct sr_dev_driver *di = &demo_driver_info;
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
 
-static int dev_clear(void)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int init(struct sr_context *sr_ctx)
 {
        return std_init(sr_ctx, di, LOG_PREFIX);
@@ -206,7 +201,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui
                break;
 
        case PATTERN_SINE:
-               frequency = sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+               frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
 
                /* Make sure the number of samples we put out is an integer
                 * multiple of our period size */
@@ -225,7 +220,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui
                break;
 
        case PATTERN_TRIANGLE:
-               frequency = sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+               frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
 
                while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0)
                        num_samples--;
@@ -240,7 +235,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui
                break;
 
        case PATTERN_SAWTOOTH:
-               frequency = sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+               frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
 
                while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0)
                        num_samples--;
@@ -384,7 +379,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-       return dev_clear();
+       return std_dev_clear(di, NULL);
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
@@ -753,7 +748,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        (void)cb_data;
 
        devc = sdi->priv;
-       sr_dbg("Stopping aquisition.");
+       sr_dbg("Stopping acquisition.");
 
        sr_session_source_remove_channel(devc->channel);
        g_io_channel_shutdown(devc->channel, FALSE, NULL);
@@ -775,7 +770,7 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
        .cleanup = cleanup,
        .scan = scan,
        .dev_list = dev_list,
-       .dev_clear = dev_clear,
+       .dev_clear = NULL,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,