Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-08 07:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Clean up srv interface for HID

Browse source
This commit is contained in:
wheremyfoodat 2023-06-05 15:28:44 +03:00
parent b872650d31
commit 0c0e7a4cb9
3 changed files with 35 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/kernel/kernel.hpp
View file

@ -199,12 +199,8 @@ public:
return &objects[handle]; return &objects[handle];
} }
void sendGPUInterrupt(GPUInterrupt type) { serviceManager.requestGPUInterrupt(type); } ServiceManager& getServiceManager() { return serviceManager; }
void signalDSPEvents() { serviceManager.signalDSPEvents(); }
void pressKey(u32 key) { serviceManager.pressKey(key); } void sendGPUInterrupt(GPUInterrupt type) { serviceManager.sendGPUInterrupt(type); }
void releaseKey(u32 key) { serviceManager.releaseKey(key); } void signalDSPEvents() { serviceManager.signalDSPEvents(); }
void setCirclepadX(u16 x) { serviceManager.setCirclepadX(x); }
void setCirclepadY(u16 y) { serviceManager.setCirclepadY(y); }
void updateInputs() { serviceManager.updateInputs(); }
}; };

2
include/services/service_manager.hpp
View file

@ -79,7 +79,7 @@ public:
void sendCommandToService(u32 messagePointer, Handle handle); void sendCommandToService(u32 messagePointer, Handle handle);
// Wrappers for communicating with certain services // Wrappers for communicating with certain services
void requestGPUInterrupt(GPUInterrupt type) { gsp_gpu.requestInterrupt(type); } void sendGPUInterrupt(GPUInterrupt type) { gsp_gpu.requestInterrupt(type); }
void setGSPSharedMem(u8* ptr) { gsp_gpu.setSharedMem(ptr); } void setGSPSharedMem(u8* ptr) { gsp_gpu.setSharedMem(ptr); }
void setHIDSharedMem(u8* ptr) { hid.setSharedMem(ptr); } void setHIDSharedMem(u8* ptr) { hid.setSharedMem(ptr); }

60
src/emulator.cpp
View file

@ -27,12 +27,14 @@ void Emulator::run() {
runFrame(); // Run 1 frame of instructions runFrame(); // Run 1 frame of instructions
gpu.display(); // Display graphics gpu.display(); // Display graphics
ServiceManager& srv = kernel.getServiceManager();
// Send VBlank interrupts // Send VBlank interrupts
kernel.sendGPUInterrupt(GPUInterrupt::VBlank0); srv.sendGPUInterrupt(GPUInterrupt::VBlank0);
kernel.sendGPUInterrupt(GPUInterrupt::VBlank1); srv.sendGPUInterrupt(GPUInterrupt::VBlank1);
// Update inputs in the HID module // Update inputs in the HID module
kernel.updateInputs(); srv.updateInputs();
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
@ -43,36 +45,36 @@ void Emulator::run() {
return; return;
case SDL_KEYDOWN: case SDL_KEYDOWN:
switch (event.key.keysym.sym) { switch (event.key.keysym.sym) {
case SDLK_z: kernel.pressKey(1 << 0); break; case SDLK_z: srv.pressKey(1 << 0); break;
case SDLK_RIGHT: kernel.pressKey(1 << 4); break; case SDLK_RIGHT: srv.pressKey(1 << 4); break;
case SDLK_LEFT: kernel.pressKey(1 << 5); break; case SDLK_LEFT: srv.pressKey(1 << 5); break;
case SDLK_UP: kernel.pressKey(1 << 6); break; case SDLK_UP: srv.pressKey(1 << 6); break;
case SDLK_DOWN: kernel.pressKey(1 << 7); break; case SDLK_DOWN: srv.pressKey(1 << 7); break;
case SDLK_w: kernel.setCirclepadY(0x9C); break; case SDLK_w: srv.setCirclepadY(0x9C); break;
case SDLK_a: kernel.setCirclepadX(-0x9C); break; case SDLK_a: srv.setCirclepadX(-0x9C); break;
case SDLK_s: kernel.setCirclepadY(-0x9C); break; case SDLK_s: srv.setCirclepadY(-0x9C); break;
case SDLK_d: kernel.setCirclepadX(0x9C); break; case SDLK_d: srv.setCirclepadX(0x9C); break;
case SDLK_j: kernel.pressKey(1 << 1); break; case SDLK_j: srv.pressKey(1 << 1); break;
case SDLK_k: kernel.pressKey(1 << 10); break; case SDLK_k: srv.pressKey(1 << 10); break;
case SDLK_l: kernel.pressKey(1 << 11); break; case SDLK_l: srv.pressKey(1 << 11); break;
case SDLK_r: kernel.pressKey(1 << 8); break; case SDLK_r: srv.pressKey(1 << 8); break;
} }
break; break;
case SDL_KEYUP: case SDL_KEYUP:
switch (event.key.keysym.sym) { switch (event.key.keysym.sym) {
case SDLK_z: kernel.releaseKey(1 << 0); break; case SDLK_z: srv.releaseKey(1 << 0); break;
case SDLK_RIGHT: kernel.releaseKey(1 << 4); break; case SDLK_RIGHT: srv.releaseKey(1 << 4); break;
case SDLK_LEFT: kernel.releaseKey(1 << 5); break; case SDLK_LEFT: srv.releaseKey(1 << 5); break;
case SDLK_UP: kernel.releaseKey(1 << 6); break; case SDLK_UP: srv.releaseKey(1 << 6); break;
case SDLK_DOWN: kernel.releaseKey(1 << 7); break; case SDLK_DOWN: srv.releaseKey(1 << 7); break;
case SDLK_w: kernel.setCirclepadY(0); break; case SDLK_w: srv.setCirclepadY(0); break;
case SDLK_a: kernel.setCirclepadX(0); break; case SDLK_a: srv.setCirclepadX(0); break;
case SDLK_s: kernel.setCirclepadY(0); break; case SDLK_s: srv.setCirclepadY(0); break;
case SDLK_d: kernel.setCirclepadX(0); break; case SDLK_d: srv.setCirclepadX(0); break;
case SDLK_j: kernel.releaseKey(1 << 1); break; case SDLK_j: srv.releaseKey(1 << 1); break;
case SDLK_k: kernel.releaseKey(1 << 10); break; case SDLK_k: srv.releaseKey(1 << 10); break;
case SDLK_l: kernel.releaseKey(1 << 11); break; case SDLK_l: srv.releaseKey(1 << 11); break;
case SDLK_r: kernel.releaseKey(1 << 8); break; case SDLK_r: srv.releaseKey(1 << 8); break;
} }
break; break;
} }