IOS: Remove IOS prefix on a few structs/enums

Now that IOS code is namespaced, we don't need the prefix anymore.
This commit is contained in:
Léo Lam committed 2017-01-19 19:10:31 +01:00
1 parent 629fcb437a
commit e33d943459
42 files changed
+170 -170

No files matched your search

+5 -5
View File
@@ -33,7 +33,7 @@ void DI::DoState(PointerWrap& p)
p.Do(m_commands_to_execute);
}
IPCCommandResult DI::IOCtl(const IOSIOCtlRequest& request)
IPCCommandResult DI::IOCtl(const IOCtlRequest& request)
{
// DI IOCtls are handled in a special way by Dolphin
// compared to other IOS functions.
@@ -52,7 +52,7 @@ IPCCommandResult DI::IOCtl(const IOSIOCtlRequest& request)
return GetNoReply();
}
void DI::StartIOCtl(const IOSIOCtlRequest& request)
void DI::StartIOCtl(const IOCtlRequest& request)
{
const u32 command_0 = Memory::Read_U32(request.buffer_in);
const u32 command_1 = Memory::Read_U32(request.buffer_in + 4);
@@ -75,18 +75,18 @@ void DI::FinishIOCtl(DVDInterface::DIInterruptType interrupt_type)
// This command has been executed, so it's removed from the queue
u32 command_address = m_commands_to_execute.front();
m_commands_to_execute.pop_front();
EnqueueReply(IOSIOCtlRequest{command_address}, interrupt_type);
EnqueueReply(IOCtlRequest{command_address}, interrupt_type);
// DVDInterface is now ready to execute another command,
// so we start executing a command from the queue if there is one
if (!m_commands_to_execute.empty())
{
IOSIOCtlRequest next_request{m_commands_to_execute.front()};
IOCtlRequest next_request{m_commands_to_execute.front()};
StartIOCtl(next_request);
}
}
IPCCommandResult DI::IOCtlV(const IOSIOCtlVRequest& request)
IPCCommandResult DI::IOCtlV(const IOCtlVRequest& request)
{
for (const auto& vector : request.io_vectors)
Memory::Memset(vector.address, 0, vector.size);
+3 -3
View File
@@ -31,13 +31,13 @@ public:
void DoState(PointerWrap& p) override;
IPCCommandResult IOCtl(const IOSIOCtlRequest& request) override;
IPCCommandResult IOCtlV(const IOSIOCtlVRequest& request) override;
IPCCommandResult IOCtl(const IOCtlRequest& request) override;
IPCCommandResult IOCtlV(const IOCtlVRequest& request) override;
void FinishIOCtl(DVDInterface::DIInterruptType interrupt_type);
private:
void StartIOCtl(const IOSIOCtlRequest& request);
void StartIOCtl(const IOCtlRequest& request);
std::deque<u32> m_commands_to_execute;
};