Move Athens emulator to devices/common/clockgen

devices/CMakeLists.txt

@@ -8,6 +8,7 @@ include_directories("${PROJECT_SOURCE_DIR}"
 platform_glob(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
                       "${CMAKE_CURRENT_SOURCE_DIR}/common/*.cpp"
                       "${CMAKE_CURRENT_SOURCE_DIR}/common/adb/*.cpp"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/common/clockgen/*.cpp"
                       "${CMAKE_CURRENT_SOURCE_DIR}/common/i2c/*.cpp"
                       "${CMAKE_CURRENT_SOURCE_DIR}/common/ata/*.cpp"
                       "${CMAKE_CURRENT_SOURCE_DIR}/common/nubus/*.cpp"

devices/common/clockgen/athens.cpp

@@ -31,7 +31,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
     This is helpful especially for calculating video parameters.
  */
 
-#include <devices/common/i2c/athens.h>
+#include <devices/common/clockgen/athens.h>
 #include <loguru.hpp>
 
 #include <algorithm>

devices/common/i2c/i2c.h

@@ -1,6 +1,6 @@
 /*
 DingusPPC - The Experimental PowerPC Macintosh emulator
-Copyright (C) 2018-21 divingkatae and maximum
+Copyright (C) 2018-24 divingkatae and maximum
                       (theweirdo)     spatium
 
 (Contact divingkatae#1017 or powermax#2286 on Discord for more info)
@@ -27,11 +27,13 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #ifndef I2C_H
 #define I2C_H
 
-#include <stdexcept>
-#include <cstring>
-#include <string>
 #include <loguru.hpp>
 
+#include <cinttypes>
+#include <cstring>
+#include <stdexcept>
+#include <string>
+
 /** Base class for I2C devices */
 class I2CDevice {
 public:

devices/video/control.cpp

@@ -36,7 +36,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
     Kudos to joevt#3510 for his precious technical help and HW hacking.
  */
 
-#include <devices/common/i2c/athens.h>
 #include <devices/common/i2c/i2c.h>
 #include <devices/deviceregistry.h>
 #include <devices/ioctrl/macio.h>

devices/video/control.h

@@ -24,7 +24,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #ifndef CONTROL_VIDEO_H
 #define CONTROL_VIDEO_H
 
-#include <devices/common/i2c/athens.h>
+#include <devices/common/clockgen/athens.h>
 #include <devices/common/pci/pcidevice.h>
 #include <devices/video/appleramdac.h>
 #include <devices/video/displayid.h>

devices/video/taos.cpp

@@ -22,7 +22,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 /** @file Taos video controller emulation. */
 
 #include <core/bitops.h>
-#include <devices/common/i2c/athens.h>
 #include <devices/deviceregistry.h>
 #include <devices/memctrl/memctrlbase.h>
 #include <devices/video/taos.h>

devices/video/taos.h

@@ -28,6 +28,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #ifndef TAOS_VIDEO_H
 #define TAOS_VIDEO_H
 
+#include <devices/common/clockgen/athens.h>
 #include <devices/common/i2c/i2c.h>
 #include <devices/common/mmiodevice.h>
 #include <devices/video/videoctrl.h>

machines/machinegossamer.cpp

@@ -25,9 +25,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <cpu/ppc/ppcemu.h>
+#include <devices/common/clockgen/athens.h>
 #include <devices/common/hwcomponent.h>
 #include <devices/common/i2c/i2c.h>
-#include <devices/common/i2c/athens.h>
 #include <devices/common/i2c/i2cprom.h>
 #include <devices/common/machineid.h>
 #include <devices/common/scsi/scsihd.h>