Updated ffconf.h version, Attempting to fix redefinition of structs

This commit is contained in:
zykrahgaming 2022-01-01 19:05:15 +11:00
parent e898157b18
commit 29da390b1e
4 changed files with 31 additions and 11 deletions

View File

@ -87,7 +87,7 @@ typedef enum {
* @brief Represents command block wrapper structure.
* @details See USB Mass Storage Class Specification.
*/
typedef struct PACKED_VAR {
typedef struct USBCommandBlockWrapper PACKED_VAR {
uint32_t signature;
uint32_t tag;
uint32_t data_len;
@ -101,7 +101,7 @@ typedef struct PACKED_VAR {
* @brief Represents command status wrapper structure.
* @details See USB Mass Storage Class Specification.
*/
typedef struct PACKED_VAR {
typedef struct USBCommandStatusWrapper PACKED_VAR {
uint32_t signature;
uint32_t tag;
uint32_t data_residue;

View File

@ -110,7 +110,7 @@ typedef enum {
* @brief Represents SCSI sense data structure.
* @details See SCSI specification.
*/
typedef struct PACKED_VAR {
typedef struct SCSISense PACKED_VAR {
uint8_t byte[18];
} scsi_sense_response_t;
@ -118,7 +118,7 @@ typedef struct PACKED_VAR {
* @brief Represents SCSI inquiry response structure.
* @details See SCSI specification.
*/
typedef struct PACKED_VAR {
typedef struct SCSIInquiry PACKED_VAR {
uint8_t peripheral;
uint8_t removable;
uint8_t version;
@ -136,7 +136,7 @@ typedef struct PACKED_VAR {
* @brief Represents SCSI unit serial number inquiry response structure.
* @details See SCSI specification.
*/
typedef struct PACKED_VAR {
typedef struct SCSIUnitSerial PACKED_VAR {
uint8_t peripheral;
uint8_t page_code;
uint8_t reserved;
@ -147,7 +147,7 @@ typedef struct PACKED_VAR {
* @brief Represents SCSI mode sense (6) request structure.
* @details See SCSI specification.
*/
typedef struct PACKED_VAR {
typedef struct SCSIModeSenseRequest PACKED_VAR {
uint8_t byte[6];
} scsi_mode_sense6_request_t;
@ -155,7 +155,7 @@ typedef struct PACKED_VAR {
* @brief Represents SCSI mode sense (6) response structure.
* @details See SCSI specification.
*/
typedef struct PACKED_VAR{
typedef struct SCSIModeSenseResponse PACKED_VAR {
uint8_t byte[4];
} scsi_mode_sense6_response_t;
@ -163,7 +163,7 @@ typedef struct PACKED_VAR{
* @brief Represents SCSI read capacity (10) response structure.
* @details See SCSI specification.
*/
typedef struct PACKED_VAR {
typedef struct SCSIReadCapacity PACKED_VAR {
uint32_t last_block_addr;
uint32_t block_size;
} scsi_read_capacity10_response_t;
@ -172,7 +172,7 @@ typedef struct PACKED_VAR {
* @brief Represents SCSI read format capacity response structure.
* @details See SCSI specification.
*/
typedef struct PACKED_VAR {
typedef struct SCSIReadFormat PACKED_VAR {
uint8_t header[4];
uint8_t blocknum[4];
uint8_t blocklen[4];

View File

@ -2,7 +2,7 @@
/ FatFs - Configuration file
/---------------------------------------------------------------------------*/
#define FFCONF_DEF 86606 /* Revision ID */
#define FFCONF_DEF 86631 /* Revision ID */
/*---------------------------------------------------------------------------/
/ Function Configurations
@ -180,6 +180,16 @@
/ GET_SECTOR_SIZE command. */
#define FF_LBA64 0
/* This option switches support for 64-bit LBA. (0:Disable or 1:Enable)
/ To enable the 64-bit LBA, also exFAT needs to be enabled. (FF_FS_EXFAT == 1) */
#define FF_MIN_GPT 0x10000000
/* Minimum number of sectors to switch GPT as partitioning format in f_mkfs and
/ f_fdisk function. 0x100000000 max. This option has no effect when FF_LBA64 == 0. */
#define FF_USE_TRIM 0
/* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)
/ To enable Trim function, also CTRL_TRIM command should be implemented to the

View File

@ -2,7 +2,7 @@
/ FatFs - Configuration file
/---------------------------------------------------------------------------*/
#define FFCONF_DEF 86606 /* Revision ID */
#define FFCONF_DEF 86631 /* Revision ID */
/*---------------------------------------------------------------------------/
/ Function Configurations
@ -180,6 +180,16 @@
/ GET_SECTOR_SIZE command. */
#define FF_LBA64 0
/* This option switches support for 64-bit LBA. (0:Disable or 1:Enable)
/ To enable the 64-bit LBA, also exFAT needs to be enabled. (FF_FS_EXFAT == 1) */
#define FF_MIN_GPT 0x10000000
/* Minimum number of sectors to switch GPT as partitioning format in f_mkfs and
/ f_fdisk function. 0x100000000 max. This option has no effect when FF_LBA64 == 0. */
#define FF_USE_TRIM 0
/* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)
/ To enable Trim function, also CTRL_TRIM command should be implemented to the