readd missing constants and missing FEC code from previous revert;

g4klx · Jan 9, 2019 · 0da6167 · 0da6167
1 parent 2d4829c
commit 0da6167
Showing 7 changed files with 210 additions and 89 deletions.
diff --git a/P25Control.cpp b/P25Control.cpp
@@ -1,6 +1,6 @@
 /*
 *   Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX
-*   Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com>
+*   Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/P25Control.h b/P25Control.h
@@ -1,6 +1,6 @@
 /*
 *   Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX
-*   Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com>
+*   Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/P25Data.cpp b/P25Data.cpp
@@ -1,6 +1,6 @@
 /*
 *   Copyright (C) 2016,2017 by Jonathan Naylor G4KLX
-*   Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com>
+*   Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/P25Data.h b/P25Data.h
@@ -1,6 +1,6 @@
 /*
 *   Copyright (C) 2016,2017 by Jonathan Naylor G4KLX
-*   Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com>
+*   Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/P25Defines.h b/P25Defines.h
@@ -55,6 +55,8 @@ const unsigned int  P25_PDU_FEC_LENGTH_BITS          = P25_PDU_FEC_LENGTH_BYTES
 
 const unsigned int  P25_MI_LENGTH_BYTES = 9U;
 
+const unsigned char P25_ALGO_UNENCRYPT = 0x80U;
+
 const unsigned char P25_LCF_GROUP   = 0x00U;
 const unsigned char P25_LCF_PRIVATE = 0x03U;
 

diff --git a/RS241213.cpp b/RS241213.cpp
diff --git a/RS241213.h b/RS241213.h
@@ -1,5 +1,6 @@
 /*
 *   Copyright (C) 2016 by Jonathan Naylor G4KLX
+*	Copyright (C) 2018 by Bryan Biedenkapp <gatekeep@gmail.com> N2PLL
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -26,11 +27,16 @@ class CRS241213
 	~CRS241213();
 
 	bool decode(unsigned char* data);
+	bool decode24169(unsigned char* data);
+	bool decode362017(unsigned char* data);
 
 	void encode(unsigned char* data);
+	void encode24169(unsigned char* data);
+	void encode362017(unsigned char* data);
 
 private:
 	unsigned char gf6Mult(unsigned char a, unsigned char b) const;
+	bool decode(unsigned char* data, const unsigned int bitLength, const int firstData, const int roots);
 };
 
 #endif