diff options
| author | 2014-12-14 03:30:11 -0200 | |
|---|---|---|
| committer | 2014-12-15 18:26:17 -0200 | |
| commit | e321decf98a6b0041e4d6b30ca79f24308bbb82c (patch) | |
| tree | 5d458d4768cd95942154f1b2c9298fac04882700 /src/core/hle/kernel/kernel.h | |
| parent | Merge pull request #276 from lioncash/decrappify (diff) | |
| download | yuzu-e321decf98a6b0041e4d6b30ca79f24308bbb82c.tar.gz yuzu-e321decf98a6b0041e4d6b30ca79f24308bbb82c.tar.xz yuzu-e321decf98a6b0041e4d6b30ca79f24308bbb82c.zip | |
Remove SyncRequest from K::Object and create a new K::Session type
This is a first step at fixing the conceptual insanity that is our
handling of service and IPC calls. For now, interfaces still directly
derived from Session because we don't have the infrastructure to do it
properly. (That is, Processes and scheduling them.)
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 85e3264b9..7e0f15c84 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -22,7 +22,7 @@ enum KernelHandle { | |||
| 22 | enum class HandleType : u32 { | 22 | enum class HandleType : u32 { |
| 23 | Unknown = 0, | 23 | Unknown = 0, |
| 24 | Port = 1, | 24 | Port = 1, |
| 25 | Service = 2, | 25 | Session = 2, |
| 26 | Event = 3, | 26 | Event = 3, |
| 27 | Mutex = 4, | 27 | Mutex = 4, |
| 28 | SharedMemory = 5, | 28 | SharedMemory = 5, |
| @@ -30,10 +30,7 @@ enum class HandleType : u32 { | |||
| 30 | Thread = 7, | 30 | Thread = 7, |
| 31 | Process = 8, | 31 | Process = 8, |
| 32 | AddressArbiter = 9, | 32 | AddressArbiter = 9, |
| 33 | File = 10, | 33 | Semaphore = 10, |
| 34 | Semaphore = 11, | ||
| 35 | Archive = 12, | ||
| 36 | Directory = 13, | ||
| 37 | }; | 34 | }; |
| 38 | 35 | ||
| 39 | enum { | 36 | enum { |
| @@ -53,15 +50,6 @@ public: | |||
| 53 | virtual Kernel::HandleType GetHandleType() const = 0; | 50 | virtual Kernel::HandleType GetHandleType() const = 0; |
| 54 | 51 | ||
| 55 | /** | 52 | /** |
| 56 | * Synchronize kernel object. | ||
| 57 | * @return True if the current thread should wait as a result of the sync | ||
| 58 | */ | ||
| 59 | virtual ResultVal<bool> SyncRequest() { | ||
| 60 | LOG_ERROR(Kernel, "(UNIMPLEMENTED)"); | ||
| 61 | return UnimplementedFunction(ErrorModule::Kernel); | ||
| 62 | } | ||
| 63 | |||
| 64 | /** | ||
| 65 | * Wait for kernel object to synchronize. | 53 | * Wait for kernel object to synchronize. |
| 66 | * @return True if the current thread should wait as a result of the wait | 54 | * @return True if the current thread should wait as a result of the wait |
| 67 | */ | 55 | */ |