Clean up some warnings
This commit is contained in:
parent
eb394ac0af
commit
e795692614
8 changed files with 27 additions and 20 deletions
|
@ -143,7 +143,16 @@ public:
|
|||
case Char:
|
||||
return std::vector<u8>(string.begin(), string.end());
|
||||
case Wchar:
|
||||
return std::vector<u8>(u16str.begin(), u16str.end());
|
||||
{
|
||||
// use two u8 for each character of u16str
|
||||
std::vector<u8> to_return(u16str.size() * 2);
|
||||
for (size_t i = 0; i < u16str.size(); ++i) {
|
||||
u16 tmp_char = u16str.at(i);
|
||||
to_return[i*2] = (tmp_char & 0xFF00) >> 8;
|
||||
to_return[i*2 + 1] = (tmp_char & 0x00FF);
|
||||
}
|
||||
return to_return;
|
||||
}
|
||||
case Empty:
|
||||
return {};
|
||||
default:
|
||||
|
|
|
@ -20,8 +20,8 @@ public:
|
|||
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Semaphore; }
|
||||
Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Semaphore; }
|
||||
|
||||
u32 max_count; ///< Maximum number of simultaneous holders the semaphore can have
|
||||
u32 available_count; ///< Number of free slots left in the semaphore
|
||||
s32 max_count; ///< Maximum number of simultaneous holders the semaphore can have
|
||||
s32 available_count; ///< Number of free slots left in the semaphore
|
||||
std::queue<Handle> waiting_threads; ///< Threads that are waiting for the semaphore
|
||||
std::string name; ///< Name of semaphore (optional)
|
||||
|
||||
|
@ -49,8 +49,8 @@ public:
|
|||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
ResultCode CreateSemaphore(Handle* handle, u32 initial_count,
|
||||
u32 max_count, const std::string& name) {
|
||||
ResultCode CreateSemaphore(Handle* handle, s32 initial_count,
|
||||
s32 max_count, const std::string& name) {
|
||||
|
||||
if (initial_count > max_count)
|
||||
return ResultCode(ErrorDescription::InvalidCombination, ErrorModule::Kernel,
|
||||
|
|
|
@ -18,7 +18,7 @@ namespace Kernel {
|
|||
* @param name Optional name of semaphore
|
||||
* @return ResultCode of the error
|
||||
*/
|
||||
ResultCode CreateSemaphore(Handle* handle, u32 initial_count, u32 max_count, const std::string& name = "Unknown");
|
||||
ResultCode CreateSemaphore(Handle* handle, s32 initial_count, s32 max_count, const std::string& name = "Unknown");
|
||||
|
||||
/**
|
||||
* Releases a certain number of slots from a semaphore.
|
||||
|
|
|
@ -223,9 +223,7 @@ int THREEDSXReader::Load3DSXFile(const std::string& filename, u32 base_addr)
|
|||
LOG_INFO(Loader, "Loading 3DSX file %s...", filename.c_str());
|
||||
FileUtil::IOFile file(filename, "rb");
|
||||
if (file.IsOpen()) {
|
||||
|
||||
THREEDSXReader reader;
|
||||
reader.Load3DSXFile(filename, 0x00100000);
|
||||
THREEDSXReader::Load3DSXFile(filename, 0x00100000);
|
||||
Kernel::LoadExec(0x00100000);
|
||||
} else {
|
||||
return ResultStatus::Error;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue