[ros-diffs] [hpoussin] 26109: Fix compilation of drivers ks, mpu401_ks and sb16_nt4

[hpoussin at svn.reactos.org]

Author: hpoussin
Date: Thu Mar 15 22:00:34 2007
New Revision: 26109

URL: http://svn.reactos.org/svn/reactos?rev=26109&view=rev
Log:
Fix compilation of drivers ks, mpu401_ks and sb16_nt4

Modified:
    trunk/reactos/drivers/multimedia/ks/irp.c
    trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp
    trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c
    trunk/reactos/include/ddk/portcls.h

Modified: trunk/reactos/drivers/multimedia/ks/irp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/ks/irp.c?rev=26109&r1=26108&r2=26109&view=diff
==============================================================================
--- trunk/reactos/drivers/multimedia/ks/irp.c (original)
+++ trunk/reactos/drivers/multimedia/ks/irp.c Thu Mar 15 22:00:34 2007
@@ -577,7 +577,7 @@
 
     DPRINT1("KS IRP dispatch function called\n");
 
-    PKSDISPATCH_TABLE ks_dispatch_table = NULL;
+    //PKSDISPATCH_TABLE ks_dispatch_table = NULL;
 
     /* ks_dispatch_table is the first element in a structure pointed to by FsContext */
 

Modified: trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp?rev=26109&r1=26108&r2=26109&view=diff
==============================================================================
--- trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp (original)
+++ trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp Thu Mar 15 22:00:34 2007
@@ -14,6 +14,7 @@
 
 #define PUT_GUIDS_HERE
 
+#define INITGUID
 #include <portcls.h>
 
 extern "C"

Modified: trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c?rev=26109&r1=26108&r2=26109&view=diff
==============================================================================
--- trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c (original)
+++ trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c Thu Mar 15 22:00:34 2007
@@ -14,7 +14,7 @@
     return TRUE;
 }
 
-BOOLEAN
+BOOLEAN NTAPI
 ServiceSoundBlasterInterrupt(
     IN  PKINTERRUPT Interrupt,
     IN  PVOID Context)
@@ -42,7 +42,7 @@
 
     DPRINT("Vector is 0x%x\n", vector);
 
-    status = IoConnectInterrupt(parameters->interrupt,
+    status = IoConnectInterrupt(&parameters->interrupt,
                                 ServiceSoundBlasterInterrupt,
                                 DeviceObject,
                                 (PKSPIN_LOCK) NULL,

Modified: trunk/reactos/include/ddk/portcls.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=26109&r1=26108&r2=26109&view=diff
==============================================================================
--- trunk/reactos/include/ddk/portcls.h (original)
+++ trunk/reactos/include/ddk/portcls.h Thu Mar 15 22:00:34 2007
@@ -141,7 +141,7 @@
     Class IDs - TODO
 */
 //#define CLSID_PortDMus    /* dmusicks.h */
-#define CLSID_PortMidi
+DEFINE_GUID(CLSID_PortMidi,0xb4c90a43L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44);
 #define CLSID_PortTopology
 #define CLSID_PortWaveCyclic
 #define CLSID_PortWavePci
@@ -151,7 +151,7 @@
 #define CLSID_MiniportDriverDMusUARTCapture
 #define CLSID_MiniportDriverFmSynth
 #define CLSID_MiniportDriverFmSynthWithVol
-#define CLSID_MiniportDriverUart
+DEFINE_GUID(CLSID_MiniportDriverUart,0xb4c90ae1L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44);
 
 
 /* ===============================================================