diff --git a/src/rds.c b/src/rds.c index e5f7a58..18419fe 100644 --- a/src/rds.c +++ b/src/rds.c @@ -294,6 +294,19 @@ group_coded: return; } +uint16_t offset_words_typea[] = { + 0x0FC, /* A */ + 0x198, /* B */ + 0x168, /* C */ + 0x1B4, /* D */ +}; +uint16_t offset_words_typeb[] = { + 0x0FC, /* A */ + 0x198, /* B */ + 0x350, /* C' */ + 0x1B4, /* D */ +}; + void add_checkwords(RDSGroup *group, uint8_t *bits) { uint16_t* offset_words; diff --git a/src/rds.h b/src/rds.h index c738fa3..3e3c6ac 100644 --- a/src/rds.h +++ b/src/rds.h @@ -1,5 +1,4 @@ #pragma once -#include "common.h" /* The RDS error-detection code generator polynomial is * x^10 + x^8 + x^7 + x^5 + x^4 + x^3 + x^0 @@ -32,22 +31,6 @@ #define ODA_AID_ERTPLUS 0x4BD8 #define ODA_AID_ODAAF 0x6365 -#ifndef offset_words_h -uint16_t offset_words_typea[] = { - 0x0FC, /* A */ - 0x198, /* B */ - 0x168, /* C */ - 0x1B4, /* D */ -}; -uint16_t offset_words_typeb[] = { - 0x0FC, /* A */ - 0x198, /* B */ - 0x350, /* C' */ - 0x1B4, /* D */ -}; -#define offset_words_h -#endif - typedef struct { uint8_t num_entries : 6; uint8_t num_afs : 5;