mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-04-24 06:14:54 +00:00
IOS/USB: Add more logs to the Wii Speak code
This commit is contained in:
Sepalani
parent
c6a99f7be5
commit
28277d690d
2 changed files with 96 additions and 10 deletions
|
|
@ -173,12 +173,34 @@ int WiiSpeak::SubmitTransfer(std::unique_ptr<IsoMessage> cmd)
|
|||
ERROR_LOG_FMT(IOS_USB, "Wii Speak command invalid");
|
||||
return IPC_EINVAL;
|
||||
}
|
||||
if (cmd->endpoint == 0x81 && m_microphone && m_microphone->HasData())
|
||||
m_microphone->ReadIntoBuffer(packets, cmd->length);
|
||||
|
||||
switch (cmd->endpoint)
|
||||
{
|
||||
case ENDPOINT_AUDIO_IN:
|
||||
// Transfer: Wii Speak -> Wii
|
||||
if (m_microphone && m_microphone->HasData())
|
||||
m_microphone->ReadIntoBuffer(packets, cmd->length);
|
||||
break;
|
||||
case ENDPOINT_AUDIO_OUT:
|
||||
// Transfer: Wii -> Wii Speak
|
||||
break;
|
||||
default:
|
||||
WARN_LOG_FMT(IOS_USB, "Wii Speak unsupported isochronous transfer (endpoint={:02x})",
|
||||
cmd->endpoint);
|
||||
break;
|
||||
}
|
||||
|
||||
// Anything more causes the visual cue to not appear.
|
||||
// Anything less is more choppy audio.
|
||||
cmd->ScheduleTransferCompletion(IPC_SUCCESS, 2500);
|
||||
DEBUG_LOG_FMT(IOS_USB,
|
||||
"Wii Speak isochronous transfer: length={:04x} endpoint={:02x} num_packets={:02x}",
|
||||
cmd->length, cmd->endpoint, cmd->num_packets);
|
||||
|
||||
// According to the Wii Speak specs on wiibrew, it's "USB 2.0 Full-speed Device Module",
|
||||
// so the length of a single frame should be 1 ms.
|
||||
// TODO: Find a proper way to compute the transfer timing.
|
||||
const u32 transfer_timing = 2500; // 2.5 ms
|
||||
cmd->ScheduleTransferCompletion(IPC_SUCCESS, transfer_timing);
|
||||
return IPC_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
@ -190,6 +212,25 @@ void WiiSpeak::SetRegister(const std::unique_ptr<CtrlMessage>& cmd)
|
|||
const u16 arg1 = memory.Read_U16(cmd->data_address + 2);
|
||||
const u16 arg2 = memory.Read_U16(cmd->data_address + 4);
|
||||
|
||||
DEBUG_LOG_FMT(IOS_USB, "Wii Speak register set (reg={:02x}, arg1={:04x}, arg2={:04x})", reg, arg1,
|
||||
arg2);
|
||||
|
||||
// TODO
|
||||
//
|
||||
// - On Wii Speak Channel start
|
||||
// W[IOS_USB]: Wii Speak unsupported register set (reg=0c, arg1=0000, arg2=0000)
|
||||
// W[IOS_USB]: Wii Speak unsupported register get (reg=0c, arg1=109091e2, arg2=109091e4)
|
||||
//
|
||||
// - On Wii Speak Channel close
|
||||
// W[IOS_USB]: Wii Speak unsupported register set (reg=0c, arg1=0001, arg2=0000)
|
||||
// W[IOS_USB]: Wii Speak unsupported register get (reg=0c, arg1=109091e2, arg2=109091e4)
|
||||
//
|
||||
// - On Monster Hunter 3 (RMHE08) online start
|
||||
// N[OSREPORT_HLE]: 80450a20->80418adc| ok to call PMICStartAsync() -> 0
|
||||
// W[IOS_USB]: Wii Speak unsupported register set (reg=0c, arg1=0000, arg2=0000)
|
||||
// W[IOS_USB]: Wii Speak unsupported register get (reg=0c, arg1=10037f62, arg2=10037f64)
|
||||
// N[OSREPORT_HLE]: 80450a94->80418adc| ok to start P-Mic -> 0.
|
||||
|
||||
switch (reg)
|
||||
{
|
||||
case SAMPLER_STATE:
|
||||
|
|
@ -205,8 +246,13 @@ void WiiSpeak::SetRegister(const std::unique_ptr<CtrlMessage>& cmd)
|
|||
m_sampler.freq = 11025;
|
||||
break;
|
||||
case FREQ_RESERVED:
|
||||
case FREQ_16KHZ:
|
||||
default:
|
||||
WARN_LOG_FMT(IOS_USB,
|
||||
"Wii Speak unsupported SAMPLER_FREQ set (arg1={:04x}, arg2={:04x}) defaulting "
|
||||
"to FREQ_16KHZ",
|
||||
arg1, arg2);
|
||||
[[fallthrough]];
|
||||
case FREQ_16KHZ:
|
||||
m_sampler.freq = 16000;
|
||||
break;
|
||||
}
|
||||
|
|
@ -223,8 +269,13 @@ void WiiSpeak::SetRegister(const std::unique_ptr<CtrlMessage>& cmd)
|
|||
case GAIN_30dB:
|
||||
m_sampler.gain = 30;
|
||||
break;
|
||||
case GAIN_36dB:
|
||||
default:
|
||||
WARN_LOG_FMT(IOS_USB,
|
||||
"Wii Speak unsupported SAMPLER_GAIN set (arg1={:04x}, arg2={:04x}) defaulting "
|
||||
"to GAIN_36dB",
|
||||
arg1, arg2);
|
||||
[[fallthrough]];
|
||||
case GAIN_36dB:
|
||||
m_sampler.gain = 36;
|
||||
break;
|
||||
}
|
||||
|
|
@ -242,11 +293,20 @@ void WiiSpeak::SetRegister(const std::unique_ptr<CtrlMessage>& cmd)
|
|||
case SP_SOUT:
|
||||
case SP_RIN:
|
||||
break;
|
||||
default:
|
||||
WARN_LOG_FMT(IOS_USB, "Wii Speak unsupported SP_STATE set (arg1={:04x}, arg2={:04x})", arg1,
|
||||
arg2);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case SAMPLER_MUTE:
|
||||
m_sampler.mute = !!arg1;
|
||||
break;
|
||||
default:
|
||||
WARN_LOG_FMT(IOS_USB,
|
||||
"Wii Speak unsupported register set (reg={:02x}, arg1={:04x}, arg2={:04x})", reg,
|
||||
arg1, arg2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -258,6 +318,9 @@ void WiiSpeak::GetRegister(const std::unique_ptr<CtrlMessage>& cmd) const
|
|||
const u32 arg1 = cmd->data_address + 2;
|
||||
const u32 arg2 = cmd->data_address + 4;
|
||||
|
||||
DEBUG_LOG_FMT(IOS_USB, "Wii Speak register get (reg={:02x}, arg1={:08x}, arg2={:08x})", reg, arg1,
|
||||
arg2);
|
||||
|
||||
switch (reg)
|
||||
{
|
||||
case SAMPLER_STATE:
|
||||
|
|
@ -272,8 +335,13 @@ void WiiSpeak::GetRegister(const std::unique_ptr<CtrlMessage>& cmd) const
|
|||
case 11025:
|
||||
memory.Write_U16(FREQ_11KHZ, arg1);
|
||||
break;
|
||||
case 16000:
|
||||
default:
|
||||
WARN_LOG_FMT(IOS_USB,
|
||||
"Wii Speak unsupported SAMPLER_FREQ get (arg1={:04x}, arg2={:04x}) defaulting "
|
||||
"to FREQ_16KHZ",
|
||||
arg1, arg2);
|
||||
[[fallthrough]];
|
||||
case 16000:
|
||||
memory.Write_U16(FREQ_16KHZ, arg1);
|
||||
break;
|
||||
}
|
||||
|
|
@ -290,8 +358,13 @@ void WiiSpeak::GetRegister(const std::unique_ptr<CtrlMessage>& cmd) const
|
|||
case 30:
|
||||
memory.Write_U16(0x300 | GAIN_30dB, arg1);
|
||||
break;
|
||||
case 36:
|
||||
default:
|
||||
WARN_LOG_FMT(IOS_USB,
|
||||
"Wii Speak unsupported SAMPLER_GAIN get (arg1={:04x}, arg2={:04x}) defaulting "
|
||||
"to GAIN_36dB",
|
||||
arg1, arg2);
|
||||
[[fallthrough]];
|
||||
case 36:
|
||||
memory.Write_U16(0x300 | GAIN_36dB, arg1);
|
||||
break;
|
||||
}
|
||||
|
|
@ -312,11 +385,20 @@ void WiiSpeak::GetRegister(const std::unique_ptr<CtrlMessage>& cmd) const
|
|||
break;
|
||||
case SP_RIN:
|
||||
break;
|
||||
default:
|
||||
WARN_LOG_FMT(IOS_USB, "Wii Speak unsupported SP_STATE get (arg1={:04x}, arg2={:04x})", arg1,
|
||||
arg2);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case SAMPLER_MUTE:
|
||||
memory.Write_U16(m_sampler.mute ? 1 : 0, arg1);
|
||||
break;
|
||||
default:
|
||||
WARN_LOG_FMT(IOS_USB,
|
||||
"Wii Speak unsupported register get (reg={:02x}, arg1={:08x}, arg2={:08x})", reg,
|
||||
arg1, arg2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -89,8 +89,12 @@ private:
|
|||
const std::vector<InterfaceDescriptor> m_interface_descriptor{
|
||||
{0x9, 0x4, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x0},
|
||||
{0x9, 0x4, 0x0, 0x01, 0x03, 0xFF, 0xFF, 0xFF, 0x0}};
|
||||
const std::vector<EndpointDescriptor> m_endpoint_descriptor{{0x7, 0x5, 0x81, 0x1, 0x0020, 0x1},
|
||||
{0x7, 0x5, 0x2, 0x2, 0x0020, 0},
|
||||
{0x7, 0x5, 0x3, 0x1, 0x0040, 1}};
|
||||
static constexpr u8 ENDPOINT_AUDIO_IN = 0x81;
|
||||
static constexpr u8 ENDPOINT_AUDIO_OUT = 0x3;
|
||||
static constexpr u8 ENDPOINT_DATA_OUT = 0x2;
|
||||
const std::vector<EndpointDescriptor> m_endpoint_descriptor{
|
||||
{0x7, 0x5, ENDPOINT_AUDIO_IN, 0x1, 0x0020, 0x1},
|
||||
{0x7, 0x5, ENDPOINT_DATA_OUT, 0x2, 0x0020, 0},
|
||||
{0x7, 0x5, ENDPOINT_AUDIO_OUT, 0x1, 0x0040, 0x1}};
|
||||
};
|
||||
} // namespace IOS::HLE::USB
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue