diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/result.h | 8 | ||||
| -rw-r--r-- | src/core/hle/service/cfg/cfg.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/gsp_gpu.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/ptm/ptm.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/soc_u.cpp | 12 | ||||
| -rw-r--r-- | src/core/hw/gpu.cpp | 16 |
8 files changed, 28 insertions, 28 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index d148efde2..16eb972fb 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -35,7 +35,7 @@ SharedPtr<Process> Process::Create(SharedPtr<CodeSet> code_set) { | |||
| 35 | 35 | ||
| 36 | process->codeset = std::move(code_set); | 36 | process->codeset = std::move(code_set); |
| 37 | process->flags.raw = 0; | 37 | process->flags.raw = 0; |
| 38 | process->flags.memory_region = MemoryRegion::APPLICATION; | 38 | process->flags.memory_region.Assign(MemoryRegion::APPLICATION); |
| 39 | Memory::InitLegacyAddressSpace(process->vm_manager); | 39 | Memory::InitLegacyAddressSpace(process->vm_manager); |
| 40 | 40 | ||
| 41 | return process; | 41 | return process; |
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index ea3abb5f6..0fce5988b 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h | |||
| @@ -193,10 +193,10 @@ union ResultCode { | |||
| 193 | explicit ResultCode(u32 raw) : raw(raw) {} | 193 | explicit ResultCode(u32 raw) : raw(raw) {} |
| 194 | ResultCode(ErrorDescription description_, ErrorModule module_, | 194 | ResultCode(ErrorDescription description_, ErrorModule module_, |
| 195 | ErrorSummary summary_, ErrorLevel level_) : raw(0) { | 195 | ErrorSummary summary_, ErrorLevel level_) : raw(0) { |
| 196 | description = description_; | 196 | description.Assign(description_); |
| 197 | module = module_; | 197 | module.Assign(module_); |
| 198 | summary = summary_; | 198 | summary.Assign(summary_); |
| 199 | level = level_; | 199 | level.Assign(level_); |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | ResultCode& operator=(const ResultCode& o) { raw = o.raw; return *this; } | 202 | ResultCode& operator=(const ResultCode& o) { raw = o.raw; return *this; } |
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp index 633fe19eb..7556aa6a5 100644 --- a/src/core/hle/service/cfg/cfg.cpp +++ b/src/core/hle/service/cfg/cfg.cpp | |||
| @@ -293,8 +293,8 @@ ResultCode DeleteConfigNANDSaveFile() { | |||
| 293 | 293 | ||
| 294 | ResultCode UpdateConfigNANDSavegame() { | 294 | ResultCode UpdateConfigNANDSavegame() { |
| 295 | FileSys::Mode mode = {}; | 295 | FileSys::Mode mode = {}; |
| 296 | mode.write_flag = 1; | 296 | mode.write_flag.Assign(1); |
| 297 | mode.create_flag = 1; | 297 | mode.create_flag.Assign(1); |
| 298 | 298 | ||
| 299 | FileSys::Path path("config"); | 299 | FileSys::Path path("config"); |
| 300 | 300 | ||
| @@ -405,7 +405,7 @@ void Init() { | |||
| 405 | 405 | ||
| 406 | FileSys::Path config_path("config"); | 406 | FileSys::Path config_path("config"); |
| 407 | FileSys::Mode open_mode = {}; | 407 | FileSys::Mode open_mode = {}; |
| 408 | open_mode.read_flag = 1; | 408 | open_mode.read_flag.Assign(1); |
| 409 | 409 | ||
| 410 | auto config_result = Service::FS::OpenFileFromArchive(*archive_result, config_path, open_mode); | 410 | auto config_result = Service::FS::OpenFileFromArchive(*archive_result, config_path, open_mode); |
| 411 | 411 | ||
diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp index 98b11c798..5838b6d71 100644 --- a/src/core/hle/service/gsp_gpu.cpp +++ b/src/core/hle/service/gsp_gpu.cpp | |||
| @@ -347,7 +347,7 @@ void SignalInterrupt(InterruptId interrupt_id) { | |||
| 347 | FrameBufferUpdate* info = GetFrameBufferInfo(thread_id, screen_id); | 347 | FrameBufferUpdate* info = GetFrameBufferInfo(thread_id, screen_id); |
| 348 | if (info->is_dirty) { | 348 | if (info->is_dirty) { |
| 349 | SetBufferSwap(screen_id, info->framebuffer_info[info->index]); | 349 | SetBufferSwap(screen_id, info->framebuffer_info[info->index]); |
| 350 | info->is_dirty = false; | 350 | info->is_dirty.Assign(false); |
| 351 | } | 351 | } |
| 352 | } | 352 | } |
| 353 | } | 353 | } |
| @@ -499,7 +499,7 @@ static void SetLcdForceBlack(Service::Interface* self) { | |||
| 499 | 499 | ||
| 500 | // Since data is already zeroed, there is no need to explicitly set | 500 | // Since data is already zeroed, there is no need to explicitly set |
| 501 | // the color to black (all zero). | 501 | // the color to black (all zero). |
| 502 | data.is_enabled = enable_black; | 502 | data.is_enabled.Assign(enable_black); |
| 503 | 503 | ||
| 504 | LCD::Write(HW::VADDR_LCD + 4 * LCD_REG_INDEX(color_fill_top), data.raw); // Top LCD | 504 | LCD::Write(HW::VADDR_LCD + 4 * LCD_REG_INDEX(color_fill_top), data.raw); // Top LCD |
| 505 | LCD::Write(HW::VADDR_LCD + 4 * LCD_REG_INDEX(color_fill_bottom), data.raw); // Bottom LCD | 505 | LCD::Write(HW::VADDR_LCD + 4 * LCD_REG_INDEX(color_fill_bottom), data.raw); // Bottom LCD |
| @@ -521,7 +521,7 @@ static void TriggerCmdReqQueue(Service::Interface* self) { | |||
| 521 | ExecuteCommand(command_buffer->commands[i], thread_id); | 521 | ExecuteCommand(command_buffer->commands[i], thread_id); |
| 522 | 522 | ||
| 523 | // Indicates that command has completed | 523 | // Indicates that command has completed |
| 524 | command_buffer->number_commands = command_buffer->number_commands - 1; | 524 | command_buffer->number_commands.Assign(command_buffer->number_commands - 1); |
| 525 | } | 525 | } |
| 526 | } | 526 | } |
| 527 | 527 | ||
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 0bed0ce36..11d7e69a1 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp | |||
| @@ -105,7 +105,7 @@ void Update() { | |||
| 105 | bool pressed = false; | 105 | bool pressed = false; |
| 106 | 106 | ||
| 107 | std::tie(touch_entry->x, touch_entry->y, pressed) = VideoCore::g_emu_window->GetTouchState(); | 107 | std::tie(touch_entry->x, touch_entry->y, pressed) = VideoCore::g_emu_window->GetTouchState(); |
| 108 | touch_entry->valid = pressed ? 1 : 0; | 108 | touch_entry->valid.Assign(pressed ? 1 : 0); |
| 109 | 109 | ||
| 110 | // TODO(bunnei): We're not doing anything with offset 0xA8 + 0x18 of HID SharedMemory, which | 110 | // TODO(bunnei): We're not doing anything with offset 0xA8 + 0x18 of HID SharedMemory, which |
| 111 | // supposedly is "Touch-screen entry, which contains the raw coordinate data prior to being | 111 | // supposedly is "Touch-screen entry, which contains the raw coordinate data prior to being |
diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp index 22c1093ff..6bdee4d9e 100644 --- a/src/core/hle/service/ptm/ptm.cpp +++ b/src/core/hle/service/ptm/ptm.cpp | |||
| @@ -110,8 +110,8 @@ void Init() { | |||
| 110 | 110 | ||
| 111 | FileSys::Path gamecoin_path("gamecoin.dat"); | 111 | FileSys::Path gamecoin_path("gamecoin.dat"); |
| 112 | FileSys::Mode open_mode = {}; | 112 | FileSys::Mode open_mode = {}; |
| 113 | open_mode.write_flag = 1; | 113 | open_mode.write_flag.Assign(1); |
| 114 | open_mode.create_flag = 1; | 114 | open_mode.create_flag.Assign(1); |
| 115 | // Open the file and write the default gamecoin information | 115 | // Open the file and write the default gamecoin information |
| 116 | auto gamecoin_result = Service::FS::OpenFileFromArchive(*archive_result, gamecoin_path, open_mode); | 116 | auto gamecoin_result = Service::FS::OpenFileFromArchive(*archive_result, gamecoin_path, open_mode); |
| 117 | if (gamecoin_result.Succeeded()) { | 117 | if (gamecoin_result.Succeeded()) { |
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index 822b093f4..e603bf794 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp | |||
| @@ -178,17 +178,17 @@ struct CTRPollFD { | |||
| 178 | static Events TranslateTo3DS(u32 input_event) { | 178 | static Events TranslateTo3DS(u32 input_event) { |
| 179 | Events ev = {}; | 179 | Events ev = {}; |
| 180 | if (input_event & POLLIN) | 180 | if (input_event & POLLIN) |
| 181 | ev.pollin = 1; | 181 | ev.pollin.Assign(1); |
| 182 | if (input_event & POLLPRI) | 182 | if (input_event & POLLPRI) |
| 183 | ev.pollpri = 1; | 183 | ev.pollpri.Assign(1); |
| 184 | if (input_event & POLLHUP) | 184 | if (input_event & POLLHUP) |
| 185 | ev.pollhup = 1; | 185 | ev.pollhup.Assign(1); |
| 186 | if (input_event & POLLERR) | 186 | if (input_event & POLLERR) |
| 187 | ev.pollerr = 1; | 187 | ev.pollerr.Assign(1); |
| 188 | if (input_event & POLLOUT) | 188 | if (input_event & POLLOUT) |
| 189 | ev.pollout = 1; | 189 | ev.pollout.Assign(1); |
| 190 | if (input_event & POLLNVAL) | 190 | if (input_event & POLLNVAL) |
| 191 | ev.pollnval = 1; | 191 | ev.pollnval.Assign(1); |
| 192 | return ev; | 192 | return ev; |
| 193 | } | 193 | } |
| 194 | 194 | ||
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 4bd3a632d..c60310586 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp | |||
| @@ -146,8 +146,8 @@ inline void Write(u32 addr, const T data) { | |||
| 146 | 146 | ||
| 147 | // Reset "trigger" flag and set the "finish" flag | 147 | // Reset "trigger" flag and set the "finish" flag |
| 148 | // NOTE: This was confirmed to happen on hardware even if "address_start" is zero. | 148 | // NOTE: This was confirmed to happen on hardware even if "address_start" is zero. |
| 149 | config.trigger = 0; | 149 | config.trigger.Assign(0); |
| 150 | config.finished = 1; | 150 | config.finished.Assign(1); |
| 151 | } | 151 | } |
| 152 | break; | 152 | break; |
| 153 | } | 153 | } |
| @@ -444,16 +444,16 @@ void Init() { | |||
| 444 | framebuffer_sub.address_left1 = 0x1848F000; | 444 | framebuffer_sub.address_left1 = 0x1848F000; |
| 445 | framebuffer_sub.address_left2 = 0x184C7800; | 445 | framebuffer_sub.address_left2 = 0x184C7800; |
| 446 | 446 | ||
| 447 | framebuffer_top.width = 240; | 447 | framebuffer_top.width.Assign(240); |
| 448 | framebuffer_top.height = 400; | 448 | framebuffer_top.height.Assign(400); |
| 449 | framebuffer_top.stride = 3 * 240; | 449 | framebuffer_top.stride = 3 * 240; |
| 450 | framebuffer_top.color_format = Regs::PixelFormat::RGB8; | 450 | framebuffer_top.color_format.Assign(Regs::PixelFormat::RGB8); |
| 451 | framebuffer_top.active_fb = 0; | 451 | framebuffer_top.active_fb = 0; |
| 452 | 452 | ||
| 453 | framebuffer_sub.width = 240; | 453 | framebuffer_sub.width.Assign(240); |
| 454 | framebuffer_sub.height = 320; | 454 | framebuffer_sub.height.Assign(320); |
| 455 | framebuffer_sub.stride = 3 * 240; | 455 | framebuffer_sub.stride = 3 * 240; |
| 456 | framebuffer_sub.color_format = Regs::PixelFormat::RGB8; | 456 | framebuffer_sub.color_format.Assign(Regs::PixelFormat::RGB8); |
| 457 | framebuffer_sub.active_fb = 0; | 457 | framebuffer_sub.active_fb = 0; |
| 458 | 458 | ||
| 459 | last_skip_frame = false; | 459 | last_skip_frame = false; |