diff options
| author | 2014-12-08 23:52:27 -0500 | |
|---|---|---|
| committer | 2014-12-31 10:51:44 -0500 | |
| commit | 97a7381d29b69dbe760598e70669c16573304ad4 (patch) | |
| tree | f4e336af1e5cf5d72c2665470a96a9db73711ae7 /src/common/logging | |
| parent | Merge pull request #375 from lioncash/uops (diff) | |
| download | yuzu-97a7381d29b69dbe760598e70669c16573304ad4.tar.gz yuzu-97a7381d29b69dbe760598e70669c16573304ad4.tar.xz yuzu-97a7381d29b69dbe760598e70669c16573304ad4.zip | |
SOC_U: Preliminary implementation of sockets.
Stubbed CreateMemoryBlock
Using Berkeley sockets, and Winsock2.2 on Windows.
So far ftpony creates the socket and accepts incoming connections
SOC_U: Renamed functions to maintain consistency
Also prevents possible scope errors / conflicts with the actual Berkeley socket functions
SOCU: Close all the opened sockets when cleaning up SOCU
Diffstat (limited to 'src/common/logging')
| -rw-r--r-- | src/common/logging/backend.cpp | 1 | ||||
| -rw-r--r-- | src/common/logging/log.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 816d1bb55..7ac30ad50 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp | |||
| @@ -39,6 +39,7 @@ static std::shared_ptr<Logger> global_logger; | |||
| 39 | SUB(Service, CFG) \ | 39 | SUB(Service, CFG) \ |
| 40 | SUB(Service, DSP) \ | 40 | SUB(Service, DSP) \ |
| 41 | SUB(Service, HID) \ | 41 | SUB(Service, HID) \ |
| 42 | SUB(Service, SOC) \ | ||
| 42 | CLS(HW) \ | 43 | CLS(HW) \ |
| 43 | SUB(HW, Memory) \ | 44 | SUB(HW, Memory) \ |
| 44 | SUB(HW, GPU) \ | 45 | SUB(HW, GPU) \ |
diff --git a/src/common/logging/log.h b/src/common/logging/log.h index d1c391862..06b99b07a 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h | |||
| @@ -59,6 +59,7 @@ enum class Class : ClassType { | |||
| 59 | Service_CFG, ///< The CFG (Configuration) service | 59 | Service_CFG, ///< The CFG (Configuration) service |
| 60 | Service_DSP, ///< The DSP (DSP control) service | 60 | Service_DSP, ///< The DSP (DSP control) service |
| 61 | Service_HID, ///< The HID (User input) service | 61 | Service_HID, ///< The HID (User input) service |
| 62 | Service_SOC, ///< The SOC (Socket) service | ||
| 62 | HW, ///< Low-level hardware emulation | 63 | HW, ///< Low-level hardware emulation |
| 63 | HW_Memory, ///< Memory-map and address translation | 64 | HW_Memory, ///< Memory-map and address translation |
| 64 | HW_GPU, ///< GPU control emulation | 65 | HW_GPU, ///< GPU control emulation |