diff options
| author | Uladzimir Pylinski <barthess@yandex.ru> | 2017-06-09 08:10:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-09 08:10:34 +0300 |
| commit | ca686a5cbab4a2c6de321e7f1a9c06c28fd56f9a (patch) | |
| tree | 0f90e9cc2f1cceee038eaabd3a21892e7d8b0ea8 /os/hal/include | |
| parent | 830f09e2b7d9af3146b1ecd8821664d874355005 (diff) | |
| parent | 4483baab02f3a80d262d42cb69961f1f349b5d1e (diff) | |
| download | ChibiOS-Contrib-ca686a5cbab4a2c6de321e7f1a9c06c28fd56f9a.tar.gz ChibiOS-Contrib-ca686a5cbab4a2c6de321e7f1a9c06c28fd56f9a.tar.bz2 ChibiOS-Contrib-ca686a5cbab4a2c6de321e7f1a9c06c28fd56f9a.zip | |
Merge pull request #118 from dismirlian/usbh_devel
USBH: fix compile with IAR
Diffstat (limited to 'os/hal/include')
| -rw-r--r-- | os/hal/include/usbh/dev/uvc.h | 20 |
1 files changed, 10 insertions, 10 deletions
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; |