Emulation/orbum
1
0
Fork 0
mirror of https://github.com/hch12907/orbum.git synced 2024-05-20 05:00:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Turn off logging for now - SIO2/SIO0 appears to work.

Browse source 
Currently the IOP is not sending any data to the SIO2 so I can't check anything further. Possibly waiting on the EE Core to do something?
This commit is contained in:
Marco Satti 2018-07-29 17:24:42 +08:00
parent 7e660980c9
commit 2ac3746d30
2 changed files with 1 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
liborbum/src/Controller/Iop/Sio0/CSio0.cpp
View file

@ -120,8 +120,6 @@ void CSio0::handle_transfer()
// Sequential command/response action.
auto _stat_lock = stat.scope_lock();
// Check there is data to send first, TX_RDY2 changes depending on this.
if (!command_queue.has_read_available(1))
{
@ -133,11 +131,10 @@ void CSio0::handle_transfer()
return;
ubyte cmd = command_queue.read_ubyte();
BOOST_LOG(Core::get_logger()) << str(boost::format("~~~~~ SIO0 received cmd: 0x%02X") % cmd);
// TODO: properly implement, for now just send back 0x00 for all commands received.
response_queue.write_ubyte(0);
BOOST_LOG(Core::get_logger()) << "~~~~~ SIO0 sent response: 0x00 (not connected)";
auto _stat_lock = stat.scope_lock();
stat.insert_field(Sio0Register_Stat::RX_NONEMPTY, 1);
}

34
liborbum/src/Controller/Iop/Sio2/CSio2.cpp
View file

@ -85,9 +85,6 @@ void CSio2::handle_ctrl_check()
// Reset direction bits - they are write only (see register description).
ctrl.insert_field(Sio2Register_Ctrl::DIRECTION, 0);
BOOST_LOG(Core::get_logger()) << str(boost::format("~~~~~~ SIO2 ctrl set: %s direction")
% (ctrl.transfer_direction == Direction::TX ? "TX" : "RX"));
ctrl.write_latch = false;
}
}
@ -115,23 +112,11 @@ void CSio2::handle_port_trasnfer()
if (!port.ctrl_3->port_transfer_started)
{
static bool warned = false;
if (!port.ctrl_3->write_latch)
{
if (!warned)
{
BOOST_LOG(Core::get_logger()) << "~~~~~~ SIO2 TX/RX stalled: ctrl3 needs to be set by IOP first (write latch not set)";
warned = true;
}
return;
}
warned = false;
port.ctrl_3->port_transfer_started = true;
port.ctrl_3->write_latch = false;
BOOST_LOG(Core::get_logger()) << str(boost::format("~~~~~~ SIO2 TX port %d started") % ctrl.transfer_port);
}
switch (ctrl.transfer_direction)
@ -155,13 +140,11 @@ void CSio2::handle_port_trasnfer()
{
if (ctrl.transfer_direction == Direction::RX)
{
BOOST_LOG(Core::get_logger()) << "~~~~~~ SIO2 RX finished: raising irq";
auto& intc_stat = r.iop.intc.stat;
auto _intc_lock = intc_stat.scope_lock();
intc_stat.insert_field(IopIntcRegister_Stat::SIO2, 1);
}
BOOST_LOG(Core::get_logger()) << "~~~~~~ SIO2 TX or RX all ports finished";
ctrl.transfer_started = false;
}
}
@ -184,26 +167,17 @@ void CSio2::transfer_data_tx()
if (ctrl.transfer_port_count != cmd_length)
{
if (!sio0_stat.extract_field(Sio0Register_Stat::TX_RDY1))
{
BOOST_LOG(Core::get_logger()) << "~~~~~~ SIO2 TX stalled: SIO0 stat.TX_RDY1 not set";
return;
}
if (!data_in.has_read_available(1))
{
BOOST_LOG(Core::get_logger()) << "~~~~~~ SIO2 TX stalled: no FIFO data";
return;
}
// If it's the first byte, perform some initialisation.
if (ctrl.transfer_port_count == 0)
{
// Set the SIO0 pad port first when the SIO0 is ready.
if (!sio0_stat.extract_field(Sio0Register_Stat::TX_RDY2))
{
BOOST_LOG(Core::get_logger()) << "~~~~~~ SIO2 TX stalled (init): SIO0 stat.TX_RDY2 not set";
return;
}
uhword sio0_padport = port.ctrl_3->extract_field(Sio2PortRegister_Ctrl3::PADPORT);
@ -219,7 +193,6 @@ void CSio2::transfer_data_tx()
// Finished with this port, move on to next.
if (ctrl.transfer_port_count == cmd_length)
{
BOOST_LOG(Core::get_logger()) << str(boost::format("~~~~~~ SIO2 TX port %d finished") % ctrl.transfer_port);
ctrl.transfer_port += 1;
ctrl.transfer_port_count = 0;
}
@ -241,16 +214,10 @@ void CSio2::transfer_data_rx()
if (ctrl.transfer_port_count != response_length)
{
if (!data_out.has_write_available(1))
{
BOOST_LOG(Core::get_logger()) << "~~~~~~ SIO2 RX stalled: FIFO full";
return;
}
if (!sio0_stat.extract_field(Sio0Register_Stat::RX_NONEMPTY))
{
BOOST_LOG(Core::get_logger()) << "~~~~~~ SIO2 RX stalled: SIO0 stat.RX_NONEMPTY not set";
return;
}
ubyte data = sio0_data.read_ubyte();
data_out.write_ubyte(data);
@ -260,7 +227,6 @@ void CSio2::transfer_data_rx()
// Finished with this port, move on to next.
if (ctrl.transfer_port_count == response_length)
{
BOOST_LOG(Core::get_logger()) << str(boost::format("~~~~~~ SIO2 RX port %d finished") % ctrl.transfer_port);
port.ctrl_3->port_transfer_started = false;
ctrl.transfer_port += 1;
ctrl.transfer_port_count = 0;