Merge pull request #81 from mdp/fixguard

[proxmark3-svn] / client / reveng / reveng.h

diff --git a/client/reveng/reveng.h b/client/reveng/reveng.h
index 48dcb31cc608de889ed5d17b03912be713e9248d..7c2f0b3b01676a598a636f4ebfb04c6ba340dbe6 100644 (file)
--- a/client/reveng/reveng.h
+++ b/client/reveng/reveng.h
@@ -1,9 +1,9 @@
 /* reveng.h
 /* reveng.h

- * Greg Cook, 9/Apr/2015
+ * Greg Cook, 25/Jul/2016

  */
 
  */
 

-/* CRC RevEng, an arbitrary-precision CRC calculator and algorithm finder
- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015  Gregory Cook
+/* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016  Gregory Cook

  *
  * This file is part of CRC RevEng.
  *
  *
  * This file is part of CRC RevEng.
  *


@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with CRC RevEng.  If not, see <http://www.gnu.org/licenses/>.
+ * along with CRC RevEng.  If not, see <https://www.gnu.org/licenses/>.

  */
 
 #ifndef REVENG_H
  */
 
 #ifndef REVENG_H


@@ -92,7 +92,7 @@
 /* Global definitions */
 
 /* CRC RevEng version string */
 /* Global definitions */
 
 /* CRC RevEng version string */

-#define VERSION "1.3.0"
+#define VERSION "1.4.4"

 
 /* bmpbit.c */
 typedef BMP_T bmp_t;
 
 /* bmpbit.c */
 typedef BMP_T bmp_t;


@@ -162,8 +162,6 @@ extern int pmpar(const poly_t poly, const poly_t mask);
 extern int pident(const poly_t a, const poly_t b);
 
 /* model.c */
 extern int pident(const poly_t a, const poly_t b);
 
 /* model.c */

-#define M_OVERWR   256
-

 typedef struct {
        poly_t spoly;           /* polynomial with highest-order term removed. length determines CRC width */
        poly_t init;            /* initial register value. length == poly.length */
 typedef struct {
        poly_t spoly;           /* polynomial with highest-order term removed. length determines CRC width */
        poly_t init;            /* initial register value. length == poly.length */


@@ -176,17 +174,21 @@ typedef struct {
 extern void mcpy(model_t *dest, const model_t *src);
 extern void mfree(model_t *model);
 extern int mcmp(const model_t *a, const model_t *b);
 extern void mcpy(model_t *dest, const model_t *src);
 extern void mfree(model_t *model);
 extern int mcmp(const model_t *a, const model_t *b);

-extern int mbynam(model_t *dest, const char *key);
-extern void mbynum(model_t *dest, int num);
-extern int mcount(void);
-extern char *mnames(void);

 extern char *mtostr(const model_t *model);
 extern char *mtostr(const model_t *model);

-extern void mmatch(model_t *model, int flags);

 extern void mcanon(model_t *model);
 extern void mcheck(model_t *model);
 extern void mrev(model_t *model);
 extern void mnovel(model_t *model);
 
 extern void mcanon(model_t *model);
 extern void mcheck(model_t *model);
 extern void mrev(model_t *model);
 extern void mnovel(model_t *model);
 

+/* preset.c */
+#define M_OVERWR   256
+
+extern int mbynam(model_t *dest, const char *key);
+extern void mbynum(model_t *dest, int num);
+extern int mcount(void);
+extern char *mnames(void);
+extern void mmatch(model_t *model, int flags);
+

 /* reveng.c */
 #define R_HAVEP    512
 #define R_HAVEI   1024
 /* reveng.c */
 #define R_HAVEP    512
 #define R_HAVEI   1024