ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WFS: Fix logging types.

This commit is contained in:
Léo Lam 2017-08-20 11:06:42 +02:00
parent 344228ec10
commit ef888ef168
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/IOS/WFS/WFSI.cpp
View File

@ -292,7 +292,7 @@ IPCCommandResult WFSI::IOCtl(const IOCtlRequest& request)
case IOCTL_WFSI_FINALIZE_PATCH_INSTALL: case IOCTL_WFSI_FINALIZE_PATCH_INSTALL:
{ {
INFO_LOG(IOS, "IOCTL_WFSI_FINALIZE_PATCH_INSTALL"); INFO_LOG(IOS_WFS, "IOCTL_WFSI_FINALIZE_PATCH_INSTALL");
if (m_patch_type != NOT_A_PATCH) if (m_patch_type != NOT_A_PATCH)
{ {
std::string current_title_dir = std::string current_title_dir =
@ -398,7 +398,7 @@ IPCCommandResult WFSI::IOCtl(const IOCtlRequest& request)
{ {
u64 subtitle_id = Memory::Read_U64(request.buffer_in); u64 subtitle_id = Memory::Read_U64(request.buffer_in);
u32 address = Memory::Read_U32(request.buffer_in + 24); u32 address = Memory::Read_U32(request.buffer_in + 24);
INFO_LOG(IOS, "IOCTL_WFSI_GET_TMD: subtitle ID %016" PRIx64, subtitle_id); INFO_LOG(IOS_WFS, "IOCTL_WFSI_GET_TMD: subtitle ID %016" PRIx64, subtitle_id);
u32 tmd_size; u32 tmd_size;
return_error_code = return_error_code =
@ -413,7 +413,7 @@ IPCCommandResult WFSI::IOCtl(const IOCtlRequest& request)
u32 address = Memory::Read_U32(request.buffer_in + 24); u32 address = Memory::Read_U32(request.buffer_in + 24);
u16 group_id = Memory::Read_U16(request.buffer_in + 36); u16 group_id = Memory::Read_U16(request.buffer_in + 36);
u32 title_id = Memory::Read_U32(request.buffer_in + 32); u32 title_id = Memory::Read_U32(request.buffer_in + 32);
INFO_LOG(IOS, "IOCTL_WFSI_GET_TMD_ABSOLUTE: tid %08x, gid %04x, subtitle ID %016" PRIx64, INFO_LOG(IOS_WFS, "IOCTL_WFSI_GET_TMD_ABSOLUTE: tid %08x, gid %04x, subtitle ID %016" PRIx64,
title_id, group_id, subtitle_id); title_id, group_id, subtitle_id);
u32 tmd_size; u32 tmd_size;
@ -424,7 +424,7 @@ IPCCommandResult WFSI::IOCtl(const IOCtlRequest& request)
case IOCTL_WFSI_SET_FST_BUFFER: case IOCTL_WFSI_SET_FST_BUFFER:
{ {
INFO_LOG(IOS, "IOCTL_WFSI_SET_FST_BUFFER: address %08x, size %08x", request.buffer_in, INFO_LOG(IOS_WFS, "IOCTL_WFSI_SET_FST_BUFFER: address %08x, size %08x", request.buffer_in,
request.buffer_in_size); request.buffer_in_size);
break; break;
} }
@ -477,7 +477,7 @@ IPCCommandResult WFSI::IOCtl(const IOCtlRequest& request)
} }
case IOCTL_WFSI_CHECK_HAS_SPACE: case IOCTL_WFSI_CHECK_HAS_SPACE:
WARN_LOG(IOS, "IOCTL_WFSI_CHECK_HAS_SPACE: returning true"); WARN_LOG(IOS_WFS, "IOCTL_WFSI_CHECK_HAS_SPACE: returning true");
// TODO(wfs): implement this properly. // TODO(wfs): implement this properly.
// 1 is returned if there is free space, 0 otherwise. // 1 is returned if there is free space, 0 otherwise.
@ -513,7 +513,7 @@ u32 WFSI::GetTmd(u16 group_id, u32 title_id, u64 subtitle_id, u32 address, u32*
File::IOFile fp(WFS::NativePath(path), "rb"); File::IOFile fp(WFS::NativePath(path), "rb");
if (!fp) if (!fp)
{ {
WARN_LOG(IOS, "GetTmd: no such file or directory: %s", path.c_str()); WARN_LOG(IOS_WFS, "GetTmd: no such file or directory: %s", path.c_str());
return WFS_ENOENT; return WFS_ENOENT;
} }
if (address) if (address)

18
Source/Core/Core/IOS/WFS/WFSSRV.cpp
View File

@ -109,17 +109,17 @@ IPCCommandResult WFSSRV::IOCtl(const IOCtlRequest& request)
if (File::Exists(native_path)) if (File::Exists(native_path))
{ {
INFO_LOG(IOS, "IOCTL_WFS_MKDIR(%s): already exists", path.c_str()); INFO_LOG(IOS_WFS, "IOCTL_WFS_MKDIR(%s): already exists", path.c_str());
return_error_code = WFS_EEXIST; return_error_code = WFS_EEXIST;
} }
else if (!File::CreateDir(native_path)) else if (!File::CreateDir(native_path))
{ {
INFO_LOG(IOS, "IOCTL_WFS_MKDIR(%s): no such file or directory", path.c_str()); INFO_LOG(IOS_WFS, "IOCTL_WFS_MKDIR(%s): no such file or directory", path.c_str());
return_error_code = WFS_ENOENT; return_error_code = WFS_ENOENT;
} }
else else
{ {
INFO_LOG(IOS, "IOCTL_WFS_MKDIR(%s): directory created", path.c_str()); INFO_LOG(IOS_WFS, "IOCTL_WFS_MKDIR(%s): directory created", path.c_str());
} }
break; break;
} }
@ -168,18 +168,18 @@ IPCCommandResult WFSSRV::IOCtl(const IOCtlRequest& request)
Memory::Memset(0, request.buffer_out, request.buffer_out_size); Memory::Memset(0, request.buffer_out, request.buffer_out_size);
if (!File::Exists(native_path)) if (!File::Exists(native_path))
{ {
INFO_LOG(IOS, "IOCTL_WFS_GET_ATTRIBUTES(%s): no such file or directory", path.c_str()); INFO_LOG(IOS_WFS, "IOCTL_WFS_GET_ATTRIBUTES(%s): no such file or directory", path.c_str());
return_error_code = WFS_ENOENT; return_error_code = WFS_ENOENT;
} }
else if (File::IsDirectory(native_path)) else if (File::IsDirectory(native_path))
{ {
INFO_LOG(IOS, "IOCTL_WFS_GET_ATTRIBUTES(%s): directory", path.c_str()); INFO_LOG(IOS_WFS, "IOCTL_WFS_GET_ATTRIBUTES(%s): directory", path.c_str());
Memory::Write_U32(0x80000000, request.buffer_out + 4); Memory::Write_U32(0x80000000, request.buffer_out + 4);
} }
else else
{ {
u32 size = static_cast<u32>(File::GetSize(native_path)); u32 size = static_cast<u32>(File::GetSize(native_path));
INFO_LOG(IOS, "IOCTL_WFS_GET_ATTRIBUTES(%s): file with size %d", path.c_str(), size); INFO_LOG(IOS_WFS, "IOCTL_WFS_GET_ATTRIBUTES(%s): file with size %d", path.c_str(), size);
Memory::Write_U32(size, request.buffer_out); Memory::Write_U32(size, request.buffer_out);
} }
break; break;
@ -269,7 +269,7 @@ IPCCommandResult WFSSRV::IOCtl(const IOCtlRequest& request)
// TODO(wfs): Figure out the exact semantics difference from the other // TODO(wfs): Figure out the exact semantics difference from the other
// close. // close.
u16 fd = Memory::Read_U16(request.buffer_in + 0x4); u16 fd = Memory::Read_U16(request.buffer_in + 0x4);
INFO_LOG(IOS, "IOCTL_WFS_CLOSE_2(%d)", fd); INFO_LOG(IOS_WFS, "IOCTL_WFS_CLOSE_2(%d)", fd);
ReleaseFileDescriptor(fd); ReleaseFileDescriptor(fd);
break; break;
} }
@ -328,7 +328,7 @@ IPCCommandResult WFSSRV::IOCtl(const IOCtlRequest& request)
FileDescriptor* fd_obj = FindFileDescriptor(fd); FileDescriptor* fd_obj = FindFileDescriptor(fd);
if (fd_obj == nullptr) if (fd_obj == nullptr)
{ {
ERROR_LOG(IOS, "IOCTL_WFS_WRITE: invalid file descriptor %d", fd); ERROR_LOG(IOS_WFS, "IOCTL_WFS_WRITE: invalid file descriptor %d", fd);
return_error_code = WFS_EBADFD; return_error_code = WFS_EBADFD;
break; break;
} }
@ -349,7 +349,7 @@ IPCCommandResult WFSSRV::IOCtl(const IOCtlRequest& request)
fd_obj->position += size; fd_obj->position += size;
} }
INFO_LOG(IOS, "IOCTL_WFS_WRITE: written %d bytes from FD %d (%s)", size, fd, INFO_LOG(IOS_WFS, "IOCTL_WFS_WRITE: written %d bytes from FD %d (%s)", size, fd,
fd_obj->path.c_str()); fd_obj->path.c_str());
break; break;
} }