From 4483baab02f3a80d262d42cb69961f1f349b5d1e Mon Sep 17 00:00:00 2001 From: Diego Ismirlian Date: Thu, 8 Jun 2017 12:38:14 -0300 Subject: USBH: UVC, fix compile with IAR --- os/hal/include/usbh/dev/uvc.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'os/hal/include/usbh/dev') diff --git a/os/hal/include/usbh/dev/uvc.h b/os/hal/include/usbh/dev/uvc.h index ab12199..c68a082 100644 --- a/os/hal/include/usbh/dev/uvc.h +++ b/os/hal/include/usbh/dev/uvc.h @@ -182,7 +182,7 @@ typedef enum { } usbh_uvc_ctrl_vs_interface_controls_t; -typedef struct { +typedef PACKED_STRUCT { uint8_t bLength; uint8_t bDescriptorType; uint8_t bDescriptorSubType; @@ -194,9 +194,9 @@ typedef struct { uint8_t bAspectRatioY; uint8_t bmInterfaceFlags; uint8_t bCopyProtect; -} __attribute__((__packed__)) usbh_uvc_format_mjpeg_t; +} usbh_uvc_format_mjpeg_t; -typedef struct { +typedef PACKED_STRUCT { uint8_t bLength; uint8_t bDescriptorType; uint8_t bDescriptorSubType; @@ -210,10 +210,10 @@ typedef struct { uint32_t dwDefaultFrameInterval; uint8_t bFrameIntervalType; uint32_t dwFrameInterval[0]; -} __attribute__((__packed__)) usbh_uvc_frame_mjpeg_t; +} usbh_uvc_frame_mjpeg_t; -typedef struct { +typedef PACKED_STRUCT { uint8_t bLength; uint8_t bDescriptorType; uint8_t bDescriptorSubType; @@ -227,9 +227,9 @@ typedef struct { uint32_t dwDefaultFrameInterval; uint8_t bFrameIntervalType; uint32_t dwFrameInterval[0]; -} __attribute__((__packed__)) usbh_uvc_frame_uncompressed_t; +} usbh_uvc_frame_uncompressed_t; -typedef struct { +typedef PACKED_STRUCT { uint8_t bLength; uint8_t bDescriptorType; uint8_t bDescriptorSubType; @@ -242,9 +242,9 @@ typedef struct { uint8_t bAspectRatioY; uint8_t bmInterfaceFlags; uint8_t bCopyProtect; -} __attribute__((__packed__)) usbh_uvc_format_uncompressed; +} usbh_uvc_format_uncompressed; -typedef struct { +typedef PACKED_STRUCT { uint16_t bmHint; uint8_t bFormatIndex; uint8_t bFrameIndex; @@ -261,7 +261,7 @@ typedef struct { // uint8_t bPreferedVersion; // uint8_t bMinVersion; // uint8_t bMaxVersion; -} __attribute__((__packed__)) usbh_uvc_ctrl_vs_probecommit_data_t; +} usbh_uvc_ctrl_vs_probecommit_data_t; -- cgit v1.2.3