Skip to content

Add WUT_SIZED_ACCESS #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
capitalistspz wants to merge 3 commits into
base: master
Choose a base branch
from
+17 −17
Draft

Add WUT_SIZED_ACCESS #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9e4923
Add `WUT_ACCESS` and `WUT_ACCESS_SIZED` attribute macros
capitalistspz Aug 18, 2025
71371d3
Remove `WUT_ACCESS`, rename `WUT_ACCESS_SIZED` to `WUT_SIZED_ACCESS`.
capitalistspz Sep 4, 2025
5f7ff6a
Apply `WUT_SIZED_ACCESS` to wpad.h
capitalistspz Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions include/padscore/wpad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ WPADCanSendStreamData(WPADChan channel);
WPADError
WPADSendStreamData(WPADChan channel,
const void *data,
uint32_t size);
uint32_t size) WUT_SIZED_ACCESS(read_only, 2, 3);

/**
* Encode 16-bit LPCM as 4-bit Yamaha ADPCM
Expand All @@ -921,7 +921,7 @@ WENCGetEncodeData(WENCParams *params,
BOOL continuing,
const int16_t *samples,
uint32_t sampleCount,
uint8_t *outEncodedData);
uint8_t *outEncodedData) WUT_SIZED_ACCESS(read_only, 3, 4);

/**
* Returns the global Wii Remote speaker volume
Expand Down Expand Up @@ -989,7 +989,7 @@ WPADReadMemoryAsync(WPADChan channel,
void *destination,
uint16_t size,
uint32_t address,
WPADCallback callback);
WPADCallback callback) WUT_SIZED_ACCESS(write_only, 2, 3);

/**
* Writes to the device's memory
Expand All @@ -1005,10 +1005,10 @@ WPADReadMemoryAsync(WPADChan channel,
*/
WPADError
WPADWriteMemoryAsync(WPADChan channel,
void *source,
const void *source,
uint32_t size,
uint32_t address,
WPADCallback callback);
WPADCallback callback) WUT_SIZED_ACCESS(read_only, 2, 3);

/**
* Reads from the registers of the Wii Remote's peripherals
Expand All @@ -1023,7 +1023,7 @@ WPADReadExtReg(WPADChan channel,
uint16_t size,
WPADPeripheralSpace peripheral,
uint32_t address,
WPADCallback callback);
WPADCallback callback) WUT_SIZED_ACCESS(write_only, 2, 3);

/**
* Writes to the registers of the Wii Remote's peripherals
Expand All @@ -1046,7 +1046,7 @@ WPADWriteExtReg(WPADChan channel,
uint32_t size,
WPADPeripheralSpace peripheral,
uint32_t address,
WPADCallback callback);
WPADCallback callback) WUT_SIZED_ACCESS(read_only, 2, 3);

/**
* Read Balance Board calibration.
Expand All @@ -1059,7 +1059,7 @@ WPADGetBLCalibration(WPADChan channel,
void *destination,
uint32_t address,
uint32_t size,
WPADCallback callback);
WPADCallback callback) WUT_SIZED_ACCESS(write_only, 2, 4);

/**
* Sets power save mode, this makes the controller only report input data
Expand Down Expand Up @@ -1324,8 +1324,8 @@ WPADiSendMuteSpeaker(WPADiQueue *cmdQueue,
*/
BOOL
WPADiSendStreamData(WPADiQueue *cmdQueue,
void *source,
uint32_t size);
const void *source,
uint32_t size) WUT_SIZED_ACCESS(read_only, 2, 3);

/**
* Queues HID Report for a single-byte memory write
Expand All @@ -1344,10 +1344,10 @@ WPADiSendWriteDataCmd(WPADiQueue *cmdQueue,
*/
BOOL
WPADiSendWriteData(WPADiQueue *cmdQueue,
void *source,
const void *source,
uint32_t size,
uint32_t address,
WPADCallback callback);
WPADCallback callback) WUT_SIZED_ACCESS(read_only, 2, 3);

/**
* Queues HID Report for a memory read
Expand All @@ -1359,7 +1359,7 @@ WPADiSendReadData(WPADiQueue *cmdQueue,
void *destination,
uint16_t size,
uint32_t address,
WPADCallback callback);
WPADCallback callback) WUT_SIZED_ACCESS(write_only, 2, 3);

/**
* Game code (identifier), which may be saved to the EEPROM of connected controllers
Expand Down Expand Up @@ -1428,7 +1428,7 @@ WPADiWriteGameData(WPADChan channel,
const void *source,
uint16_t size,
uint32_t offset,
WPADCallback callback);
WPADCallback callback) WUT_SIZED_ACCESS(read_only, 2, 3);

/**
* Read custom game data from the controller's EEPROM
Expand All @@ -1446,7 +1446,7 @@ WPADiReadGameData(WPADChan channel,
void *destination,
uint16_t size,
uint32_t offset,
WPADCallback callback);
WPADCallback callback) WUT_SIZED_ACCESS(read_only, 2, 3);

/**
* Get MotionPlus mode
Expand Down
4 changes: 2 additions & 2 deletions include/wut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

#define WUT_DEPRECATED(reason) __attribute__((__deprecated__(reason)))
#define WUT_FORMAT_PRINTF(fmt, args) __attribute__((__format__(__printf__, fmt, args)))

#define WUT_SIZED_ACCESS(access_type, ptr_index, size_index) __attribute__ ((__access__(access_type, ptr_index, size_index)))
#else // not __GNUC__ and not __clang__

#define WUT_DEPRECATED(reason)
#define WUT_FORMAT_PRINTF(fmt, args)

#define WUT_SIZED_ACCESS(access_type, ptr_index, size_index)
#endif //__GNUC__ or __clang__

#ifdef DEBUG
Expand Down