Skip to content

sio2man changes 28032025 #746

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

Merged
merged 2 commits into from
May 11, 2025
Merged

sio2man changes 28032025 #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a07436
refactor: [sio2man] use default callback for mtap handling
uyjulian Mar 29, 2025
fe8fcb1
fix: [sio2man] make sdk1.3.x comapt flags sticky
uyjulian Mar 29, 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
2 changes: 1 addition & 1 deletion iop/system/sio2man/src/exports.tab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ DECLARE_EXPORT(sio2_data_in)
DECLARE_EXPORT(sio2_stat_set)
DECLARE_EXPORT(sio2_stat_get)
DECLARE_EXPORT(sio2_pad_transfer_init_possiblysdk13x) // originally sio2_pad_transfer_init
DECLARE_EXPORT(sio2_pad_transfer_init_possiblysdk13x) // originally sio2_mc_transfer_init
DECLARE_EXPORT(sio2_mc_transfer_init_possiblysdk13x) // originally sio2_mc_transfer_init
DECLARE_EXPORT(sio2_transfer)
DECLARE_EXPORT(sio2_transfer_reset)
DECLARE_EXPORT(sio2_ctrl_set2)
Expand Down
88 changes: 57 additions & 31 deletions iop/system/sio2man/src/sio2man.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ struct sio2man_internal_data
int m_intr_sema;
int m_transfer_semaphore;
// Unofficial: backwards compatibility for libraries using 1.3 SDK
int m_sdk13x_flag;
int m_sdk13x_curflag;
int m_sdk13x_totalflag;
sio2_mtap_change_slot_cb_t m_mtap_change_slot_cb;
sio2_mtap_get_slot_max_cb_t m_mtap_get_slot_max_cb;
sio2_mtap_get_slot_max2_cb_t m_mtap_get_slot_max2_cb;
Expand Down Expand Up @@ -311,12 +312,14 @@ int _start(int ac, char **av)
if ( g_sio2man_data.m_inited )
return 1;
g_sio2man_data.m_inited = 1;
g_sio2man_data.m_sdk13x_flag = 0;
g_sio2man_data.m_sdk13x_curflag = 0;
g_sio2man_data.m_sdk13x_totalflag = 3;
// Unofficial: remove unneeded thread priority argument handler
g_sio2man_data.m_mtap_change_slot_cb = 0;
g_sio2man_data.m_mtap_get_slot_max_cb = 0;
g_sio2man_data.m_mtap_get_slot_max2_cb = 0;
g_sio2man_data.m_mtap_update_slots_cb = 0;
// Unofficial: use setters instead of setting variable directly
sio2_mtap_change_slot_set(NULL);
sio2_mtap_get_slot_max_set(NULL);
sio2_mtap_get_slot_max2_set(NULL);
sio2_mtap_update_slots_set(NULL);
// Unofficial: inlined
sio2_ctrl_set(0x3BC);
CpuSuspendIntr(&state);
Expand Down Expand Up @@ -408,7 +411,7 @@ int sio2_transfer(sio2_transfer_data_t *td)
sio2_set_ctrl_1();
sio2_wait_for_intr();
recv_td(td);
if ( g_sio2man_data.m_sdk13x_flag )
if ( g_sio2man_data.m_sdk13x_curflag )
sio2_transfer_reset();
#ifdef SIO2LOG
log_flush(0);
Expand All @@ -425,73 +428,96 @@ void sio2_pad_transfer_init(void)
#ifdef SIO2LOG
log_default(LOG_PAD_READY);
#endif
g_sio2man_data.m_sdk13x_flag = 0;
g_sio2man_data.m_sdk13x_curflag = 0;
}

void sio2_pad_transfer_init_possiblysdk13x(void)
{
sio2_pad_transfer_init();
g_sio2man_data.m_sdk13x_flag = 1;
g_sio2man_data.m_sdk13x_curflag |= g_sio2man_data.m_sdk13x_totalflag & 1;
}

