]> sigrok.org Git - libsigrok.git/commitdiff
Fix two more compiler warnings noticed on amd64.
authorUwe Hermann <redacted>
Sat, 8 Jan 2011 02:51:31 +0000 (03:51 +0100)
committerUwe Hermann <redacted>
Sat, 8 Jan 2011 02:51:31 +0000 (03:51 +0100)
device.c
hardware/zeroplus-logic-cube/zeroplus.c

index 1f46573b01f5202e635ede2d14b1a9d447a48a2e..84cf6d1f87c48c8cfd96d839c5e9a55cb6f5a009 100644 (file)
--- a/device.c
+++ b/device.c
@@ -43,8 +43,9 @@ void device_scan(void)
                g_message("initializing %s plugin", plugin->name);
                num_devices = plugin->init(NULL);
                for (i = 0; i < num_devices; i++) {
-                       num_probes = (int)plugin->get_device_info(i,
-                                                       DI_NUM_PROBES);
+                       num_probes
+                         = (int)(unsigned long)plugin->get_device_info(i,
+                           DI_NUM_PROBES);
                        device_new(plugin, i, num_probes);
                }
        }
index e12ed6f98a81eb1f924f60854f323240a7a55e9f..316acfeb77a9b2020ba266887fad00610b5b2db7 100644 (file)
@@ -443,7 +443,7 @@ static int *hw_get_capabilities(void)
 /* TODO: This will set the same samplerate for all devices. */
 static int set_configuration_samplerate(uint64_t samplerate)
 {
-       g_message("%s(%llu)", __FUNCTION__, samplerate);
+       g_message("%s(%" PRIu64 ")", __FUNCTION__, samplerate);
        if (samplerate > MHZ(1))
                analyzer_set_freq(samplerate / MHZ(1), FREQ_SCALE_MHZ);
        else if (samplerate > KHZ(1))