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

Fixed minor bug in sharedmem writing

Browse Source
This commit is contained in:
inspuration 2014-06-11 00:12:54 -04:00
parent 5f6fa13af6
commit c180fd4003
5 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/service/hid.cpp
View File

@ -15,10 +15,14 @@ namespace HID_User {
Handle memIPC; Handle memIPC;
Handle getMemIPCHandle() {
return memIPC;
}
void GetIPCHandles(Service::Interface* self) { void GetIPCHandles(Service::Interface* self) {
u32* cmd_buff = Service::GetCommandBuffer(); u32* cmd_buff = Service::GetCommandBuffer();
memIPC = Kernel::CreateSharedMemory(0x1000); //page size for now memIPC = Kernel::CreateSharedMemory(0x1000); //page size for now
cmd_buff[3] = memIPC; //TODO: return something coherent along with RegisterInterruptRelayQueue for mem handles cmd_buff[3] = memIPC;
} }
const Interface::FunctionInfo FunctionTable[] = { const Interface::FunctionInfo FunctionTable[] = {

2
src/core/hle/service/hid.h
View File

@ -14,6 +14,8 @@
namespace HID_User { namespace HID_User {
Handle getMemIPCHandle();
class Interface : public Service::Interface { class Interface : public Service::Interface {
public: public:

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

@ -1,21 +1,12 @@
#include "hid.h" #include "hid.h"
#include "core/hle/service/hid.h"
#include "core/hle/kernel/shared_memory.h"
//TODO: http://pastebin.com/kkGLQhHV
namespace HID { namespace HID {
template <typename T>
inline void Read(T &var, const u32 addr) {
ERROR_LOG(HID, "unknown Read%d @ 0x%08X", sizeof(var) * 8, addr);
}
template <typename T>
inline void Write(u32 addr, const T data) {
ERROR_LOG(HID, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr);
}
//TODO: replace with an interface that doesnt suck (bravia)
void SetButtonReg(u32 buttonData) { void SetButtonReg(u32 buttonData) {
Memory::Write32(VADDR_BUTTONS, buttonData); Kernel::WriteSharedMemory(HID_User::getMemIPCHandle(), buttonData, OFFSET_BUTTONS);
} }
/// Update hardware /// Update hardware

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

@ -13,7 +13,7 @@ struct Registers {
extern Registers g_regs; extern Registers g_regs;
enum { enum {
VADDR_BUTTONS = 0x1000001c, //TODO: it works using the shared mem mapping with all homebrew tested, however the wiki states 0x10146000 as the paddr OFFSET_BUTTONS = 0x1c, //TODO: it works using the shared mem mapping with all homebrew tested, however the wiki states 0x10146000 as the paddr
}; };
@ -53,12 +53,6 @@ char * const PAD_NAMES[] = {
"PAD_Y" "PAD_Y"
}; };
template <typename T>
inline void Read(T &var, const u32 addr);
template <typename T>
inline void Write(u32 addr, const T data);
void SetButtonReg(u32 buttonData); void SetButtonReg(u32 buttonData);
/// Update hardware /// Update hardware

3
src/core/mem_map_funcs.cpp
View File

@ -128,14 +128,13 @@ inline void _Write(u32 addr, const T data) {
} else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { } else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) {
for (std::map<u32, MemoryBlock>::iterator it = g_shared_map.begin(); it != g_shared_map.end(); it++) { for (std::map<u32, MemoryBlock>::iterator it = g_shared_map.begin(); it != g_shared_map.end(); it++) {
MemoryBlock block = it->second; MemoryBlock block = it->second;
if ((vaddr >= block.base_address) && (vaddr < block.GetVirtualAddress())) { if ((vaddr >= block.base_address) && (vaddr < block.base_address + block.size)) {
Handle handle = block.handle; Handle handle = block.handle;
Kernel::WriteSharedMemory<T>(handle, data, addr); Kernel::WriteSharedMemory<T>(handle, data, addr);
return; return;
} }
} }
ERROR_LOG(MEMMAP, "Write to unknown shared mapping : Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, vaddr); ERROR_LOG(MEMMAP, "Write to unknown shared mapping : Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, vaddr);
*(T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK] = data;
// System memory // System memory
} else if ((vaddr >= SYSTEM_MEMORY_VADDR) && (vaddr < SYSTEM_MEMORY_VADDR_END)) { } else if ((vaddr >= SYSTEM_MEMORY_VADDR) && (vaddr < SYSTEM_MEMORY_VADDR_END)) {