void sio2_mc_transfer_init_possiblysdk13x(void)
{
sio2_pad_transfer_init();
g_sio2man_data.m_sdk13x_curflag |= g_sio2man_data.m_sdk13x_totalflag & 2;
}

void sio2_transfer_reset(void)
{
g_sio2man_data.m_sdk13x_flag = 0;
g_sio2man_data.m_sdk13x_curflag = 0;
SignalSema(g_sio2man_data.m_transfer_semaphore);
#ifdef SIO2LOG
log_default(LOG_RESET);
#endif
}

static int sio2_mtap_change_slot_default(s32 *arg)
{
int sum;
int i;

sum = 0;
for ( i = 0; i < 4; i += 1 )
{
arg[i + 4] = ((arg[i] + 1) < 2);
sum += arg[i + 4];
}
return sum == 4;
}

static int sio2_mtap_get_slot_max_default(int port)
{
return 1;
}

static void sio2_mtap_update_slots_default(void) {}

void sio2_mtap_change_slot_set(sio2_mtap_change_slot_cb_t cb)
{
g_sio2man_data.m_mtap_change_slot_cb = cb;
// Unofficial: use default callback if NULL
g_sio2man_data.m_mtap_change_slot_cb = cb ? cb : sio2_mtap_change_slot_default;
}

void sio2_mtap_get_slot_max_set(sio2_mtap_get_slot_max_cb_t cb)
{
g_sio2man_data.m_mtap_get_slot_max_cb = cb;
// Unofficial: use default callback if NULL
g_sio2man_data.m_mtap_get_slot_max_cb = cb ? cb : sio2_mtap_get_slot_max_default;
}

void sio2_mtap_get_slot_max2_set(sio2_mtap_get_slot_max2_cb_t cb)
{
g_sio2man_data.m_mtap_get_slot_max2_cb = cb;
// Unofficial: use default callback if NULL
g_sio2man_data.m_mtap_get_slot_max2_cb = cb ? cb : sio2_mtap_get_slot_max_default;
}

void sio2_mtap_update_slots_set(sio2_mtap_update_slots_t cb)
{
g_sio2man_data.m_mtap_update_slots_cb = cb;
// Unofficial: use default callback if NULL
g_sio2man_data.m_mtap_update_slots_cb = cb ? cb : sio2_mtap_update_slots_default;
}

int sio2_mtap_change_slot(s32 *arg)
{
int sum;
int i;

g_sio2man_data.m_sdk13x_flag = 0;
if ( g_sio2man_data.m_mtap_change_slot_cb )
return g_sio2man_data.m_mtap_change_slot_cb(arg);
sum = 0;
for ( i = 0; i < 4; i += 1 )
{
arg[i + 4] = ((arg[i] + 1) < 2);
sum += arg[i + 4];
}
return sum == 4;
g_sio2man_data.m_sdk13x_totalflag &= ~g_sio2man_data.m_sdk13x_curflag;
// Unofficial: unconditionally call callback
return g_sio2man_data.m_mtap_change_slot_cb(arg);
}

int sio2_mtap_get_slot_max(int port)
{
return g_sio2man_data.m_mtap_get_slot_max_cb ? g_sio2man_data.m_mtap_get_slot_max_cb(port) : 1;
// Unofficial: unconditionally call callback
return g_sio2man_data.m_mtap_get_slot_max_cb(port);
}

int sio2_mtap_get_slot_max2(int port)
{
return g_sio2man_data.m_mtap_get_slot_max2_cb ? g_sio2man_data.m_mtap_get_slot_max2_cb(port) : 1;
// Unofficial: unconditionally call callback
return g_sio2man_data.m_mtap_get_slot_max2_cb(port);
}

void sio2_mtap_update_slots(void)
{
if ( g_sio2man_data.m_mtap_update_slots_cb )
g_sio2man_data.m_mtap_update_slots_cb();
// Unofficial: unconditionally call callback
g_sio2man_data.m_mtap_update_slots_cb();
}