diff options
| author | Thomas Huth <thuth@redhat.com> | 2016-08-03 21:34:43 +0200 |
|---|---|---|
| committer | Alexey Kardashevskiy <aik@ozlabs.ru> | 2016-08-16 18:52:56 +1000 |
| commit | a518b808658f37d329b88254c0016780d3c4d5ba (patch) | |
| tree | da0e42a7c8ca83f45b732e579511f8069e87c7b4 /include/calculatecrc.h | |
| parent | 6966116b7ca606b8d2acc9c1ceacfdcb9d983f53 (diff) | |
| download | SLOF-a518b808658f37d329b88254c0016780d3c4d5ba.zip SLOF-a518b808658f37d329b88254c0016780d3c4d5ba.tar.gz SLOF-a518b808658f37d329b88254c0016780d3c4d5ba.tar.bz2 | |
Improve indentation in calculatecrc.h
Since this header file is not included from assembler files anymore,
we can remove the "#ifndef __ASSEMBLER__" here now and get rid of
the unnecessary indentation in this file.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Diffstat (limited to 'include/calculatecrc.h')
| -rw-r--r-- | include/calculatecrc.h | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/include/calculatecrc.h b/include/calculatecrc.h index 434af46..26a90df 100644 --- a/include/calculatecrc.h +++ b/include/calculatecrc.h @@ -12,31 +12,29 @@ #ifndef CALCULATECRC_H #define CALCULATECRC_H - #define FLASHFS_DATADDR 0x18 // uint64_t position of pointer to data - #define FLASHFS_FILE_SIZE_ADDR 0x08 // uint64_t pos of total flashimage size value relative to data - #define FLASHFS_HEADER_SIZE_ADDR 0x08 // uint64_t position of total flash header size value +#define FLASHFS_DATADDR 0x18 // uint64_t position of pointer to data +#define FLASHFS_FILE_SIZE_ADDR 0x08 // uint64_t pos of total flashimage size value relative to data +#define FLASHFS_HEADER_SIZE_ADDR 0x08 // uint64_t position of total flash header size value - #ifndef __ASSEMBLER__ - #define FLASHFS_ROMADDR 0x00 // uint64_t position of pointer to next file - #define FLASHFS_HEADER_DATA_SIZE 0x68 // 104 bytes of total header data size - #define CRC_METHODE Ethernet_32 // define the CRc genarator (CRC 16 bit to 64 is supported) +#define FLASHFS_ROMADDR 0x00 // uint64_t position of pointer to next file +#define FLASHFS_HEADER_DATA_SIZE 0x68 // 104 bytes of total header data size +#define CRC_METHODE Ethernet_32 // define the CRC genarator (CRC 16 bit to 64 is supported) - //--- header format --------------------------------- - struct stH { - char magic[8]; // (generic!) headerfile - uint64_t flashlen; // dyn - char version[16]; // $DRIVER_INFO alignment! - char platform_name[32]; // (hardware) headerfile - char date[6]; // dyn (format -> JB) - char padding1[2]; // padding byte - char mdate[6]; // modify date - char padding2[2]; // padding byte - char platform_revision[4];// (hardware) headerfile - uint32_t padding; - uint64_t ui64CRC; // insert calculated CRC here - uint64_t ui64FileEnd; // = 0xFFFF FFFF FFFF FFFF - }; - #endif /* __ASSEMBLER__ */ +//--- header format --------------------------------- +struct stH { + char magic[8]; // (generic!) headerfile + uint64_t flashlen; // dyn + char version[16]; // $DRIVER_INFO alignment! + char platform_name[32]; // (hardware) headerfile + char date[6]; // dyn (format -> JB) + char padding1[2]; // padding byte + char mdate[6]; // modify date + char padding2[2]; // padding byte + char platform_revision[4];// (hardware) headerfile + uint32_t padding; + uint64_t ui64CRC; // insert calculated CRC here + uint64_t ui64FileEnd; // = 0xFFFF FFFF FFFF FFFF +}; #endif /* CALCULATECRC_H */ |