Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 07:33:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

- get mpu401, parallel and ramdrv to work on msvc.

Browse source 
svn path=/trunk/; revision=20648
This commit is contained in:
Alex Ionescu 2006-01-07 05:37:22 +00:00
parent 189147d4c4
commit 6b36b1e871
6 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/drivers/dd/mpu401/mpu401.c
View file

@ -23,7 +23,7 @@
/* INTERNAL VARIABLES ******************************************************/ /* INTERNAL VARIABLES ******************************************************/
UINT DeviceCount = 0; ULONG DeviceCount = 0;
/* FUNCTIONS ***************************************************************/ /* FUNCTIONS ***************************************************************/
@ -205,7 +205,7 @@ MPU401Cleanup(PDEVICE_OBJECT DeviceObject,
* RETURNS: Success or failure * RETURNS: Success or failure
*/ */
{ {
UINT Channel; ULONG Channel;
DPRINT("MPU401Cleanup() called!\n"); DPRINT("MPU401Cleanup() called!\n");
// Reset the device (should we do this?) // Reset the device (should we do this?)
@ -240,8 +240,8 @@ MPU401DeviceControl(PDEVICE_OBJECT DeviceObject,
{ {
PIO_STACK_LOCATION Stack; PIO_STACK_LOCATION Stack;
PDEVICE_EXTENSION DeviceExtension; PDEVICE_EXTENSION DeviceExtension;
UINT ByteCount; ULONG ByteCount;
PBYTE Data; PUCHAR Data;
DPRINT("MPU401DeviceControl() called!\n"); DPRINT("MPU401DeviceControl() called!\n");
@ -256,7 +256,7 @@ MPU401DeviceControl(PDEVICE_OBJECT DeviceObject,
case IOCTL_MIDI_PLAY : case IOCTL_MIDI_PLAY :
{ {
DPRINT("Received IOCTL_MIDI_PLAY\n"); DPRINT("Received IOCTL_MIDI_PLAY\n");
Data = (PBYTE) Irp->AssociatedIrp.SystemBuffer; Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer;
DPRINT("Sending %d bytes of MIDI data to 0x%d:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port); DPRINT("Sending %d bytes of MIDI data to 0x%d:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port);

14
reactos/drivers/dd/mpu401/mpu401.h
View file

@ -85,8 +85,8 @@ typedef struct _DEVICE_EXTENSION
{ {
PUNICODE_STRING RegistryPath; PUNICODE_STRING RegistryPath;
PDRIVER_OBJECT DriverObject; PDRIVER_OBJECT DriverObject;
UINT Port; ULONG Port;
UINT IRQ; ULONG IRQ;
// KDPC Dpc; // KDPC Dpc;
// KTIMER Timer; // KTIMER Timer;
// KEVENT Event; // KEVENT Event;
@ -110,8 +110,8 @@ typedef struct _DEVICE_INSTANCE
//typedef struct _CONFIG //typedef struct _CONFIG
//{ //{
// UINT Port; // ULONG Port;
// UINT IRQ; // ULONG IRQ;
//} CONFIG, *PCONFIG; //} CONFIG, *PCONFIG;
/* /*
@ -126,9 +126,9 @@ typedef REGISTRY_CALLBACK_ROUTINE *PREGISTRY_CALLBACK_ROUTINE;
Prototypes for functions in portio.c : Prototypes for functions in portio.c :
*/ */
BOOLEAN WaitToSend(UINT BasePort); BOOLEAN WaitToSend(ULONG BasePort);
BOOLEAN WaitToReceive(UINT BasePort); BOOLEAN WaitToReceive(ULONG BasePort);
BOOLEAN InitUARTMode(UINT BasePort); BOOLEAN InitUARTMode(ULONG BasePort);
/* /*
Prototypes for functions in settings.c : Prototypes for functions in settings.c :

8
reactos/drivers/dd/mpu401/portio.c
View file

@ -13,7 +13,7 @@
#include "mpu401.h" #include "mpu401.h"
BOOLEAN WaitToSend(UINT BasePort) BOOLEAN WaitToSend(ULONG BasePort)
{ {
int TimeOut; int TimeOut;
@ -37,7 +37,7 @@ BOOLEAN WaitToSend(UINT BasePort)
} }
BOOLEAN WaitToReceive(UINT BasePort) BOOLEAN WaitToReceive(ULONG BasePort)
{ {
int TimeOut; int TimeOut;
@ -61,9 +61,9 @@ BOOLEAN WaitToReceive(UINT BasePort)
} }
BOOLEAN InitUARTMode(UINT BasePort) BOOLEAN InitUARTMode(ULONG BasePort)
{ {
UINT TimeOut; ULONG TimeOut;
UCHAR Status = 0; UCHAR Status = 0;
DbgPrint("InitUARTMode() called\n"); DbgPrint("InitUARTMode() called\n");

2
reactos/drivers/dd/parallel/parallel.c
View file

@ -83,7 +83,7 @@ Dispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
{ {
PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp);
NTSTATUS status; NTSTATUS status;
UINT i; ULONG i;
switch (Stack->MajorFunction) switch (Stack->MajorFunction)
{ {

2
reactos/drivers/dd/ramdrv/ramdrv.c
View file

@ -98,7 +98,7 @@ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject,
void *tbuff; void *tbuff;
unsigned int dstlen = 1024 * 1440; unsigned int dstlen = 1024 * 1440;
FILE_STANDARD_INFORMATION finfo; FILE_STANDARD_INFORMATION finfo;
DWORD err; ULONG err;
DPRINT("Ramdisk driver\n"); DPRINT("Ramdisk driver\n");

6
reactos/drivers/lib/bzip2/bzlib.h
View file

@ -308,9 +308,9 @@ BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
); );
#endif #endif
extern _stdcall void *(*BZ2_malloc)( unsigned long size ); extern void *(_stdcall *BZ2_malloc)( unsigned long size );
extern _stdcall void (*BZ2_free)( void *ptr ); extern void (*_stdcall BZ2_free)( void *ptr );
_stdcall void BZ2_set_malloc_free( _stdcall void *(*malloc)(unsigned long size), _stdcall void (*free)(void *ptr) ); void _stdcall BZ2_set_malloc_free( void *(_stdcall *malloc)(unsigned long size), void (_stdcall *free)(void *ptr) );
#ifdef __cplusplus #ifdef __cplusplus
} }