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

Fix two more compiler warnings noticed on amd64.

This commit is contained in:
Uwe Hermann 2011-01-08 03:51:31 +01:00
parent 340f6e7aea
commit 5e2ddeb098
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
device.c
View File

@ -43,7 +43,8 @@ void device_scan(void)
g_message("initializing %s plugin", plugin->name); g_message("initializing %s plugin", plugin->name);
num_devices = plugin->init(NULL); num_devices = plugin->init(NULL);
for (i = 0; i < num_devices; i++) { for (i = 0; i < num_devices; i++) {
num_probes = (int)plugin->get_device_info(i, num_probes
= (int)(unsigned long)plugin->get_device_info(i,
DI_NUM_PROBES); DI_NUM_PROBES);
device_new(plugin, i, num_probes); device_new(plugin, i, num_probes);
} }

2
hardware/zeroplus-logic-cube/zeroplus.c
View File

@ -443,7 +443,7 @@ static int *hw_get_capabilities(void)
/* TODO: This will set the same samplerate for all devices. */ /* TODO: This will set the same samplerate for all devices. */
static int set_configuration_samplerate(uint64_t samplerate) static int set_configuration_samplerate(uint64_t samplerate)
{ {
g_message("%s(%llu)", __FUNCTION__, samplerate); g_message("%s(%" PRIu64 ")", __FUNCTION__, samplerate);
if (samplerate > MHZ(1)) if (samplerate > MHZ(1))
analyzer_set_freq(samplerate / MHZ(1), FREQ_SCALE_MHZ); analyzer_set_freq(samplerate / MHZ(1), FREQ_SCALE_MHZ);
else if (samplerate > KHZ(1)) else if (samplerate > KHZ(1))