diff --git a/src/devices/usb/Timer.cpp b/src/common/Timer.cpp similarity index 100% rename from src/devices/usb/Timer.cpp rename to src/common/Timer.cpp diff --git a/src/devices/usb/Timer.h b/src/common/Timer.h similarity index 100% rename from src/devices/usb/Timer.h rename to src/common/Timer.h diff --git a/src/core/kernel/exports/EmuKrnlKe.cpp b/src/core/kernel/exports/EmuKrnlKe.cpp index a3514448e..25de9ec3a 100644 --- a/src/core/kernel/exports/EmuKrnlKe.cpp +++ b/src/core/kernel/exports/EmuKrnlKe.cpp @@ -63,7 +63,7 @@ namespace NtDll #include "EmuKrnlKi.h" // For KiRemoveTreeTimer(), KiInsertTreeTimer() #include "EmuKrnlKe.h" #include "core\kernel\support\EmuFile.h" // For IsEmuHandle(), NtStatusToString() -#include "devices\usb\Timer.h" +#include "Timer.h" #include #include diff --git a/src/core/kernel/init/CxbxKrnl.cpp b/src/core/kernel/init/CxbxKrnl.cpp index ebec60fa0..1af818f7b 100644 --- a/src/core/kernel/init/CxbxKrnl.cpp +++ b/src/core/kernel/init/CxbxKrnl.cpp @@ -72,7 +72,7 @@ namespace xboxkrnl #include "devices\LED.h" // For LED::Sequence #include "devices\SMCDevice.h" // For SMC Access #include "common\crypto\EmuSha.h" // For the SHA1 functions -#include "devices\usb\Timer.h" // For Timer_Init +#include "Timer.h" // For Timer_Init #include "..\Common\Input\InputConfig.h" // For the InputDeviceManager /*! thread local storage */ diff --git a/src/devices/usb/OHCI.h b/src/devices/usb/OHCI.h index 79776f3a1..fdd8da4f3 100644 --- a/src/devices/usb/OHCI.h +++ b/src/devices/usb/OHCI.h @@ -39,7 +39,7 @@ #include #include "USBDevice.h" -#include "devices\usb\Timer.h" +#include "Timer.h" // Abbreviations used: