diff options
| author | 2014-06-06 00:35:49 -0400 | |
|---|---|---|
| committer | 2014-06-13 09:51:13 -0400 | |
| commit | c95972275e276abe3afcac79d956ea29a0879c8e (patch) | |
| tree | f902b895aa25142f94001674baedfdac9794d548 /src/core/hle/service/gsp.cpp | |
| parent | Kernel: Updated various kernel function "name" arguments to be const references. (diff) | |
| download | yuzu-c95972275e276abe3afcac79d956ea29a0879c8e.tar.gz yuzu-c95972275e276abe3afcac79d956ea29a0879c8e.tar.xz yuzu-c95972275e276abe3afcac79d956ea29a0879c8e.zip | |
HLE: Updated all uses of NULL to nullptr (to be C++11 compliant)
Diffstat (limited to 'src/core/hle/service/gsp.cpp')
| -rw-r--r-- | src/core/hle/service/gsp.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/core/hle/service/gsp.cpp b/src/core/hle/service/gsp.cpp index c181e296f..f31e7d86d 100644 --- a/src/core/hle/service/gsp.cpp +++ b/src/core/hle/service/gsp.cpp | |||
| @@ -104,7 +104,7 @@ void RegisterInterruptRelayQueue(Service::Interface* self) { | |||
| 104 | u32 flags = cmd_buff[1]; | 104 | u32 flags = cmd_buff[1]; |
| 105 | u32 event_handle = cmd_buff[3]; | 105 | u32 event_handle = cmd_buff[3]; |
| 106 | 106 | ||
| 107 | _assert_msg_(GSP, (event_handle != 0), "called, but event is NULL!"); | 107 | _assert_msg_(GSP, (event_handle != 0), "called, but event is nullptr!"); |
| 108 | 108 | ||
| 109 | g_event_handle = event_handle; | 109 | g_event_handle = event_handle; |
| 110 | 110 | ||
| @@ -139,36 +139,36 @@ void TriggerCmdReqQueue(Service::Interface* self) { | |||
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | const Interface::FunctionInfo FunctionTable[] = { | 141 | const Interface::FunctionInfo FunctionTable[] = { |
| 142 | {0x00010082, NULL, "WriteHWRegs"}, | 142 | {0x00010082, nullptr, "WriteHWRegs"}, |
| 143 | {0x00020084, NULL, "WriteHWRegsWithMask"}, | 143 | {0x00020084, nullptr, "WriteHWRegsWithMask"}, |
| 144 | {0x00030082, NULL, "WriteHWRegRepeat"}, | 144 | {0x00030082, nullptr, "WriteHWRegRepeat"}, |
| 145 | {0x00040080, ReadHWRegs, "ReadHWRegs"}, | 145 | {0x00040080, ReadHWRegs, "ReadHWRegs"}, |
| 146 | {0x00050200, NULL, "SetBufferSwap"}, | 146 | {0x00050200, nullptr, "SetBufferSwap"}, |
| 147 | {0x00060082, NULL, "SetCommandList"}, | 147 | {0x00060082, nullptr, "SetCommandList"}, |
| 148 | {0x000700C2, NULL, "RequestDma"}, | 148 | {0x000700C2, nullptr, "RequestDma"}, |
| 149 | {0x00080082, NULL, "FlushDataCache"}, | 149 | {0x00080082, nullptr, "FlushDataCache"}, |
| 150 | {0x00090082, NULL, "InvalidateDataCache"}, | 150 | {0x00090082, nullptr, "InvalidateDataCache"}, |
| 151 | {0x000A0044, NULL, "RegisterInterruptEvents"}, | 151 | {0x000A0044, nullptr, "RegisterInterruptEvents"}, |
| 152 | {0x000B0040, NULL, "SetLcdForceBlack"}, | 152 | {0x000B0040, nullptr, "SetLcdForceBlack"}, |
| 153 | {0x000C0000, TriggerCmdReqQueue, "TriggerCmdReqQueue"}, | 153 | {0x000C0000, TriggerCmdReqQueue, "TriggerCmdReqQueue"}, |
| 154 | {0x000D0140, NULL, "SetDisplayTransfer"}, | 154 | {0x000D0140, nullptr, "SetDisplayTransfer"}, |
| 155 | {0x000E0180, NULL, "SetTextureCopy"}, | 155 | {0x000E0180, nullptr, "SetTextureCopy"}, |
| 156 | {0x000F0200, NULL, "SetMemoryFill"}, | 156 | {0x000F0200, nullptr, "SetMemoryFill"}, |
| 157 | {0x00100040, NULL, "SetAxiConfigQoSMode"}, | 157 | {0x00100040, nullptr, "SetAxiConfigQoSMode"}, |
| 158 | {0x00110040, NULL, "SetPerfLogMode"}, | 158 | {0x00110040, nullptr, "SetPerfLogMode"}, |
| 159 | {0x00120000, NULL, "GetPerfLog"}, | 159 | {0x00120000, nullptr, "GetPerfLog"}, |
| 160 | {0x00130042, RegisterInterruptRelayQueue, "RegisterInterruptRelayQueue"}, | 160 | {0x00130042, RegisterInterruptRelayQueue, "RegisterInterruptRelayQueue"}, |
| 161 | {0x00140000, NULL, "UnregisterInterruptRelayQueue"}, | 161 | {0x00140000, nullptr, "UnregisterInterruptRelayQueue"}, |
| 162 | {0x00150002, NULL, "TryAcquireRight"}, | 162 | {0x00150002, nullptr, "TryAcquireRight"}, |
| 163 | {0x00160042, NULL, "AcquireRight"}, | 163 | {0x00160042, nullptr, "AcquireRight"}, |
| 164 | {0x00170000, NULL, "ReleaseRight"}, | 164 | {0x00170000, nullptr, "ReleaseRight"}, |
| 165 | {0x00180000, NULL, "ImportDisplayCaptureInfo"}, | 165 | {0x00180000, nullptr, "ImportDisplayCaptureInfo"}, |
| 166 | {0x00190000, NULL, "SaveVramSysArea"}, | 166 | {0x00190000, nullptr, "SaveVramSysArea"}, |
| 167 | {0x001A0000, NULL, "RestoreVramSysArea"}, | 167 | {0x001A0000, nullptr, "RestoreVramSysArea"}, |
| 168 | {0x001B0000, NULL, "ResetGpuCore"}, | 168 | {0x001B0000, nullptr, "ResetGpuCore"}, |
| 169 | {0x001C0040, NULL, "SetLedForceOff"}, | 169 | {0x001C0040, nullptr, "SetLedForceOff"}, |
| 170 | {0x001D0040, NULL, "SetTestCommand"}, | 170 | {0x001D0040, nullptr, "SetTestCommand"}, |
| 171 | {0x001E0080, NULL, "SetInternalPriorities"}, | 171 | {0x001E0080, nullptr, "SetInternalPriorities"}, |
| 172 | }; | 172 | }; |
| 173 | 173 | ||
| 174 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 174 | //////////////////////////////////////////////////////////////////////////////////////////////////// |