mirror of
				https://git.suyu.dev/suyu/suyu.git
				synced 2025-11-04 12:34:39 +08:00 
			
		
		
		
	Merge pull request #39 from bunnei/hid-minor-improvements
Hid minor improvements
This commit is contained in:
		
						commit
						bf7bc3dacd
					
				@ -5,6 +5,8 @@
 | 
			
		||||
#include "common/log.h"
 | 
			
		||||
 | 
			
		||||
#include "core/hle/hle.h"
 | 
			
		||||
#include "core/hle/kernel/event.h"
 | 
			
		||||
#include "core/hle/kernel/shared_memory.h"
 | 
			
		||||
#include "core/hle/service/hid.h"
 | 
			
		||||
 | 
			
		||||
////////////////////////////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
@ -12,18 +14,55 @@
 | 
			
		||||
 | 
			
		||||
namespace HID_User {
 | 
			
		||||
 | 
			
		||||
Handle g_shared_mem = 0; ///< Handle to shared memory region designated to HID_User service
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * HID_User::GetIPCHandles service function
 | 
			
		||||
 *  Inputs:
 | 
			
		||||
 *      None
 | 
			
		||||
 *  Outputs:
 | 
			
		||||
 *      1 : Result of function, 0 on success, otherwise error code
 | 
			
		||||
 *      2 : Unused
 | 
			
		||||
 *      3 : Handle to HID_User shared memory
 | 
			
		||||
 *      4 : Event signaled by HID_User
 | 
			
		||||
 *      5 : Event signaled by HID_User
 | 
			
		||||
 *      6 : Event signaled by HID_User
 | 
			
		||||
 *      7 : Gyroscope event
 | 
			
		||||
 *      8 : Event signaled by HID_User
 | 
			
		||||
 */
 | 
			
		||||
void GetIPCHandles(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Service::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    cmd_buff[1] = 0; // No error
 | 
			
		||||
    cmd_buff[3] = g_shared_mem;
 | 
			
		||||
    cmd_buff[4] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventA");
 | 
			
		||||
    cmd_buff[5] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventB");
 | 
			
		||||
    cmd_buff[6] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventC");
 | 
			
		||||
    cmd_buff[7] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventGyroscope");
 | 
			
		||||
    cmd_buff[8] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventD");
 | 
			
		||||
 | 
			
		||||
    DEBUG_LOG(KERNEL, "called");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const Interface::FunctionInfo FunctionTable[] = {
 | 
			
		||||
    {0x000A0000, nullptr, "GetIPCHandles"},
 | 
			
		||||
    {0x00110000, nullptr, "EnableAccelerometer"},
 | 
			
		||||
    {0x00130000, nullptr, "EnableGyroscopeLow"},
 | 
			
		||||
    {0x00150000, nullptr, "GetGyroscopeLowRawToDpsCoefficient"},
 | 
			
		||||
    {0x00160000, nullptr, "GetGyroscopeLowCalibrateParam"},
 | 
			
		||||
    {0x000A0000, GetIPCHandles, "GetIPCHandles"},
 | 
			
		||||
    {0x000B0000, nullptr,       "StartAnalogStickCalibration"},
 | 
			
		||||
    {0x000E0000, nullptr,       "GetAnalogStickCalibrateParam"},
 | 
			
		||||
    {0x00110000, nullptr,       "EnableAccelerometer"},
 | 
			
		||||
    {0x00120000, nullptr,       "DisableAccelerometer"},
 | 
			
		||||
    {0x00130000, nullptr,       "EnableGyroscopeLow"},
 | 
			
		||||
    {0x00140000, nullptr,       "DisableGyroscopeLow"},
 | 
			
		||||
    {0x00150000, nullptr,       "GetGyroscopeLowRawToDpsCoefficient"},
 | 
			
		||||
    {0x00160000, nullptr,       "GetGyroscopeLowCalibrateParam"},
 | 
			
		||||
    {0x00170000, nullptr,       "GetSoundVolume"},
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
////////////////////////////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
// Interface class
 | 
			
		||||
 | 
			
		||||
Interface::Interface() {
 | 
			
		||||
    g_shared_mem = Kernel::CreateSharedMemory("HID_User:SharedMem"); // Create shared memory object
 | 
			
		||||
 | 
			
		||||
    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -56,7 +56,7 @@ Result ControlMemory(u32* out_addr, u32 operation, u32 addr0, u32 addr1, u32 siz
 | 
			
		||||
 | 
			
		||||
/// Maps a memory block to specified address
 | 
			
		||||
Result MapMemoryBlock(Handle handle, u32 addr, u32 permissions, u32 other_permissions) {
 | 
			
		||||
    DEBUG_LOG(SVC, "called memblock=0x08X, addr=0x%08X, mypermissions=0x%08X, otherpermission=%d", 
 | 
			
		||||
    DEBUG_LOG(SVC, "called memblock=0x%08X, addr=0x%08X, mypermissions=0x%08X, otherpermission=%d", 
 | 
			
		||||
        handle, addr, permissions, other_permissions);
 | 
			
		||||
 | 
			
		||||
    Kernel::MemoryPermission permissions_type = static_cast<Kernel::MemoryPermission>(permissions);
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user