OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-23 15:10:10 +00:00
Code Issues Projects Releases Wiki Activity

Fixed minor suggestions by bunnei

Browse Source
This commit is contained in:
inspuration 2014-05-29 16:42:37 -04:00
parent 53cc3e8f67
commit 6682f9173b
5 changed files with 82 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/citra_qt/bootmanager.cpp
View File

@ -206,7 +206,7 @@ void GRenderWindow::keyPressEvent(QKeyEvent* event)
buttonReg |= GetKeyBinding(event); buttonReg |= GetKeyBinding(event);
HID::setButtonReg(buttonReg); HID::SetButtonReg(buttonReg);
return; return;
} }
@ -223,5 +223,5 @@ void GRenderWindow::keyReleaseEvent(QKeyEvent* event)
*/ */
buttonReg &= 0xffffffff ^ GetKeyBinding(event); buttonReg &= 0xffffffff ^ GetKeyBinding(event);
HID::setButtonReg(buttonReg); HID::SetButtonReg(buttonReg);
} }

5
src/core/hle/svc.cpp
View File

@ -226,8 +226,9 @@ Result CreateEvent(void* _event, u32 reset_type) {
return 0; return 0;
} }
u64 GetSystemTick(void) { //TODO: verify with a kernel dump
return Core::g_sys_core->GetTicks(); u64 GetSystemTick() {
return Core::g_app_core->GetTicks();
} }
const HLE::FunctionDef SVC_Table[] = { const HLE::FunctionDef SVC_Table[] = {

3
src/core/hw/hid.cpp
View File

@ -13,7 +13,8 @@ namespace HID {
ERROR_LOG(HID, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr); ERROR_LOG(HID, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr);
} }
void setButtonReg(u32 buttonData) { //TODO: replace with an interface that doesnt suck (bravia)
void SetButtonReg(u32 buttonData) {
Memory::Write32(PADDR_BUTTONS, buttonData); Memory::Write32(PADDR_BUTTONS, buttonData);
} }

2
src/core/hw/hid.h
View File

@ -59,7 +59,7 @@ namespace HID {
template <typename T> template <typename T>
inline void Write(u32 addr, const T data); inline void Write(u32 addr, const T data);
void setButtonReg(u32 buttonData); void SetButtonReg(u32 buttonData);
/// Update hardware /// Update hardware
void Update(); void Update();