From 887ff945a901fac1fe18d6be7367b7f405a99e1a Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 4 Oct 2018 14:36:34 +0000 Subject: Flash infrastructure rework based on WSPI, not complete. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12320 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/include/hal_wspi.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'os/hal/include/hal_wspi.h') diff --git a/os/hal/include/hal_wspi.h b/os/hal/include/hal_wspi.h index 65f1fe9b0..69d2e2371 100644 --- a/os/hal/include/hal_wspi.h +++ b/os/hal/include/hal_wspi.h @@ -143,20 +143,20 @@ typedef struct { * ensured. * @{ */ -#define WSPI_CFG_INSTRUCTION_MODE_MASK (7LU << 0LU) -#define WSPI_CFG_INSTRUCTION_MODE_NONE (0LU << 0LU) -#define WSPI_CFG_INSTRUCTION_MODE_ONE_LINES (1LU << 0LU) -#define WSPI_CFG_INSTRUCTION_MODE_TWO_LINES (2LU << 0LU) -#define WSPI_CFG_INSTRUCTION_MODE_FOUR_LINES (3LU << 0LU) -#define WSPI_CFG_INSTRUCTION_MODE_EIGHT_LINES (4LU << 0LU) - -#define WSPI_CFG_INSTRUCTION_DDR (1LU << 3LU) - -#define WSPI_CFG_INSTRUCTION_SIZE_MASK (3LU << 4LU) -#define WSPI_CFG_INSTRUCTION_SIZE_8 (0LU << 4LU) -#define WSPI_CFG_INSTRUCTION_SIZE_16 (1LU << 4LU) -#define WSPI_CFG_INSTRUCTION_SIZE_24 (2LU << 4LU) -#define WSPI_CFG_INSTRUCTION_SIZE_32 (3LU << 4LU) +#define WSPI_CFG_CMD_MODE_MASK (7LU << 0LU) +#define WSPI_CFG_CMD_MODE_NONE (0LU << 0LU) +#define WSPI_CFG_CMD_MODE_ONE_LINE (1LU << 0LU) +#define WSPI_CFG_CMD_MODE_TWO_LINES (2LU << 0LU) +#define WSPI_CFG_CMD_MODE_FOUR_LINES (3LU << 0LU) +#define WSPI_CFG_CMD_MODE_EIGHT_LINES (4LU << 0LU) + +#define WSPI_CFG_CMD_DDR (1LU << 3LU) + +#define WSPI_CFG_CMD_SIZE_MASK (3LU << 4LU) +#define WSPI_CFG_CMD_SIZE_8 (0LU << 4LU) +#define WSPI_CFG_CMD_SIZE_16 (1LU << 4LU) +#define WSPI_CFG_CMD_SIZE_24 (2LU << 4LU) +#define WSPI_CFG_CMD_SIZE_32 (3LU << 4LU) #define WSPI_CFG_ADDR_MODE_MASK (7LU << 8LU) #define WSPI_CFG_ADDR_MODE_NONE (0LU << 8LU) -- cgit v1.2.3