Compare commits

...

1 Commits

Author SHA1 Message Date
devin
c3204377b1 sdk: link ncdsleep + WPADHIDParser (objdiff 100%)
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-09-30 07:46:30 +00:00
3 changed files with 21 additions and 14 deletions

View File

@@ -1037,7 +1037,7 @@ config.libs = [
),
RevoEXLib("ncd", [
Object(Matching, "ncd/ncdsystem.c"),
Object(NonMatching, "ncd/ncdsleep.c"),
Object(Matching, "ncd/ncdsleep.c"),
]
),
RevoEXLib("net", [
@@ -1552,7 +1552,7 @@ config.libs = [
),
RVLSDKLib("wpad", [
Object(Matching, "wpad/WPAD.c"),
Object(NonMatching, "wpad/WPADHIDParser.c"),
Object(Matching, "wpad/WPADHIDParser.c"),
Object(Matching, "wpad/WPADMem.c"),
Object(Matching, "wpad/WPADEncrypt.c"),
Object(Matching, "wpad/debug_msg.c"),

View File

@@ -37,7 +37,7 @@ static u8 _devType[WPAD_MAX_CONTROLLERS];
static u8 _devMode[WPAD_MAX_CONTROLLERS];
static u8 _devCmpt[WPAD_MAX_CONTROLLERS];
static u8 _retryCnt[WPAD_MAX_CONTROLLERS];
static u8 checkBuffer[21];
static u8 checkBuffer[24];
static f32 rolag[WPAD_MAX_CONTROLLERS];
static f32 calibX[WPAD_MAX_CONTROLLERS];
static f32 calibY[WPAD_MAX_CONTROLLERS];
@@ -739,8 +739,7 @@ void __a1_21_user_data(u8 chan, u8* data) {
if (base + p_wpd->wmReadLength == addr + len) {
DEBUGPrint("base addr: %08x\n", p_wpd->wmReadAddress);
DEBUGPrint("length : %d\n", p_wpd->wmReadLength);
status = WPAD_ERR_TRANSFER;
status &= p_wpd->wmReadHadError >> 31;
status = (p_wpd->wmReadHadError < 0) ? WPAD_ERR_TRANSFER : 0;
DEBUGPrint("i2c = %04x\n", i2c);
DEBUGPrint("enc = %d\n", p_wpd->unk_0x98D);
@@ -824,8 +823,7 @@ void __a1_22_ack(u8 chan, u8* data) {
DEBUGPrint("ack --> report ID = %02x, error code = %d\n", type, err);
status = WPAD_ERR_TRANSFER;
status &= ~-((__cntlzw(err) >> 5) & 1);
status = (err == 0) ? 0 : WPAD_ERR_TRANSFER;
p_status->err = WPAD_ERR_BUSY;
p_status->dev = p_wpd->devType;

View File

@@ -1,18 +1,27 @@
#include <revolution/ncd.h>
#include <revolution/os.h>
static void SleepStart(OSAlarm* alarm, OSContext* context) {
OSResumeThread((OSThread*)alarm->tag);
}
void NCDSleep(OSTime ticks) {
void NCDSleep(OSTime tick) {
OSAlarm alarm;
BOOL enabled=OSDisableInterrupts();
OSThread* thread=OSGetCurrentThread();
if(!thread) { OSRestoreInterrupts(enabled); return; }
s32 level;
OSThread* thread;
level = OSDisableInterrupts();
thread = OSGetCurrentThread();
if (thread == NULL) {
OSRestoreInterrupts(level);
return;
}
OSCreateAlarm(&alarm);
OSSetAlarmTag(&alarm,(u32)thread);
OSSetAlarm(&alarm,ticks,SleepStart);
OSSetAlarmTag(&alarm, (u32)thread);
OSSetAlarm(&alarm, tick, SleepStart);
OSSuspendThread(thread);
OSCancelAlarm(&alarm);
OSRestoreInterrupts(enabled);
OSRestoreInterrupts(level);
}