diff options
| author | 2017-01-01 14:58:02 +0200 | |
|---|---|---|
| committer | 2017-02-21 23:57:31 +0200 | |
| commit | ea1ea0224c04753402e0b6472080f0c5d90a7a46 (patch) | |
| tree | d6823e52d913418d63ec3f0b7ed12eb763a98899 /src/common | |
| parent | Merge pull request #2562 from yuriks/pica-refactor3 (diff) | |
| download | yuzu-ea1ea0224c04753402e0b6472080f0c5d90a7a46.tar.gz yuzu-ea1ea0224c04753402e0b6472080f0c5d90a7a46.tar.xz yuzu-ea1ea0224c04753402e0b6472080f0c5d90a7a46.zip | |
HW: add AES engine & implement AES-CCM
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common_paths.h | 1 | ||||
| -rw-r--r-- | src/common/logging/backend.cpp | 1 | ||||
| -rw-r--r-- | src/common/logging/log.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/common/common_paths.h b/src/common/common_paths.h index b56105306..d5b510cdb 100644 --- a/src/common/common_paths.h +++ b/src/common/common_paths.h | |||
| @@ -45,3 +45,4 @@ | |||
| 45 | 45 | ||
| 46 | // Sys files | 46 | // Sys files |
| 47 | #define SHARED_FONT "shared_font.bin" | 47 | #define SHARED_FONT "shared_font.bin" |
| 48 | #define AES_KEYS "aes_keys.txt" | ||
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 2ef3e6b05..0ea65e817 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp | |||
| @@ -62,6 +62,7 @@ namespace Log { | |||
| 62 | SUB(HW, Memory) \ | 62 | SUB(HW, Memory) \ |
| 63 | SUB(HW, LCD) \ | 63 | SUB(HW, LCD) \ |
| 64 | SUB(HW, GPU) \ | 64 | SUB(HW, GPU) \ |
| 65 | SUB(HW, AES) \ | ||
| 65 | CLS(Frontend) \ | 66 | CLS(Frontend) \ |
| 66 | CLS(Render) \ | 67 | CLS(Render) \ |
| 67 | SUB(Render, Software) \ | 68 | SUB(Render, Software) \ |
diff --git a/src/common/logging/log.h b/src/common/logging/log.h index 4330ef879..a590d39ff 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h | |||
| @@ -79,6 +79,7 @@ enum class Class : ClassType { | |||
| 79 | HW_Memory, ///< Memory-map and address translation | 79 | HW_Memory, ///< Memory-map and address translation |
| 80 | HW_LCD, ///< LCD register emulation | 80 | HW_LCD, ///< LCD register emulation |
| 81 | HW_GPU, ///< GPU control emulation | 81 | HW_GPU, ///< GPU control emulation |
| 82 | HW_AES, ///< AES engine emulation | ||
| 82 | Frontend, ///< Emulator UI | 83 | Frontend, ///< Emulator UI |
| 83 | Render, ///< Emulator video output and hardware acceleration | 84 | Render, ///< Emulator video output and hardware acceleration |
| 84 | Render_Software, ///< Software renderer backend | 85 | Render_Software, ///< Software renderer backend |