move enum to include

added log message


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1382 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-03 06:34:29 +00:00
parent 395129d2c4
commit 27dc595d7c
2 changed files with 13 additions and 11 deletions

View File

@ -68,16 +68,6 @@
namespace WII_IPC_HLE_Interface namespace WII_IPC_HLE_Interface
{ {
enum ECommandType
{
COMMAND_OPEN_DEVICE = 1,
COMMAND_CLOSE_DEVICE = 2,
COMMAND_READ = 3,
COMMAND_WRITE = 4,
COMMAND_SEEK = 5,
COMMAND_IOCTL = 6,
COMMAND_IOCTLV = 7,
};
typedef std::map<u32, IWII_IPC_HLE_Device*> TDeviceMap; typedef std::map<u32, IWII_IPC_HLE_Device*> TDeviceMap;
TDeviceMap g_DeviceMap; TDeviceMap g_DeviceMap;
@ -432,6 +422,7 @@ void ExecuteCommand(u32 _Address)
} }
else else
{ {
LOG(WII_IPC_HLE, "IOP: Reply to unknown device ID (DeviceID=%i)", DeviceID);
g_ReplyQueue.push(std::pair<u32, std::string>(_Address, "unknown")); g_ReplyQueue.push(std::pair<u32, std::string>(_Address, "unknown"));
} }
} }

View File

@ -33,6 +33,17 @@ void Update();
// Acknowledge command // Acknowledge command
bool AckCommand(u32 _Address); bool AckCommand(u32 _Address);
enum ECommandType
{
COMMAND_OPEN_DEVICE = 1,
COMMAND_CLOSE_DEVICE = 2,
COMMAND_READ = 3,
COMMAND_WRITE = 4,
COMMAND_SEEK = 5,
COMMAND_IOCTL = 6,
COMMAND_IOCTLV = 7,
};
} // end of namespace AudioInterface } // end of namespace AudioInterface
#endif #endif