From a3c9db98db2f5d07f2035a35d01b92187beb8b22 Mon Sep 17 00:00:00 2001 From: KubaPro010 Date: Mon, 14 Apr 2025 16:22:30 +0200 Subject: [PATCH] fix bugs and remove extern from header --- src/ascii_cmd.c | 4 ---- src/ascii_cmd.h | 6 ++++-- src/control_pipe.c | 4 ---- src/control_pipe.h | 10 +++++++--- src/lib.c | 3 --- src/lib.h | 18 +++++++++++------- src/modulator.h | 1 + 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/ascii_cmd.c b/src/ascii_cmd.c index c990982..22ee09a 100644 --- a/src/ascii_cmd.c +++ b/src/ascii_cmd.c @@ -1,7 +1,3 @@ -#include "common.h" -#include "rds.h" -#include "modulator.h" -#include "lib.h" #include "ascii_cmd.h" typedef struct { diff --git a/src/ascii_cmd.h b/src/ascii_cmd.h index 738a4ad..3fa773b 100644 --- a/src/ascii_cmd.h +++ b/src/ascii_cmd.h @@ -1,7 +1,9 @@ -#include "modulator.h" +#include "common.h" #include "rds.h" +#include "modulator.h" +#include "lib.h" #define CMD_BUFFER_SIZE 255 #define CTL_BUFFER_SIZE (CMD_BUFFER_SIZE * 2) #define READ_TIMEOUT_MS 200 -extern void process_ascii_cmd(RDSModulator* mod, char *str, char *cmd_output); \ No newline at end of file +void process_ascii_cmd(RDSModulator* mod, char *str, char *cmd_output); \ No newline at end of file diff --git a/src/control_pipe.c b/src/control_pipe.c index 7309128..d71e5bb 100644 --- a/src/control_pipe.c +++ b/src/control_pipe.c @@ -1,8 +1,4 @@ -#include "common.h" -#include "ascii_cmd.h" #include "control_pipe.h" -#include "rds.h" -#include "modulator.h" static int fd; static struct pollfd poller; diff --git a/src/control_pipe.h b/src/control_pipe.h index e61853a..8297933 100644 --- a/src/control_pipe.h +++ b/src/control_pipe.h @@ -1,7 +1,11 @@ #include #include #include +#include "common.h" +#include "ascii_cmd.h" +#include "rds.h" +#include "modulator.h" -extern int open_control_pipe(char *filename); -extern void close_control_pipe(); -extern void poll_control_pipe(RDSModulator* mod); +int open_control_pipe(char *filename); +void close_control_pipe(); +void poll_control_pipe(RDSModulator* mod); diff --git a/src/lib.c b/src/lib.c index 5e15230..74e305f 100644 --- a/src/lib.c +++ b/src/lib.c @@ -1,6 +1,3 @@ -#include "common.h" -#include "rds.h" -#include #include "lib.h" extern int nanosleep(const struct timespec *req, struct timespec *rem); diff --git a/src/lib.h b/src/lib.h index 93593d0..5b61708 100644 --- a/src/lib.h +++ b/src/lib.h @@ -1,12 +1,16 @@ -extern void msleep(unsigned long ms); +#include "common.h" +#include "rds.h" +#include -extern int _strnlen(const char *s, int maxlen); +void msleep(unsigned long ms); -extern uint16_t crc16_ccitt(char *data, uint16_t len); +int _strnlen(const char *s, int maxlen); + +uint16_t crc16_ccitt(char *data, uint16_t len); uint16_t get_block_grom_group(RDSGroup *group, uint8_t block); -extern void add_checkwords(RDSGroup *group, uint8_t *bits); -extern uint8_t add_rds_af_oda(RDSAFsODA *af_list, float freq); -extern uint8_t add_rds_af(RDSAFs *af_list, float freq); -extern char *convert_to_rdscharset(char *str); \ No newline at end of file +void add_checkwords(RDSGroup *group, uint8_t *bits); +uint8_t add_rds_af_oda(RDSAFsODA *af_list, float freq); +uint8_t add_rds_af(RDSAFs *af_list, float freq); +char *convert_to_rdscharset(char *str); \ No newline at end of file diff --git a/src/modulator.h b/src/modulator.h index e6a514f..b7c7a03 100644 --- a/src/modulator.h +++ b/src/modulator.h @@ -1,5 +1,6 @@ #pragma once #include "common.h" +#include "lib.h" #include "rds.h" #include "waveforms.h"