Skip to content

Commit

Permalink
new function-like macros
Browse files Browse the repository at this point in the history
  • Loading branch information
@FT9R
FT9R committed May 22, 2024
1 parent bf7d1bb commit a397d72
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 16 deletions.
28 changes: 20 additions & 8 deletions Examples/ArduinoNano/w25qxx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,36 +80,48 @@ enum w25qxx_Device_e { W25Q80 = 0x13, W25Q16, W25Q32, W25Q64, W25Q128 };
#define W25QXX_BLOCK_64KB_TO_ADDRESS(BLOCK) ((uint32_t) (BLOCK) * W25QXX_BLOCK_SIZE_64KB)
#define W25QXX_KB_TO_BYTE(KB) ((uint32_t) (KB) * 1024)

#define W25QXX_ADDRESS_BYTES_SWAP(ADDRESS) \
w25qxx_Handle->addressBytes[0] = (uint8_t) ((ADDRESS) >> 16); \
w25qxx_Handle->addressBytes[1] = (uint8_t) ((ADDRESS) >> 8); \
w25qxx_Handle->addressBytes[2] = (uint8_t) ((ADDRESS) >> 0)
#define W25QXX_ADDRESS_BYTES_SWAP(ADDRESS) \
do \
{ \
w25qxx_Handle->addressBytes[0] = (uint8_t) ((ADDRESS) >> 16); \
w25qxx_Handle->addressBytes[1] = (uint8_t) ((ADDRESS) >> 8); \
w25qxx_Handle->addressBytes[2] = (uint8_t) ((ADDRESS) >> 0); \
} \
while (0)

#define W25QXX_ERROR_SET(W25QXX_ERROR) \
do \
{ \
w25qxx_Handle->error = (W25QXX_ERROR); \
if (w25qxx_Handle->interface.CS_Set != NULL) \
w25qxx_Handle->interface.CS_Set(W25QXX_CS_HIGH); \
return; \
}
} \
while (0)

#define W25QXX_ERROR_CHECK(W25QXX_ERROR) \
do \
{ \
if (w25qxx_Handle->error != W25QXX_ERROR_NONE) \
W25QXX_ERROR_SET((W25QXX_ERROR)); \
}
} \
while (0)

#define W25QXX_BEGIN_TRASMIT(DATA_SOURCE, SIZE, TIMEOUT) \
do \
{ \
if (w25qxx_Handle->interface.Transmit((DATA_SOURCE), (SIZE), (TIMEOUT)) != W25QXX_TRANSFER_SUCCESS) \
W25QXX_ERROR_SET(W25QXX_ERROR_SPI); \
}
} \
while (0)

#define W25QXX_BEGIN_RECEIVE(DATA_DESTINATION, SIZE, TIMEOUT) \
do \
{ \
if (w25qxx_Handle->interface.Receive((DATA_DESTINATION), (SIZE), (TIMEOUT)) != W25QXX_TRANSFER_SUCCESS) \
W25QXX_ERROR_SET(W25QXX_ERROR_SPI); \
}
} \
while (0)

/* Data types */
typedef enum w25qxx_WaitForTask_e { W25QXX_WAIT_NO, W25QXX_WAIT_DELAY, W25QXX_WAIT_BUSY } w25qxx_WaitForTask_t;
Expand Down
28 changes: 20 additions & 8 deletions w25qxx/w25qxx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,36 +80,48 @@ enum w25qxx_Device_e { W25Q80 = 0x13, W25Q16, W25Q32, W25Q64, W25Q128 };
#define W25QXX_BLOCK_64KB_TO_ADDRESS(BLOCK) ((uint32_t) (BLOCK) * W25QXX_BLOCK_SIZE_64KB)
#define W25QXX_KB_TO_BYTE(KB) ((uint32_t) (KB) * 1024)

#define W25QXX_ADDRESS_BYTES_SWAP(ADDRESS) \
w25qxx_Handle->addressBytes[0] = (uint8_t) ((ADDRESS) >> 16); \
w25qxx_Handle->addressBytes[1] = (uint8_t) ((ADDRESS) >> 8); \
w25qxx_Handle->addressBytes[2] = (uint8_t) ((ADDRESS) >> 0)
#define W25QXX_ADDRESS_BYTES_SWAP(ADDRESS) \
do \
{ \
w25qxx_Handle->addressBytes[0] = (uint8_t) ((ADDRESS) >> 16); \
w25qxx_Handle->addressBytes[1] = (uint8_t) ((ADDRESS) >> 8); \
w25qxx_Handle->addressBytes[2] = (uint8_t) ((ADDRESS) >> 0); \
} \
while (0)

#define W25QXX_ERROR_SET(W25QXX_ERROR) \
do \
{ \
w25qxx_Handle->error = (W25QXX_ERROR); \
if (w25qxx_Handle->interface.CS_Set != NULL) \
w25qxx_Handle->interface.CS_Set(W25QXX_CS_HIGH); \
return; \
}
} \
while (0)

#define W25QXX_ERROR_CHECK(W25QXX_ERROR) \
do \
{ \
if (w25qxx_Handle->error != W25QXX_ERROR_NONE) \
W25QXX_ERROR_SET((W25QXX_ERROR)); \
}
} \
while (0)

#define W25QXX_BEGIN_TRASMIT(DATA_SOURCE, SIZE, TIMEOUT) \
do \
{ \
if (w25qxx_Handle->interface.Transmit((DATA_SOURCE), (SIZE), (TIMEOUT)) != W25QXX_TRANSFER_SUCCESS) \
W25QXX_ERROR_SET(W25QXX_ERROR_SPI); \
}
} \
while (0)

#define W25QXX_BEGIN_RECEIVE(DATA_DESTINATION, SIZE, TIMEOUT) \
do \
{ \
if (w25qxx_Handle->interface.Receive((DATA_DESTINATION), (SIZE), (TIMEOUT)) != W25QXX_TRANSFER_SUCCESS) \
W25QXX_ERROR_SET(W25QXX_ERROR_SPI); \
}
} \
while (0)

/* Data types */
typedef enum w25qxx_WaitForTask_e { W25QXX_WAIT_NO, W25QXX_WAIT_DELAY, W25QXX_WAIT_BUSY } w25qxx_WaitForTask_t;
Expand Down

0 comments on commit a397d72

Please sign in to comment.