3 files changed, 11 insertions, 1 deletions
diff --git a/backends/platform/ds/arm9/source/cdaudio.h b/backends/platform/ds/arm9/source/cdaudio.h
index 6e53ef7bd2..7a85c97dbd 100644
--- a/backends/platform/ds/arm9/source/cdaudio.h
+++ b/backends/platform/ds/arm9/source/cdaudio.h
@@ -29,6 +29,9 @@
 namespace DS {
 namespace CD {
 
+// FIXME/TODO: The code in this file should be turned into a custom
+// AudioCDManager subclass, see backends/audiocd/ and common/system.h
+
 void setActive(bool active);
 void playTrack(int track, int numLoops, int startFrame, int duration);
 void stopTrack();
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index c4ff241de0..55e3be6cca 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -700,6 +700,10 @@ void OSystem_DS::unlockMutex(MutexRef mutex) {
 void OSystem_DS::deleteMutex(MutexRef mutex) {
 }
 
+// FIXME/TODO: The CD API as follows is *obsolete*
+// and should be replaced by an AudioCDManager subclass,
+// see backends/audiocd/ and common/system.h
+
 bool OSystem_DS::openCD(int drive) {
 	return DS::CD::checkCD();
 }
diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h
index 65ac3f4f7e..50a4353e18 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.h
+++ b/backends/platform/ds/arm9/source/osystem_ds.h
@@ -124,9 +124,12 @@ public:
 	virtual void unlockMutex(MutexRef mutex);
 	virtual void deleteMutex(MutexRef mutex);
 
+
+	// FIXME/TODO: The CD API as follows is *obsolete*
+	// and should be replaced by an AudioCDManager subclass,
+	// see backends/audiocd/ and common/system.h
 	virtual bool openCD(int drive);
 	virtual bool pollCD();
-
 	virtual void playCD(int track, int num_loops, int start_frame, int duration);
 	virtual void stopCD();
 	virtual void updateCD();