From fa0bdfc1207b6675bb1f46708e02aa1462a5ec1d Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 12 Jan 2018 04:04:30 +0100 Subject: util/blobtool: move declaration to their own header Change-Id: I556a122753e8a35c4ed32df460a5e12fa85de7f7 Signed-off-by: Denis 'GNUtoo' Carikli Reviewed-on: https://review.coreboot.org/23244 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- util/bincfg/bincfg.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ util/bincfg/bincfg.y | 33 +-------------------------------- 2 files changed, 51 insertions(+), 32 deletions(-) create mode 100644 util/bincfg/bincfg.h diff --git a/util/bincfg/bincfg.h b/util/bincfg/bincfg.h new file mode 100644 index 0000000000..35c6e9f17c --- /dev/null +++ b/util/bincfg/bincfg.h @@ -0,0 +1,50 @@ +/* + * bincfg - Compiler/Decompiler for data blobs with specs + * Copyright (C) 2017 Damien Zammit + * Copyright (C) 2018 Denis 'GNUtoo' Carikli + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __BINCFG_H +#define __BINCFG_H + +#define VALID_BIT 0x80 +#define MAX_WIDTH 32 +#define CHECKSUM_SIZE 16 + +struct field { + char *name; + unsigned int width; + unsigned int value; + struct field *next; +}; + +/* Bit array intermediary representation */ +struct blob { + unsigned int bloblen; + unsigned char *blb; + unsigned short checksum; + unsigned char *actualblob; + unsigned int lenactualblob; +}; + +static struct field *putsym (char const *, unsigned int); +static struct field *getsym (char const *); +static void yyerror (char const *); +int yylex (void); + +static FILE* fp; +static struct blob *binary; +static struct field *sym_table; +static struct field *sym_table_tail; + +#endif /* __BINCFG_H */ diff --git a/util/bincfg/bincfg.y b/util/bincfg/bincfg.y index 701de6f73c..0b4a8815c0 100644 --- a/util/bincfg/bincfg.y +++ b/util/bincfg/bincfg.y @@ -18,39 +18,8 @@ #include #include #include +#include "bincfg.h" //#define YYDEBUG 1 -int yylex (void); -static void yyerror (char const *); - -struct field { - char *name; - unsigned int width; - unsigned int value; - struct field *next; -}; - -static struct field *sym_table; -static struct field *putsym (char const *, unsigned int); -static struct field *getsym (char const *); - -static struct field *sym_table_tail; - -static FILE* fp; - -/* Bit array intermediary representation */ -struct blob { - unsigned int bloblen; - unsigned char *blb; - unsigned short checksum; - unsigned char *actualblob; - unsigned int lenactualblob; -}; - -#define VALID_BIT 0x80 -#define MAX_WIDTH 32 -#define CHECKSUM_SIZE 16 - -static struct blob *binary; static void check_pointer (void *ptr) { -- cgit v1.2.3