Move Psion-specific files into their own subdirectories

diff --git a/WindCore/WindCore.pro b/WindCore/WindCore.pro
index 9353d7e17f3ec276407fdbd117edd66c0fd7c7b0..7d20df8abb22d329b3c12e2256d21c131d9104a1 100644 (file)
--- 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 ccb5b5101d83cee2ce55f86f8931a1b5d6b7f68b..08b01eaac1171c12a08c95fd71ff05440f4bedac 100644 (file)
--- 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 d26184cdb2a9a17dcc29e30257d89c34dafa3912..a655bb3ddf2e1639afdcfdcda88949e949ff0408 100644 (file)
--- 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 33709f62e8ccf22cf9999c5555eabe82c7c5116f..684654dd19824c7b07e89b5c742b3c9b7962b2e1 100644 (file)
--- 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>