From 9cdb7cec945c15956e8b802c34ca0f0b1625885b Mon Sep 17 00:00:00 2001
From: George Wright <gw@gwright.org.uk>
Date: Wed, 24 Jun 2026 18:01:20 -0700
Subject: [PATCH] Move Psion-specific files into their own subdirectories

---
 WindCore/WindCore.pro                   | 33 ++++++++++++++++---------
 WindCore/{ => osaris}/clps7111.cpp      |  0
 WindCore/{ => osaris}/clps7111.h        |  1 -
 WindCore/{ => osaris}/clps7111_defs.h   |  0
 WindCore/{ => osaris}/clps7600.cpp      |  0
 WindCore/{ => osaris}/clps7600.h        |  0
 WindCore/{ => series5mx}/etna.cpp       |  0
 WindCore/{ => series5mx}/etna.h         |  0
 WindCore/{ => series5mx}/wind_defs.h    |  0
 WindCore/{ => series5mx}/windermere.cpp |  0
 WindCore/{ => series5mx}/windermere.h   |  0
 WindQt/main.cpp                         |  4 +--
 WindQt/mainwindow.cpp                   |  1 -
 13 files changed, 23 insertions(+), 16 deletions(-)
 rename WindCore/{ => osaris}/clps7111.cpp (100%)
 rename WindCore/{ => osaris}/clps7111.h (99%)
 rename WindCore/{ => osaris}/clps7111_defs.h (100%)
 rename WindCore/{ => osaris}/clps7600.cpp (100%)
 rename WindCore/{ => osaris}/clps7600.h (100%)
 rename WindCore/{ => series5mx}/etna.cpp (100%)
 rename WindCore/{ => series5mx}/etna.h (100%)
 rename WindCore/{ => series5mx}/wind_defs.h (100%)
 rename WindCore/{ => series5mx}/windermere.cpp (100%)
 rename WindCore/{ => series5mx}/windermere.h (100%)

diff --git a/WindCore/WindCore.pro b/WindCore/WindCore.pro
index 9353d7e..7d20df8 100644
--- a/WindCore/WindCore.pro
+++ b/WindCore/WindCore.pro
@@ -24,23 +24,22 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 SOURCES += \
     arm710.cpp \
-    clps7111.cpp \
-    clps7600.cpp \
     emubase.cpp \
-    etna.cpp \
     decoder.c \
-    decoder-arm.c \
-    windermere.cpp
+    decoder-arm.c
+
+SOURCES += \
+    osaris/clps7111.cpp \
+    osaris/clps7600.cpp
+
+SOURCES += \
+    series5mx/etna.cpp \
+    series5mx/windermere.cpp
 
 HEADERS += \
     arm710.h \
-    clps7111.h \
-    clps7111_defs.h \
-    clps7600.h \
     emubase.h \
-    etna.h \
     hardware.h \
-    wind_defs.h \
     macros.h \
     isa-inlines.h \
     isa-arm.h \
@@ -48,9 +47,19 @@ HEADERS += \
     emitter-arm.h \
     decoder.h \
     decoder-inlines.h \
-    common.h \
-    windermere.h
+    common.h
+    
 unix {
     target.path = /usr/lib
     INSTALLS += target
 }
+
+HEADERS += \
+    osaris/clps7111.h \
+    osaris/clps7111_defs.h \
+    osaris/clps7600.h
+
+HEADERS += \
+    series5mx/etna.h \
+    series5mx/wind_defs.h \
+    series5mx/windermere.h
\ No newline at end of file
diff --git a/WindCore/clps7111.cpp b/WindCore/osaris/clps7111.cpp
similarity index 100%
rename from WindCore/clps7111.cpp
rename to WindCore/osaris/clps7111.cpp
diff --git a/WindCore/clps7111.h b/WindCore/osaris/clps7111.h
similarity index 99%
rename from WindCore/clps7111.h
rename to WindCore/osaris/clps7111.h
index ccb5b51..08b01ea 100644
--- a/WindCore/clps7111.h
+++ b/WindCore/osaris/clps7111.h
@@ -2,7 +2,6 @@
 #include "clps7111_defs.h"
 #include "clps7600.h"
 #include "emubase.h"
-#include "etna.h"
 #include "hardware.h"
 
 namespace CLPS7111 {
diff --git a/WindCore/clps7111_defs.h b/WindCore/osaris/clps7111_defs.h
similarity index 100%
rename from WindCore/clps7111_defs.h
rename to WindCore/osaris/clps7111_defs.h
diff --git a/WindCore/clps7600.cpp b/WindCore/osaris/clps7600.cpp
similarity index 100%
rename from WindCore/clps7600.cpp
rename to WindCore/osaris/clps7600.cpp
diff --git a/WindCore/clps7600.h b/WindCore/osaris/clps7600.h
similarity index 100%
rename from WindCore/clps7600.h
rename to WindCore/osaris/clps7600.h
diff --git a/WindCore/etna.cpp b/WindCore/series5mx/etna.cpp
similarity index 100%
rename from WindCore/etna.cpp
rename to WindCore/series5mx/etna.cpp
diff --git a/WindCore/etna.h b/WindCore/series5mx/etna.h
similarity index 100%
rename from WindCore/etna.h
rename to WindCore/series5mx/etna.h
diff --git a/WindCore/wind_defs.h b/WindCore/series5mx/wind_defs.h
similarity index 100%
rename from WindCore/wind_defs.h
rename to WindCore/series5mx/wind_defs.h
diff --git a/WindCore/windermere.cpp b/WindCore/series5mx/windermere.cpp
similarity index 100%
rename from WindCore/windermere.cpp
rename to WindCore/series5mx/windermere.cpp
diff --git a/WindCore/windermere.h b/WindCore/series5mx/windermere.h
similarity index 100%
rename from WindCore/windermere.h
rename to WindCore/series5mx/windermere.h
diff --git a/WindQt/main.cpp b/WindQt/main.cpp
index d26184c..a655bb3 100644
--- a/WindQt/main.cpp
+++ b/WindQt/main.cpp
@@ -1,5 +1,5 @@
-#include "../WindCore/clps7111.h"
-#include "../WindCore/windermere.h"
+#include "../WindCore/osaris/clps7111.h"
+#include "../WindCore/series5mx/windermere.h"
 #include "mainwindow.h"
 #include <QApplication>
 #include <QFileDialog>
diff --git a/WindQt/mainwindow.cpp b/WindQt/mainwindow.cpp
index 33709f6..684654d 100644
--- a/WindQt/mainwindow.cpp
+++ b/WindQt/mainwindow.cpp
@@ -1,6 +1,5 @@
 #include "mainwindow.h"
 #include "../WindCore/decoder.h"
-#include "clps7111.h"
 #include "ui_mainwindow.h"
 #include <QTimer>
 
-- 
2.45.2