From: Aurelien Jacobs Date: Sun, 26 Apr 2015 22:42:05 +0000 (+0200) Subject: Define our own constant for PI. X-Git-Tag: libsigrok-0.4.0~518 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=76372c5a9ce25d94ee992a5c84b8135f0d945293;p=libsigrok.git Define our own constant for PI. M_PI is not defined in the C standard nor in POSIX, it is a non-standard GNU extension. --- diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c index 7111097b..44b92931 100644 --- a/src/hardware/demo/demo.c +++ b/src/hardware/demo/demo.c @@ -225,7 +225,7 @@ static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate) for (i = 0; i < num_samples; i++) { t = (double) i / (double) sample_rate; ag->pattern_data[i] = ag->amplitude * - sin(2 * M_PI * frequency * t); + sin(2 * PI * frequency * t); } ag->num_samples = num_samples; @@ -238,8 +238,8 @@ static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate) for (i = 0; i < num_samples; i++) { t = (double) i / (double) sample_rate; - ag->pattern_data[i] = (2 * ag->amplitude / M_PI) * - asin(sin(2 * M_PI * frequency * t)); + ag->pattern_data[i] = (2 * ag->amplitude / PI) * + asin(sin(2 * PI * frequency * t)); } ag->num_samples = num_samples; diff --git a/src/hardware/saleae-logic16/protocol.c b/src/hardware/saleae-logic16/protocol.c index 3db8a82f..1e900c15 100644 --- a/src/hardware/saleae-logic16/protocol.c +++ b/src/hardware/saleae-logic16/protocol.c @@ -307,7 +307,7 @@ static void make_heartbeat(uint8_t *table, int len) len >>= 3; for (i = 0; i < 2; i++) for (j = 0; j < len; j++) - *table++ = sin(j * M_PI / len) * 255; + *table++ = sin(j * PI / len) * 255; } static int configure_led(const struct sr_dev_inst *sdi) diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index b4b32f23..9060e2a7 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -156,6 +156,8 @@ ((uint8_t*)(p))[2] = (uint8_t)((x)>>16); \ ((uint8_t*)(p))[3] = (uint8_t)((x)>>24); } while (0) +#define PI 3.1415926535897932384626433832795 + /* Portability fixes for FreeBSD. */ #ifdef __FreeBSD__ #define LIBUSB_CLASS_APPLICATION 0xfe