--- xmil/fdd/fdd_mtr.c	2004/08/07 07:19:56	1.6
+++ xmil/fdd/fdd_mtr.c	2008/06/02 20:07:31	1.11
@@ -1,4 +1,6 @@
 #include	"compiler.h"
+#if !defined(DISABLE_SOUND)
+
 #include	"soundmng.h"
 #include	"pccore.h"
 #include	"iocore.h"
@@ -30,16 +32,16 @@ static void fddmtr_event(void) {
 }
 
 
-// ----
+/* ---- */
 
-void fddmtr_init(void) {
+void fddmtr_initialize(void) {
 
 	soundmng_pcmstop(SOUND_PCMSEEK);
 	ZeroMemory(&fddmtr, sizeof(fddmtr));
 	FillMemory(fddmtr.head, sizeof(fddmtr.head), 24);
 }
 
-void fddmtr_callback(DWORD time) {
+void fddmtr_callback(UINT32 time) {
 
 	if ((fddmtr.curevent) && (time >= fddmtr.nextevent)) {
 		fddmtr_event();
@@ -48,11 +50,11 @@ void fddmtr_callback(DWORD time) {
 
 void fddmtr_drvset(void) {
 
-	fddmtr.curdrv = fdc.drv;
-	if ((!fddmtr.eventtime[fddmtr.curdrv]) && (!fdc.motor)) {
+	fddmtr.curdrv = fdc.s.drv;
+	if ((!fddmtr.eventtime[fddmtr.curdrv]) && (!fdc.s.motor)) {
 		fddmtr.eventtime[fddmtr.curdrv] = GETTICK() + 5000;
 	}
-	else if ((fddmtr.eventtime[fddmtr.curdrv]) && (fdc.motor)) {
+	else if ((fddmtr.eventtime[fddmtr.curdrv]) && (fdc.s.motor)) {
 		if (fddmtr.eventtime[fddmtr.curdrv] < GETTICK()) {
 			fddmtr.head[fddmtr.curdrv] = 24;
 		}
@@ -64,8 +66,8 @@ void fddmtr_motormove(void) {
 
 	int		regmove;
 
-	regmove = fddmtr.head[fddmtr.curdrv] - fdc.c;
-	fddmtr.head[fddmtr.curdrv] = fdc.c;
+	regmove = fddmtr.head[fddmtr.curdrv] - fdc.s.c;
+	fddmtr.head[fddmtr.curdrv] = fdc.s.c;
 	if (!xmilcfg.MOTOR) {
 		return;
 	}
@@ -90,15 +92,17 @@ void fddmtr_motormove(void) {
 	}
 }
 
-void fddmtr_waitsec(BYTE value) {
+void fddmtr_waitsec(REG8 value) {
 
 	if (!xmilcfg.MOTOR) {
 		return;
 	}
-	if ((fdc.r != value) && (fddmtr.curevent < 1)) {
+	if ((fdc.s.r != value) && (fddmtr.curevent < 1)) {
 		fddmtr_event();
 		fddmtr.curevent = 1;
 		fddmtr.nextevent = GETTICK() + SEKSEC_MS;
 	}
 }
 
+#endif	/* !defined(DISABLE_SOUND) */
+