diff options
| author | 2021-04-29 22:06:57 -0700 | |
|---|---|---|
| committer | 2021-04-29 22:06:57 -0700 | |
| commit | 922b0d9933951a97879707e038f24f0ba2b3ef95 (patch) | |
| tree | 0dee932da2a54352f20958a5357c6a7915e143a8 /src/core/hle/kernel | |
| parent | Merge pull request #6258 from Morph1984/config-conv (diff) | |
| parent | address comments (diff) | |
| download | yuzu-922b0d9933951a97879707e038f24f0ba2b3ef95.tar.gz yuzu-922b0d9933951a97879707e038f24f0ba2b3ef95.tar.xz yuzu-922b0d9933951a97879707e038f24f0ba2b3ef95.zip | |
Merge pull request #6226 from german77/sevensix
hid: Implement SevenSixAxis and ConsoleSixAxisSensor
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/transfer_memory.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/transfer_memory.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/core/hle/kernel/transfer_memory.cpp b/src/core/hle/kernel/transfer_memory.cpp index cad063e4d..1dd65468d 100644 --- a/src/core/hle/kernel/transfer_memory.cpp +++ b/src/core/hle/kernel/transfer_memory.cpp | |||
| @@ -36,6 +36,10 @@ std::shared_ptr<TransferMemory> TransferMemory::Create(KernelCore& kernel, | |||
| 36 | return transfer_memory; | 36 | return transfer_memory; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | u8* TransferMemory::GetPointer() { | ||
| 40 | return memory.GetPointer(base_address); | ||
| 41 | } | ||
| 42 | |||
| 39 | const u8* TransferMemory::GetPointer() const { | 43 | const u8* TransferMemory::GetPointer() const { |
| 40 | return memory.GetPointer(base_address); | 44 | return memory.GetPointer(base_address); |
| 41 | } | 45 | } |
diff --git a/src/core/hle/kernel/transfer_memory.h b/src/core/hle/kernel/transfer_memory.h index 521951424..59328c0fe 100644 --- a/src/core/hle/kernel/transfer_memory.h +++ b/src/core/hle/kernel/transfer_memory.h | |||
| @@ -57,6 +57,9 @@ public: | |||
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | /// Gets a pointer to the backing block of this instance. | 59 | /// Gets a pointer to the backing block of this instance. |
| 60 | u8* GetPointer(); | ||
| 61 | |||
| 62 | /// Gets a pointer to the backing block of this instance. | ||
| 60 | const u8* GetPointer() const; | 63 | const u8* GetPointer() const; |
| 61 | 64 | ||
| 62 | /// Gets the size of the memory backing this instance in bytes. | 65 | /// Gets the size of the memory backing this instance in bytes. |