diff options
| author | Sunguk Lee | 2020-01-10 01:56:17 +0900 |
|---|---|---|
| committer | GitHub | 2020-01-10 01:56:17 +0900 |
| commit | ceb2478af95283989cc3c2a7809b78c6097a843f (patch) | |
| tree | 9c4515d0e5ecf061d96ef44a4677d05b9f2edadc /include | |
| parent | Match db.yml names pss_crypto_* and update structure (#436) (diff) | |
| parent | Compiler-independent struct align macro (diff) | |
| download | vds-libraries-ceb2478af95283989cc3c2a7809b78c6097a843f.tar.gz | |
Merge pull request #438 from VelocityRa/master
Compiler-independent struct align macro
Diffstat (limited to 'include')
| -rw-r--r-- | include/kernel/udcd.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/kernel/udcd.h b/include/kernel/udcd.h index 51e6287..f23024f 100644 --- a/include/kernel/udcd.h +++ b/include/kernel/udcd.h @@ -2,6 +2,7 @@ #define _PSP2_KERNEL_UDCD_H_ #include <psp2kern/types.h> +#include <vitasdk/align.h> #ifdef __cplusplus extern "C" { @@ -210,7 +211,7 @@ typedef struct SceUdcdStringDescriptor { /** USB device descriptor */ -typedef struct SceUdcdDeviceDescriptor { +typedef struct SCE_ALIGN(4) SceUdcdDeviceDescriptor { unsigned char bLength; unsigned char bDescriptorType; unsigned short bcdUSB; @@ -225,11 +226,11 @@ typedef struct SceUdcdDeviceDescriptor { unsigned char iProduct; unsigned char iSerialNumber; unsigned char bNumConfigurations; -} __attribute__ ((aligned(4))) SceUdcdDeviceDescriptor; +} SceUdcdDeviceDescriptor; /** USB device qualifier descriptor */ -typedef struct SceUdcdDeviceQualifierDescriptor { +typedef struct SCE_ALIGN(4) SceUdcdDeviceQualifierDescriptor { unsigned char bLength; unsigned char bDescriptorType; unsigned short bcdUSB; @@ -239,7 +240,7 @@ typedef struct SceUdcdDeviceQualifierDescriptor { unsigned char bMaxPacketSize0; unsigned char bNumConfigurations; unsigned char bReserved; -} __attribute__ ((aligned(4))) SceUdcdDeviceQualifierDescriptor; +} SceUdcdDeviceQualifierDescriptor; /** USB configuration descriptor */ @@ -375,11 +376,11 @@ typedef struct SceUdcdDeviceRequest { /** USB driver name */ -typedef struct SceUdcdDriverName { +typedef struct SCE_ALIGN(16) SceUdcdDriverName { int size; char name[32]; int flags; -} __attribute__ ((aligned(16))) SceUdcdDriverName; +} SceUdcdDriverName; /** USB device information */ |