From bbc42811d0c29e37e449d38d897b8e9cecdc8ba3 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Wed, 29 Apr 2015 01:08:17 +0200 Subject: [PATCH] Use G_PI instead of defining our own version of PI. --- src/hardware/demo/demo.c | 6 +++--- src/hardware/saleae-logic16/protocol.c | 2 +- src/libsigrok-internal.h | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c index 44b92931..26887c44 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 * PI * frequency * t); + sin(2 * G_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 / PI) * - asin(sin(2 * PI * frequency * t)); + ag->pattern_data[i] = (2 * ag->amplitude / G_PI) * + asin(sin(2 * G_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 1e900c15..2364be3d 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 * PI / len) * 255; + *table++ = sin(j * G_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 9060e2a7..b4b32f23 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -156,8 +156,6 @@ ((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