diff --git a/Makefile b/Makefile index 06fe2697..d11ffce7 100644 --- a/Makefile +++ b/Makefile @@ -88,4 +88,4 @@ dvmhost: $(OBJECTS) $(CXX) $(CFLAGS) -c -o $@ $< clean: - $(RM) dvmhost *.o *.d *.bak *~ edac/*.o dmr/*.o dmr/acl/*.o dmr/data/*.o dmr/edac/*.o dmr/lc/*.o p25/*.o p25/acl/*.o p25/data/*.o p25/edac/*.o p25/lc/*.o lookups/*.o modem/*.o modem/port/*.o network/*.o yaml/*.o host/*.o host/calibrate/*.o host/setup/*.o + $(RM) dvmhost *.o *.d *.bak *~ edac/*.o dmr/*.o dmr/acl/*.o dmr/data/*.o dmr/edac/*.o dmr/lc/*.o p25/*.o p25/acl/*.o p25/data/*.o p25/dfsi/*.o p25/edac/*.o p25/lc/*.o lookups/*.o modem/*.o modem/port/*.o network/*.o yaml/*.o host/*.o host/calibrate/*.o host/setup/*.o diff --git a/Makefile.arm b/Makefile.arm index 81c93670..4f00fbf5 100644 --- a/Makefile.arm +++ b/Makefile.arm @@ -88,4 +88,4 @@ dvmhost: $(OBJECTS) $(CXX) $(CFLAGS) -c -o $@ $< clean: - $(RM) dvmhost *.o *.d *.bak *~ edac/*.o dmr/*.o dmr/acl/*.o dmr/data/*.o dmr/edac/*.o dmr/lc/*.o p25/*.o p25/acl/*.o p25/data/*.o p25/edac/*.o p25/lc/*.o lookups/*.o modem/*.o modem/port/*.o network/*.o yaml/*.o host/*.o host/calibrate/*.o host/setup/*.o + $(RM) dvmhost *.o *.d *.bak *~ edac/*.o dmr/*.o dmr/acl/*.o dmr/data/*.o dmr/edac/*.o dmr/lc/*.o p25/*.o p25/acl/*.o p25/data/*.o p25/dfsi/*.o p25/edac/*.o p25/lc/*.o lookups/*.o modem/*.o modem/port/*.o network/*.o yaml/*.o host/*.o host/calibrate/*.o host/setup/*.o diff --git a/Makefile.rpi-arm b/Makefile.rpi-arm index 8df53560..333e1e9c 100644 --- a/Makefile.rpi-arm +++ b/Makefile.rpi-arm @@ -88,4 +88,4 @@ dvmhost: $(OBJECTS) $(CXX) $(CFLAGS) -c -o $@ $< clean: - $(RM) dvmhost *.o *.d *.bak *~ edac/*.o dmr/*.o dmr/acl/*.o dmr/data/*.o dmr/edac/*.o dmr/lc/*.o p25/*.o p25/acl/*.o p25/data/*.o p25/edac/*.o p25/lc/*.o lookups/*.o modem/*.o modem/port/*.o network/*.o yaml/*.o host/*.o host/calibrate/*.o host/setup/*.o + $(RM) dvmhost *.o *.d *.bak *~ edac/*.o dmr/*.o dmr/acl/*.o dmr/data/*.o dmr/edac/*.o dmr/lc/*.o p25/*.o p25/acl/*.o p25/data/*.o p25/dfsi/*.o p25/edac/*.o p25/lc/*.o lookups/*.o modem/*.o modem/port/*.o network/*.o yaml/*.o host/*.o host/calibrate/*.o host/setup/*.o diff --git a/p25/dfsi/DFSIDefines.h b/p25/dfsi/DFSIDefines.h index 77210b9e..e26af253 100644 --- a/p25/dfsi/DFSIDefines.h +++ b/p25/dfsi/DFSIDefines.h @@ -29,12 +29,12 @@ #include "Defines.h" // Frame Type String(s) -#define P25_DFSI_VHDR1_STR "P25_DFSI_START_STOP (Start/Stop)" +#define P25_DFSI_SS_STR "P25_DFSI_START_STOP (Start/Stop)" #define P25_DFSI_VHDR1_STR "P25_DFSI_VHDR1 (Voice Header 1)" #define P25_DFSI_VHDR2_STR "P25_DFSI_VHDR2 (Voice Header 2)" #define P25_DFSI_LDU1_STR "P25_DFSI_LDU1 (Logical Link Data Unit 1)" #define P25_DFSI_LDU2_STR "P25_DFSI_LDU2 (Logical Link Data Unit 2)" -#define P25_DFSI_LDU2_STR "P25_DFSI_TSBK (Trunking System Block)" +#define P25_DFSI_TSBK_STR "P25_DFSI_TSBK (Trunking System Block)" namespace p25 {