mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary NX_PACKED in some structs

Browse Source
This commit is contained in:
XorTroll 2025-05-17 19:21:20 +02:00
parent 4ba2e20939
commit f3cad8cb9a
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nx/include/switch/services/nfc.h
View File

@ -118,27 +118,27 @@ typedef struct {
u16 year; u16 year;
u8 month; u8 month;
u8 day; u8 day;
} NX_PACKED NfpDate; } NfpDate;
typedef struct { typedef struct {
u8 uid[10]; ///< UUID. u8 uid[10]; ///< UUID.
u8 uid_length; ///< UUID length. u8 uid_length; ///< UUID length.
u8 reserved1[0x15]; u8 reserved[0x15];
} NX_PACKED NfcTagUid; } NfcTagUid;
typedef struct { typedef struct {
NfcTagUid uid; ///< UUID. NfcTagUid uid; ///< UUID.
u32 protocol; ///< \ref NfcProtocol u32 protocol; ///< \ref NfcProtocol
u32 tag_type; ///< \ref NfcTagType u32 tag_type; ///< \ref NfcTagType
u8 reserved2[0x30]; u8 reserved[0x30];
} NX_PACKED NfpTagInfo; } NfpTagInfo;
typedef struct { typedef struct {
NfcTagUid uid; ///< UUID. NfcTagUid uid; ///< UUID.
u32 protocol; ///< \ref NfcProtocol u32 protocol; ///< \ref NfcProtocol
u32 tag_type; ///< \ref NfcTagType u32 tag_type; ///< \ref NfcTagType
u8 reserved2[0x30]; u8 reserved[0x30];
} NX_PACKED NfcTagInfo; } NfcTagInfo;
typedef struct { typedef struct {
NfpDate last_write_date; NfpDate last_write_date;
@ -146,7 +146,7 @@ typedef struct {
u16 version; u16 version;
u32 application_area_size; u32 application_area_size;
u8 reserved[0x34]; u8 reserved[0x34];
} NX_PACKED NfpCommonInfo; } NfpCommonInfo;
typedef struct { typedef struct {
union { union {
@ -159,8 +159,8 @@ typedef struct {
u8 series_id; ///< Series. u8 series_id; ///< Series.
u16 numbering_id; ///< Model number. u16 numbering_id; ///< Model number.
u8 nfp_type; ///< Figure type. u8 nfp_type; ///< Figure type.
u8 reserved1[0x39]; u8 reserved[0x39];
} NX_PACKED NfpModelInfo; } NfpModelInfo;
typedef struct { typedef struct {
MiiCharInfo mii; MiiCharInfo mii;
@ -168,7 +168,7 @@ typedef struct {
char amiibo_name[(10*4)+1]; ///< Amiibo name (utf-8, null-terminated). char amiibo_name[(10*4)+1]; ///< Amiibo name (utf-8, null-terminated).
u8 font_region; u8 font_region;
u8 reserved[0x7A]; u8 reserved[0x7A];
} NX_PACKED NfpRegisterInfo; } NfpRegisterInfo;
typedef struct { typedef struct {
MiiStoreData mii_store_data; MiiStoreData mii_store_data;
@ -176,7 +176,7 @@ typedef struct {
char amiibo_name[(10*4)+1]; ///< Amiibo name (utf-8, null-terminated). char amiibo_name[(10*4)+1]; ///< Amiibo name (utf-8, null-terminated).
u8 font_region; u8 font_region;
u8 reserved[0x8E]; u8 reserved[0x8E];
} NX_PACKED NfpRegisterInfoPrivate; } NfpRegisterInfoPrivate;
typedef struct { typedef struct {
u64 application_id; u64 application_id;
@ -186,7 +186,7 @@ typedef struct {
u8 tag_type; u8 tag_type;
u8 application_area_version; u8 application_area_version;
u8 reserved[0x2F]; u8 reserved[0x2F];
} NX_PACKED NfpAdminInfo; } NfpAdminInfo;
typedef struct { typedef struct {
u8 tag_magic; ///< Tag magic (always 0xA5: https://www.3dbrew.org/wiki/Amiibo#Page_layout). u8 tag_magic; ///< Tag magic (always 0xA5: https://www.3dbrew.org/wiki/Amiibo#Page_layout).
@ -217,7 +217,7 @@ typedef struct {
u8 application_id_byte; ///< Application ID byte ((Application ID >> 28) & 0xFF) u8 application_id_byte; ///< Application ID byte ((Application ID >> 28) & 0xFF)
u8 reserved5[0x2E]; u8 reserved5[0x2E];
u8 application_area[0xD8]; ///< Application area. u8 application_area[0xD8]; ///< Application area.
} NX_PACKED NfpData; } NfpData;
typedef struct { typedef struct {
u8 mifare_command; u8 mifare_command;