From 2d8e0024578200f44f0f4b9fa8974e0f1fd07b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 17 Mar 2007 23:21:23 +0000 Subject: [PATCH] Fix some warnings svn path=/trunk/; revision=26127 --- reactos/drivers/base/serial/circularbuffer.c | 1 - reactos/drivers/base/serial/cleanup.c | 1 - reactos/drivers/base/serial/close.c | 1 - reactos/drivers/base/serial/create.c | 1 - reactos/drivers/base/serial/devctrl.c | 47 ++++++++------- reactos/drivers/base/serial/info.c | 1 - reactos/drivers/base/serial/legacy.c | 1 - reactos/drivers/base/serial/misc.c | 11 ++-- reactos/drivers/base/serial/pnp.c | 3 +- reactos/drivers/base/serial/power.c | 1 - reactos/drivers/base/serial/rw.c | 15 ++--- reactos/drivers/base/serial/serial.c | 4 +- reactos/drivers/base/serial/serial.h | 61 ++++---------------- reactos/drivers/base/serial/serial.rbuild | 1 + 14 files changed, 54 insertions(+), 95 deletions(-) diff --git a/reactos/drivers/base/serial/circularbuffer.c b/reactos/drivers/base/serial/circularbuffer.c index 67189c23357..c2b358375a2 100644 --- a/reactos/drivers/base/serial/circularbuffer.c +++ b/reactos/drivers/base/serial/circularbuffer.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS diff --git a/reactos/drivers/base/serial/cleanup.c b/reactos/drivers/base/serial/cleanup.c index 760c20c5260..d5ec6f09115 100644 --- a/reactos/drivers/base/serial/cleanup.c +++ b/reactos/drivers/base/serial/cleanup.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS NTAPI diff --git a/reactos/drivers/base/serial/close.c b/reactos/drivers/base/serial/close.c index 5ff9234355e..bc36c8c7d6b 100644 --- a/reactos/drivers/base/serial/close.c +++ b/reactos/drivers/base/serial/close.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS NTAPI diff --git a/reactos/drivers/base/serial/create.c b/reactos/drivers/base/serial/create.c index 33ab2b09dbc..6ff6bea61f9 100644 --- a/reactos/drivers/base/serial/create.c +++ b/reactos/drivers/base/serial/create.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS NTAPI diff --git a/reactos/drivers/base/serial/devctrl.c b/reactos/drivers/base/serial/devctrl.c index f1a4193ffb7..379b7ac897d 100644 --- a/reactos/drivers/base/serial/devctrl.c +++ b/reactos/drivers/base/serial/devctrl.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -#define NDEBUG #include "serial.h" #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) @@ -52,7 +51,7 @@ SerialSetBaudRate( { ULONG BaudRate; USHORT divisor; - PUCHAR ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + PUCHAR ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); NTSTATUS Status = STATUS_SUCCESS; if (NewBaudRate == 0) @@ -61,7 +60,7 @@ SerialSetBaudRate( divisor = (USHORT)(BAUD_CLOCK / (CLOCKS_PER_BIT * NewBaudRate)); BaudRate = BAUD_CLOCK / (CLOCKS_PER_BIT * divisor); - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { UCHAR Lcr; @@ -75,7 +74,7 @@ SerialSetBaudRate( /* Switch back to normal registers */ WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } if (NT_SUCCESS(Status)) @@ -141,15 +140,15 @@ SerialSetLineControl( } /* Update current parameters */ - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (!NT_SUCCESS(Status)) return Status; WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); /* Read junk out of RBR */ READ_PORT_UCHAR(SER_RBR(ComPortBase)); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) DeviceExtension->SerialLineControl = *NewSettings; @@ -295,7 +294,7 @@ SerialDeviceControl( LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; LengthOut = Stack->Parameters.DeviceIoControl.OutputBufferLength; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); IoControlCode = Stack->Parameters.DeviceIoControl.IoControlCode; SerialGetUserBuffers(Irp, IoControlCode, &BufferIn, &BufferOut); @@ -318,12 +317,12 @@ SerialDeviceControl( DPRINT("IOCTL_SERIAL_CLR_DTR\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { DeviceExtension->MCR &= ~SR_MCR_DTR; WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } break; } @@ -332,12 +331,12 @@ SerialDeviceControl( DPRINT("IOCTL_SERIAL_CLR_RTS\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use RTS, return STATUS_INVALID_PARAMETER */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { DeviceExtension->MCR &= ~SR_MCR_RTS; WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } break; } @@ -557,11 +556,11 @@ SerialDeviceControl( if (DeviceExtension->UartType >= Uart16550A) { /* Clear also Uart FIFO */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { WRITE_PORT_UCHAR(SER_FCR(ComPortBase), SR_FCR_CLEAR_RCVR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); @@ -574,11 +573,11 @@ SerialDeviceControl( if (DeviceExtension->UartType >= Uart16550A) { /* Clear also Uart FIFO */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { WRITE_PORT_UCHAR(SER_FCR(ComPortBase), SR_FCR_CLEAR_XMIT); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); @@ -634,12 +633,12 @@ SerialDeviceControl( DPRINT("IOCTL_SERIAL_SET_DTR\n"); if (!(DeviceExtension->MCR & SR_MCR_DTR)) { - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { DeviceExtension->MCR |= SR_MCR_DTR; WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } else @@ -653,11 +652,11 @@ SerialDeviceControl( Status = STATUS_INVALID_PARAMETER; else { - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { WRITE_PORT_UCHAR(SER_FCR(ComPortBase), (UCHAR)((*(PULONG)BufferIn) & 0xff)); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } break; @@ -688,13 +687,13 @@ SerialDeviceControl( Status = STATUS_INVALID_PARAMETER; else { - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { pMCR = (PULONG)BufferIn; DeviceExtension->MCR = (UCHAR)(*pMCR & 0xff); WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } break; @@ -732,12 +731,12 @@ SerialDeviceControl( DPRINT("IOCTL_SERIAL_SET_RTS\n"); if (!(DeviceExtension->MCR & SR_MCR_RTS)) { - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { DeviceExtension->MCR |= SR_MCR_RTS; WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } else diff --git a/reactos/drivers/base/serial/info.c b/reactos/drivers/base/serial/info.c index 8a86bf67dd0..81623192238 100644 --- a/reactos/drivers/base/serial/info.c +++ b/reactos/drivers/base/serial/info.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS NTAPI diff --git a/reactos/drivers/base/serial/legacy.c b/reactos/drivers/base/serial/legacy.c index 9751568d322..7e1fdf2e604 100644 --- a/reactos/drivers/base/serial/legacy.c +++ b/reactos/drivers/base/serial/legacy.c @@ -8,7 +8,6 @@ * Mark Junker (mjscod@gmx.de) */ -#define NDEBUG #include "serial.h" UART_TYPE diff --git a/reactos/drivers/base/serial/misc.c b/reactos/drivers/base/serial/misc.c index 69c28d537b1..9627a576c0f 100644 --- a/reactos/drivers/base/serial/misc.c +++ b/reactos/drivers/base/serial/misc.c @@ -8,9 +8,10 @@ */ /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ -#define NDEBUG #include "serial.h" +static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; + static NTSTATUS NTAPI ForwardIrpAndWaitCompletion( IN PDEVICE_OBJECT DeviceObject, @@ -36,7 +37,7 @@ ForwardIrpAndWait( KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); + DPRINT("Calling lower device %p\n", LowerDevice); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); @@ -78,7 +79,7 @@ SerialReceiveByte( NTSTATUS Status; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)pDeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); while (READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DATA_RECEIVED) @@ -115,7 +116,7 @@ SerialSendByte( NTSTATUS Status; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)pDeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql); while (!IsCircularBufferEmpty(&DeviceExtension->OutputBuffer) @@ -164,7 +165,7 @@ SerialInterruptService( DeviceObject = (PDEVICE_OBJECT)ServiceContext; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); Iir = READ_PORT_UCHAR(SER_IIR(ComPortBase)); if (Iir == 0xff) diff --git a/reactos/drivers/base/serial/pnp.c b/reactos/drivers/base/serial/pnp.c index 949bbb5ebfd..621c04874b3 100644 --- a/reactos/drivers/base/serial/pnp.c +++ b/reactos/drivers/base/serial/pnp.c @@ -9,7 +9,6 @@ /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ #define INITGUID -#define NDEBUG #include "serial.h" NTSTATUS NTAPI @@ -216,7 +215,7 @@ SerialPnpStartDevice( return STATUS_INSUFFICIENT_RESOURCES; if (!Dirql) return STATUS_INSUFFICIENT_RESOURCES; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); /* Test if we are trying to start the serial port used for debugging */ DPRINT1("KdComPort: %p\n", KdComPortInUse); diff --git a/reactos/drivers/base/serial/power.c b/reactos/drivers/base/serial/power.c index fcfac0b83a1..63944db8073 100644 --- a/reactos/drivers/base/serial/power.c +++ b/reactos/drivers/base/serial/power.c @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS NTAPI diff --git a/reactos/drivers/base/serial/rw.c b/reactos/drivers/base/serial/rw.c index dedce38c3e8..ecee13d5193 100644 --- a/reactos/drivers/base/serial/rw.c +++ b/reactos/drivers/base/serial/rw.c @@ -7,9 +7,10 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -#define NDEBUG #include "serial.h" +static IO_WORKITEM_ROUTINE SerialReadWorkItem; + static PVOID SerialGetUserBuffer(IN PIRP Irp) { @@ -40,7 +41,7 @@ ReadBytes( ASSERT(WorkItemData); DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length; Buffer = SerialGetUserBuffer(Irp); @@ -228,7 +229,7 @@ SerialRead( /* insufficient resources, we can't pend the Irp */ CHECKPOINT; - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(WorkItemData, SERIAL_TAG); @@ -237,7 +238,7 @@ SerialRead( ReadBytes(DeviceObject, Irp, WorkItemData); Status = Irp->IoStatus.Status; - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); ByeBye: Irp->IoStatus.Status = Status; @@ -268,7 +269,7 @@ SerialWrite( Length = Stack->Parameters.Write.Length; Buffer = SerialGetUserBuffer(Irp); DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); if (Stack->Parameters.Write.ByteOffset.QuadPart != 0 || Buffer == NULL) { @@ -276,7 +277,7 @@ SerialWrite( goto ByeBye; } - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -304,7 +305,7 @@ SerialWrite( Information++; } KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); /* send bytes */ SerialSendByte(NULL, DeviceExtension, NULL, NULL); diff --git a/reactos/drivers/base/serial/serial.c b/reactos/drivers/base/serial/serial.c index b9ec2b7d909..b460f70af76 100644 --- a/reactos/drivers/base/serial/serial.c +++ b/reactos/drivers/base/serial/serial.c @@ -7,9 +7,11 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -//#define NDEBUG #include "serial.h" +static DRIVER_UNLOAD DriverUnload; +DRIVER_INITIALIZE DriverEntry; + static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) { diff --git a/reactos/drivers/base/serial/serial.h b/reactos/drivers/base/serial/serial.h index c1386ed391f..170cacec8d9 100644 --- a/reactos/drivers/base/serial/serial.h +++ b/reactos/drivers/base/serial/serial.h @@ -227,31 +227,19 @@ IncreaseCircularBufferSize( /************************************ cleanup.c */ -NTSTATUS NTAPI -SerialCleanup( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialCleanup; /************************************ close.c */ -NTSTATUS NTAPI -SerialClose( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialClose; /************************************ create.c */ -NTSTATUS NTAPI -SerialCreate( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialCreate; /************************************ devctrl.c */ -NTSTATUS NTAPI -SerialDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialDeviceControl; NTSTATUS NTAPI SerialSetBaudRate( @@ -265,10 +253,7 @@ SerialSetLineControl( /************************************ info.c */ -NTSTATUS NTAPI -SerialQueryInformation( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialQueryInformation; /************************************ legacy.c */ @@ -283,10 +268,7 @@ ForwardIrpAndWait( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS NTAPI -ForwardIrpAndForget( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH ForwardIrpAndForget; VOID NTAPI SerialReceiveByte( @@ -309,10 +291,7 @@ SerialCompleteIrp( IN PVOID pIrp, // real type PIRP IN PVOID Unused); -BOOLEAN NTAPI -SerialInterruptService( - IN PKINTERRUPT Interrupt, - IN OUT PVOID ServiceContext); +KSERVICE_ROUTINE SerialInterruptService; /************************************ pnp.c */ @@ -324,10 +303,7 @@ SerialAddDeviceInternal( IN PULONG pComPortNumber OPTIONAL, OUT PDEVICE_OBJECT* pFdo OPTIONAL); -NTSTATUS NTAPI -SerialAddDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT Pdo); +DRIVER_ADD_DEVICE SerialAddDevice; NTSTATUS NTAPI SerialPnpStartDevice( @@ -335,26 +311,13 @@ SerialPnpStartDevice( IN PCM_RESOURCE_LIST ResourceList, IN PCM_RESOURCE_LIST ResourceListTranslated); -NTSTATUS NTAPI -SerialPnp( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialPnp; /************************************ power.c */ -NTSTATUS NTAPI -SerialPower( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialPower; /************************************ rw.c */ -NTSTATUS NTAPI -SerialRead( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS NTAPI -SerialWrite( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialRead; +DRIVER_DISPATCH SerialWrite; diff --git a/reactos/drivers/base/serial/serial.rbuild b/reactos/drivers/base/serial/serial.rbuild index 24b3b933e6c..e4c465938d1 100644 --- a/reactos/drivers/base/serial/serial.rbuild +++ b/reactos/drivers/base/serial/serial.rbuild @@ -1,5 +1,6 @@ + ntoskrnl hal circularbuffer.c