4 files changed, 20 insertions, 20 deletions

diff --git a/src/core/hw/lcd.cpp b/src/core/hw/gpu.cpp
index 61ee99c1f..632e1aaac 100644
--- a/src/core/hw/lcd.cpp
+++ b/src/core/hw/gpu.cpp
@@ -8,12 +8,12 @@
 #include "core/core.h"
 #include "core/mem_map.h"
 #include "core/hle/kernel/thread.h"
-#include "core/hw/lcd.h"
+#include "core/hw/gpu.h"
 
 #include "video_core/video_core.h"
 
 
-namespace LCD {
+namespace GPU {
 
 Registers g_regs;
 
@@ -61,7 +61,7 @@ const FramebufferLocation GetFramebufferLocation() {
     } else if ((g_regs.framebuffer_top_right_1 & ~Memory::FCRAM_MASK) == Memory::FCRAM_PADDR) {
         return FRAMEBUFFER_LOCATION_FCRAM;
     } else {
-        ERROR_LOG(LCD, "unknown framebuffer location!");
+        ERROR_LOG(GPU, "unknown framebuffer location!");
     }
     return FRAMEBUFFER_LOCATION_UNKNOWN;
 }
@@ -78,7 +78,7 @@ const u8* GetFramebufferPointer(const u32 address) {
     case FRAMEBUFFER_LOCATION_VRAM:
         return (const u8*)Memory::GetPointer(Memory::VirtualAddressFromPhysical_VRAM(address));
     default:
-        ERROR_LOG(LCD, "unknown framebuffer location");
+        ERROR_LOG(GPU, "unknown framebuffer location");
     }
     return NULL;
 }
@@ -123,7 +123,7 @@ inline void Read(T &var, const u32 addr) {
         break;
 
     default:
-        ERROR_LOG(LCD, "unknown Read%d @ 0x%08X", sizeof(var) * 8, addr);
+        ERROR_LOG(GPU, "unknown Read%d @ 0x%08X", sizeof(var) * 8, addr);
         break;
     }
 }
@@ -144,13 +144,13 @@ inline void Write(u32 addr, const T data) {
         if (g_regs.command_processing_enabled & 1)
         {
             // u32* buffer = (u32*)Memory::GetPointer(g_regs.command_list_address << 3);
-            ERROR_LOG(LCD, "Beginning %x bytes of commands from address %x", g_regs.command_list_size, g_regs.command_list_address << 3);
+            ERROR_LOG(GPU, "Beginning %x bytes of commands from address %x", g_regs.command_list_size, g_regs.command_list_address << 3);
             // TODO: Process command list!
         }
         break;
 
     default:
-        ERROR_LOG(LCD, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr);
+        ERROR_LOG(GPU, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr);
         break;
     }
 }
@@ -183,12 +183,12 @@ void Update() {
 void Init() {
     g_last_ticks = Core::g_app_core->GetTicks();
     SetFramebufferLocation(FRAMEBUFFER_LOCATION_FCRAM);
-    NOTICE_LOG(LCD, "initialized OK");
+    NOTICE_LOG(GPU, "initialized OK");
 }
 
 /// Shutdown hardware
 void Shutdown() {
-    NOTICE_LOG(LCD, "shutdown OK");
+    NOTICE_LOG(GPU, "shutdown OK");
 }
 
 } // namespace
diff --git a/src/core/hw/lcd.h b/src/core/hw/gpu.h
index 2ae852d7c..c81b1bb3f 100644
--- a/src/core/hw/lcd.h
+++ b/src/core/hw/gpu.h
@@ -6,7 +6,7 @@
 
 #include "common/common_types.h"
 
-namespace LCD {
+namespace GPU {
 
 struct Registers {
     u32 framebuffer_top_left_1;
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp
index 85669ae7f..ed70486e6 100644
--- a/src/core/hw/hw.cpp
+++ b/src/core/hw/hw.cpp
@@ -6,7 +6,7 @@
 #include "common/log.h"
 
 #include "core/hw/hw.h"
-#include "core/hw/lcd.h"
+#include "core/hw/gpu.h"
 #include "core/hw/ndma.h"
 
 namespace HW {
@@ -34,7 +34,7 @@ enum {
     VADDR_CDMA      = 0xFFFDA000,   // CoreLink DMA-330? Info
     VADDR_DSP_2     = 0x1ED03000,
     VADDR_HASH_2    = 0x1EE01000,
-    VADDR_LCD       = 0x1EF00000,
+    VADDR_GPU       = 0x1EF00000,
 };
 
 template <typename T>
@@ -46,8 +46,8 @@ inline void Read(T &var, const u32 addr) {
     //     NDMA::Read(var, addr);
     //     break;
 
-    case VADDR_LCD:
-        LCD::Read(var, addr);
+    case VADDR_GPU:
+        GPU::Read(var, addr);
         break;
 
     default:
@@ -64,8 +64,8 @@ inline void Write(u32 addr, const T data) {
     //     NDMA::Write(addr, data);
     //     break;
 
-    case VADDR_LCD:
-        LCD::Write(addr, data);
+    case VADDR_GPU:
+        GPU::Write(addr, data);
         break;
 
     default:
@@ -87,13 +87,13 @@ template void Write<u8>(u32 addr, const u8 data);
 
 /// Update hardware
 void Update() {
-    LCD::Update();
+    GPU::Update();
     NDMA::Update();
 }
 
 /// Initialize hardware
 void Init() {
-    LCD::Init();
+    GPU::Init();
     NDMA::Init();
     NOTICE_LOG(HW, "initialized OK");
 }
diff --git a/src/core/hw/ndma.cpp b/src/core/hw/ndma.cpp
index 52e459ebd..f6aa72d16 100644
--- a/src/core/hw/ndma.cpp
+++ b/src/core/hw/ndma.cpp
@@ -37,12 +37,12 @@ void Update() {
 
 /// Initialize hardware
 void Init() {
-    NOTICE_LOG(LCD, "initialized OK");
+    NOTICE_LOG(GPU, "initialized OK");
 }
 
 /// Shutdown hardware
 void Shutdown() {
-    NOTICE_LOG(LCD, "shutdown OK");
+    NOTICE_LOG(GPU, "shutdown OK");
 }
 
 } // namespace