From d91f04f293c44cd56f602863239a27fbe463b5f1 Mon Sep 17 00:00:00 2001 From: Blackaddr Date: Tue, 8 Mar 2022 20:48:14 -0500 Subject: [PATCH] Add support for 64M memory --- src/BAHardware.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/BAHardware.h b/src/BAHardware.h index befe8da..1fdf93f 100644 --- a/src/BAHardware.h +++ b/src/BAHardware.h @@ -61,7 +61,8 @@ enum class ExpansionBoard : unsigned { enum class SpiMemorySize : unsigned { NO_MEMORY = 0, ///< default, indicates no SPI memory installed MEM_1M, ///< indicates 1Mbit memory is installed - MEM_4M ///< indicates 4Mbit memory is installed + MEM_4M, ///< indicates 4Mbit memory is installed + MEM_64M ///< indicates 64Mbit memory is installed }; constexpr unsigned NUM_MEM_SLOTS = 2; ///< The TGA Pro has two SPI ports for memory @@ -81,6 +82,12 @@ struct SpiMemoryDefinition { size_t DIE_BOUNDARY; }; +/// Settings for 64Mbit SPI MEM +constexpr SpiMemoryDefinition SPI_MEMORY_64M = { + .MEM_SIZE_BYTES = 8388608, + .DIE_BOUNDARY = 0 +}; + /// Settings for 4Mbit SPI MEM constexpr SpiMemoryDefinition SPI_MEMORY_4M = { .MEM_SIZE_BYTES = 524288, @@ -201,10 +208,12 @@ extern BAHardware BAHardwareConfig; ///< external definition of global configura #define TGA_PRO_EXPAND_REV2(x) BALibrary::BAHardwareConfig.setExpansionBoard(ExpansionBoard::REV_2) ///< Macro for specifying REV 2 of the Expansion Board #define TGA_PRO_EXPAND_REV3(x) BALibrary::BAHardwareConfig.setExpansionBoard(ExpansionBoard::REV_3) ///< Macro for specifying REV 2 of the Expansion Board -#define SPI_MEM0_1M(x) BALibrary::BAHardwareConfig.set(MEM0, SPI_MEMORY_1M) ///< Macro for specifying MEM0 is 1Mbit -#define SPI_MEM0_4M(x) BALibrary::BAHardwareConfig.set(MEM0, SPI_MEMORY_4M) ///< Macro for specifying MEM1 is 4Mbit -#define SPI_MEM1_1M(x) BALibrary::BAHardwareConfig.set(MEM1, SPI_MEMORY_1M) ///< Macro for specifying MEM0 is 1Mbit -#define SPI_MEM1_4M(x) BALibrary::BAHardwareConfig.set(MEM1, SPI_MEMORY_4M) ///< Macro for specifying MEM1 is 1Mbit +#define SPI_MEM0_1M(x) BALibrary::BAHardwareConfig.set(MEM0, SPI_MEMORY_1M) ///< Macro for specifying MEM0 is 1Mbit +#define SPI_MEM0_4M(x) BALibrary::BAHardwareConfig.set(MEM0, SPI_MEMORY_4M) ///< Macro for specifying MEM0 is 4Mbit +#define SPI_MEM0_64M(x) BALibrary::BAHardwareConfig.set(MEM0, SPI_MEMORY_64M) ///< Macro for specifying MEM0 is 64Mbit +#define SPI_MEM1_1M(x) BALibrary::BAHardwareConfig.set(MEM1, SPI_MEMORY_1M) ///< Macro for specifying MEM1 is 1Mbit +#define SPI_MEM1_4M(x) BALibrary::BAHardwareConfig.set(MEM1, SPI_MEMORY_4M) ///< Macro for specifying MEM1 is 4Mbit +#define SPI_MEM1_64M(x) BALibrary::BAHardwareConfig.set(MEM1, SPI_MEMORY_64M) ///< Macro for specifying MEM1 is 64Mbit extern uint8_t USR_LED_ID; ///< Teensy IO number for the user LED.