rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempting to fix PACKED_VAR redefinition.

This commit is contained in:
zykrahgaming 2022-01-01 19:19:50 +11:00
parent 29da390b1e
commit e66ea3040a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/include/hal_usb_msd.h
View File

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

14
os/various/lib_scsi.h
View File

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