added PACKED attribute for structures and reorganize include folder

include/pmflash.h

@@ -0,0 +1,97 @@
+//-----------------------------------------------------------------------------
+// (c) RFID Research Group - 2019
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//
+//-----------------------------------------------------------------------------
+// RDV4 flash constants
+//-----------------------------------------------------------------------------
+
+#ifndef __PMFLASH_H
+#define __PMFLASH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "common.h"
+
+// Flashmem spi baudrate
+extern uint32_t FLASHMEM_SPIBAUDRATE;
+
+// RDV40 Section
+// 256kb divided into 4k sectors.
+//
+// 0x3F000 - 1 4kb sector = signature
+// 0x3E000 - 1 4kb sector = settings
+// 0x3D000 - 1 4kb sector = default T55XX keys dictionary
+// 0x3B000 - 1 4kb sector = default ICLASS keys dictionary
+// 0x39000 - 2 4kb sectors = default MFC keys dictionary
+//
+#ifndef FLASH_MEM_BLOCK_SIZE
+# define FLASH_MEM_BLOCK_SIZE   256
+#endif
+
+#ifndef FLASH_MEM_MAX_SIZE
+# define FLASH_MEM_MAX_SIZE     0x40000  // (262144)
+#endif
+
+#ifndef FLASH_MEM_MAX_4K_SECTOR
+# define FLASH_MEM_MAX_4K_SECTOR   0x3F000
+#endif
+
+
+#ifndef FLASH_MEM_ID_LEN
+# define FLASH_MEM_ID_LEN 8
+#endif
+
+#ifndef FLASH_MEM_SIGNATURE_LEN
+# define FLASH_MEM_SIGNATURE_LEN 128
+#endif
+
+#ifndef FLASH_MEM_SIGNATURE_OFFSET
+// -1 for historical compatibility with already released Proxmark3 RDV4.0 devices
+# define FLASH_MEM_SIGNATURE_OFFSET (FLASH_MEM_MAX_SIZE - FLASH_MEM_SIGNATURE_LEN - 1)
+#endif
+
+#ifndef T55XX_CONFIG_LEN
+# define T55XX_CONFIG_LEN sizeof( t55xx_config )
+#endif
+
+#ifndef T55XX_CONFIG_OFFSET
+# define T55XX_CONFIG_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x2000)
+#endif
+
+// Reserved space for T55XX PWD = 4 kb
+#ifndef DEFAULT_T55XX_KEYS_OFFSET
+# define DEFAULT_T55XX_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000)
+#endif
+
+// Reserved space for iClass keys = 4 kb
+#ifndef DEFAULT_ICLASS_KEYS_OFFSET
+# define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
+#endif
+
+// Reserved space for MIFARE Keys = 8 kb
+#ifndef DEFAULT_MF_KEYS_OFFSET
+# define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x6000)
+#endif
+
+// RDV40,  validation structure to help identifying that client/firmware is talking with RDV40
+typedef struct {
+    uint8_t magic[4];
+    uint8_t flashid[FLASH_MEM_ID_LEN];
+    uint8_t signature[FLASH_MEM_SIGNATURE_LEN];
+} PACKED rdv40_validation_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __PMFLASH_H