diff --git a/quad/src/virt_quad/hw_impl_unix.h b/quad/src/virt_quad/hw_impl_unix.h index c7e3659dffcfb0b1094c26f41ffe3b4d792962b8..38745899342bb3a8c81734bead570d1d876f4cff 100644 --- a/quad/src/virt_quad/hw_impl_unix.h +++ b/quad/src/virt_quad/hw_impl_unix.h @@ -10,6 +10,8 @@ #include <stdlib.h> #include <time.h> +#define VIRT_QUAD_FIFOS_DIR "virt-quad-fifos" + int unix_uart_reset(struct UARTDriver *self); int unix_uart_write(struct UARTDriver *self, unsigned char c); int unix_uart_read(struct UARTDriver *self, unsigned char *c); diff --git a/quad/src/virt_quad/hw_impl_unix_pwm_input.c b/quad/src/virt_quad/hw_impl_unix_pwm_input.c index 60c51234fb57aedc020f525bb8229f95ecfa3099..c49e466ce0470f60fda3bff49874e298e606380b 100644 --- a/quad/src/virt_quad/hw_impl_unix_pwm_input.c +++ b/quad/src/virt_quad/hw_impl_unix_pwm_input.c @@ -4,7 +4,6 @@ #include <sys/stat.h> #include <fcntl.h> -static char *fifo_dir = "virt-quad-fifos"; static char *pwms[6]; static int fifos[6]; static unsigned long cache[6]; @@ -17,12 +16,12 @@ int unix_pwm_input_reset(struct PWMInputDriver *self) { pwms[4] = "pwm-input-gear"; pwms[5] = "pwm-input-flap"; - mkdir(fifo_dir, 0777); + mkdir(VIRT_QUAD_FIFOS_DIR, 0777); int i; for (i = 0; i < 6; i += 1) { unlink(pwms[i]); char fifoname[64]; - sprintf(fifoname, "%s/%s", fifo_dir, pwms[i]); + sprintf(fifoname, "%s/%s", VIRT_QUAD_FIFOS_DIR, pwms[i]); mkfifo(fifoname, 0666); fifos[i] = open(fifoname, O_RDONLY | O_NONBLOCK); } diff --git a/quad/src/virt_quad/hw_impl_unix_pwm_output.c b/quad/src/virt_quad/hw_impl_unix_pwm_output.c index 3e094b37fb6855e5133594b505ed7e3fac2726e1..3bd757f96d1c146d5bd3e1724dea0e2fe8222618 100644 --- a/quad/src/virt_quad/hw_impl_unix_pwm_output.c +++ b/quad/src/virt_quad/hw_impl_unix_pwm_output.c @@ -4,16 +4,15 @@ #include <fcntl.h> #include <string.h> -static char *fifo_dir = "virt-quad-fifos"; static char *output_pwms[4]; int unix_pwm_output_reset(struct PWMOutputDriver *self) { - output_pwms[0] = "virt-quad-fifos/pwm-output-motor1"; - output_pwms[1] = "virt-quad-fifos/pwm-output-motor2"; - output_pwms[2] = "virt-quad-fifos/pwm-output-motor3"; - output_pwms[3] = "virt-quad-fifos/pwm-output-motor4"; + output_pwms[0] = VIRT_QUAD_FIFOS_DIR "/pwm-output-motor1"; + output_pwms[1] = VIRT_QUAD_FIFOS_DIR "/pwm-output-motor2"; + output_pwms[2] = VIRT_QUAD_FIFOS_DIR "/pwm-output-motor3"; + output_pwms[3] = VIRT_QUAD_FIFOS_DIR "/pwm-output-motor4"; - mkdir("virt-quad-fifos", 0777); + mkdir(VIRT_QUAD_FIFOS_DIR, 0777); int i; for (i = 0; i < 4; i += 1) { unlink(output_pwms[i]);