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

Consistently use __func__ instead of __FUNCTION__. 

The __func__ form is standardized and more portable.
This commit is contained in:
Uwe Hermann 2011-11-17 23:00:33 +01:00
parent a562c3a2e5
commit 6bb5c5fadf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/zeroplus-logic-cube/gl_usb.c
View File

@ -66,7 +66,7 @@ int gl_write_address(libusb_device_handle *devh, unsigned int address)
0, packet, 1, TIMEOUT); 0, packet, 1, TIMEOUT);
if (ret != 1) if (ret != 1)
sr_err("%s: libusb_control_transfer returned %d\n", sr_err("%s: libusb_control_transfer returned %d\n",
__FUNCTION__, ret); __func__, ret);
return ret; return ret;
} }
@ -79,7 +79,7 @@ int gl_write_data(libusb_device_handle *devh, unsigned int val)
0, packet, 1, TIMEOUT); 0, packet, 1, TIMEOUT);
if (ret != 1) if (ret != 1)
sr_err("%s: libusb_control_transfer returned %d\n", sr_err("%s: libusb_control_transfer returned %d\n",
__FUNCTION__, ret); __func__, ret);
return ret; return ret;
} }
@ -92,7 +92,7 @@ int gl_read_data(libusb_device_handle *devh)
0, packet, 1, TIMEOUT); 0, packet, 1, TIMEOUT);
if (ret != 1) if (ret != 1)
sr_err("%s: libusb_control_transfer returned %d, val=%hhx\n", sr_err("%s: libusb_control_transfer returned %d, val=%hhx\n",
__FUNCTION__, ret, packet[0]); __func__, ret, packet[0]);
return (ret == 1) ? packet[0] : ret; return (ret == 1) ? packet[0] : ret;
} }
@ -107,7 +107,7 @@ int gl_read_bulk(libusb_device_handle *devh, void *buffer, unsigned int size)
0, packet, 8, TIMEOUT); 0, packet, 8, TIMEOUT);
if (ret != 8) if (ret != 8)
sr_err("%s: libusb_control_transfer returned %d\n", sr_err("%s: libusb_control_transfer returned %d\n",
__FUNCTION__, ret); __func__, ret);
ret = libusb_bulk_transfer(devh, ENDPOINT_BULK_IN, buffer, size, ret = libusb_bulk_transfer(devh, ENDPOINT_BULK_IN, buffer, size,
&transferred, TIMEOUT); &transferred, TIMEOUT);

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

@ -453,7 +453,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)
{ {
sr_info("%s(%" PRIu64 ")", __FUNCTION__, samplerate); sr_info("%s(%" PRIu64 ")", __func__, samplerate);
if (samplerate > SR_MHZ(1)) if (samplerate > SR_MHZ(1))
analyzer_set_freq(samplerate / SR_MHZ(1), FREQ_SCALE_MHZ); analyzer_set_freq(samplerate / SR_MHZ(1), FREQ_SCALE_MHZ);
else if (samplerate > SR_KHZ(1)) else if (samplerate > SR_KHZ(1))