From 74346861b0271f5ec851821d5970fa1693e69ef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Thu, 7 Jul 2005 23:10:35 +0000 Subject: [PATCH] Minimize differences between GCC and MSVC in header file Don't define SR_MSR_DSR as it already exists under the name SERIAL_DSR_STATE Remove $Id: tags svn path=/trunk/; revision=16501 --- reactos/drivers/bus/serenum/detect.c | 9 +++-- reactos/drivers/bus/serenum/fdo.c | 3 +- reactos/drivers/bus/serenum/misc.c | 3 +- reactos/drivers/bus/serenum/pdo.c | 13 ++++--- reactos/drivers/bus/serenum/serenum.c | 3 +- reactos/drivers/bus/serenum/serenum.h | 49 +++++++++++---------------- 6 files changed, 33 insertions(+), 47 deletions(-) diff --git a/reactos/drivers/bus/serenum/detect.c b/reactos/drivers/bus/serenum/detect.c index ef8810d05c9..ca64d2c45f5 100644 --- a/reactos/drivers/bus/serenum/detect.c +++ b/reactos/drivers/bus/serenum/detect.c @@ -1,5 +1,4 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Serial enumerator driver * FILE: drivers/bus/serenum/detect.c @@ -285,7 +284,7 @@ SerenumDetectPnpDevice( Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, NULL, 0, &Msr, &Size); if (!NT_SUCCESS(Status)) goto ByeBye; - if ((Msr & SR_MSR_DSR) == 0) goto SerenumDisconnectIdle; + if ((Msr & SERIAL_DSR_STATE) == 0) goto SerenumDisconnectIdle; /* 2. COM port setup, 1st phase */ CHECKPOINT; @@ -356,7 +355,7 @@ SerenumDetectPnpDevice( Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, NULL, 0, &Msr, &Size); if (!NT_SUCCESS(Status)) goto ByeBye; - if ((Msr & SR_MSR_DSR) == 0) goto SerenumVerifyDisconnect; else goto SerenumConnectIdle; + if ((Msr & SERIAL_DSR_STATE) == 0) goto SerenumVerifyDisconnect; else goto SerenumConnectIdle; /* 6. Collect PnP COM device ID */ SerenumCollectPnpComDeviceId: @@ -395,7 +394,7 @@ SerenumCollectPnpComDeviceId: Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, NULL, 0, &Msr, &Size); if (!NT_SUCCESS(Status)) goto ByeBye; - if ((Msr & SR_MSR_DSR) == 0) goto SerenumVerifyDisconnect; + if ((Msr & SERIAL_DSR_STATE) == 0) goto SerenumVerifyDisconnect; /* 7. Verify disconnect */ SerenumVerifyDisconnect: diff --git a/reactos/drivers/bus/serenum/fdo.c b/reactos/drivers/bus/serenum/fdo.c index 98e50e7fd17..501d25ce105 100644 --- a/reactos/drivers/bus/serenum/fdo.c +++ b/reactos/drivers/bus/serenum/fdo.c @@ -1,5 +1,4 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Serial enumerator driver * FILE: drivers/bus/serenum/fdo.c diff --git a/reactos/drivers/bus/serenum/misc.c b/reactos/drivers/bus/serenum/misc.c index 65d4d8df3c9..7528ac1b61a 100644 --- a/reactos/drivers/bus/serenum/misc.c +++ b/reactos/drivers/bus/serenum/misc.c @@ -1,5 +1,4 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Serial enumerator driver * FILE: drivers/dd/serenum/misc.c diff --git a/reactos/drivers/bus/serenum/pdo.c b/reactos/drivers/bus/serenum/pdo.c index 61551699632..d4d76b39126 100644 --- a/reactos/drivers/bus/serenum/pdo.c +++ b/reactos/drivers/bus/serenum/pdo.c @@ -1,5 +1,4 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Serial enumerator driver * FILE: drivers/bus/serenum/pdo.c @@ -283,11 +282,11 @@ SerenumPdoPnp( Status = STATUS_INSUFFICIENT_RESOURCES; else { - BusInfo->BusTypeGuid = GUID_BUS_TYPE_SERENUM; - /* FIXME: real value should be PNPBus, but PNPBus seems to be - * the only value in INTERFACE_TYPE enum that doesn't work... - */ - BusInfo->LegacyBusType = PNPISABus; + memcpy( + &BusInfo->BusTypeGuid, + &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, + sizeof(BusInfo->BusTypeGuid)); + BusInfo->LegacyBusType = PNPBus; /* We're the only serial bus enumerator on the computer */ BusInfo->BusNumber = 0; Information = (ULONG_PTR)BusInfo; diff --git a/reactos/drivers/bus/serenum/serenum.c b/reactos/drivers/bus/serenum/serenum.c index 9911896ea4f..5e5ecc453b8 100644 --- a/reactos/drivers/bus/serenum/serenum.c +++ b/reactos/drivers/bus/serenum/serenum.c @@ -1,5 +1,4 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Serial enumerator driver * FILE: drivers/bus/serenum/serenum.c diff --git a/reactos/drivers/bus/serenum/serenum.h b/reactos/drivers/bus/serenum/serenum.h index cc353815165..010652c5506 100644 --- a/reactos/drivers/bus/serenum/serenum.h +++ b/reactos/drivers/bus/serenum/serenum.h @@ -1,47 +1,38 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial enumerator driver + * FILE: drivers/bus/serenum/serenum.h + * PURPOSE: Serial enumerator driver header + * + * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.com) + */ + +#include +#include +#include + #if defined(__GNUC__) - #include - #include - #include - #include - #include - - #define SR_MSR_DSR 0x20 - - /* FIXME: these prototypes MUST NOT be here! */ - NTSTATUS STDCALL - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); - #elif defined(_MSC_VER) - #include - #include - #include - #include - #define STDCALL #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #define CHECKPOINT1 DbgPrint("(%s:%d)\n") - - NTSTATUS STDCALL - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); - #define DPRINT DPRINT1 #define CHECKPOINT CHECKPOINT1 - - #define SR_MSR_DSR 0x20 #else #error Unknown compiler! #endif #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +/* FIXME: I don't know why it is not defined anywhere... */ +NTSTATUS STDCALL +IoAttachDeviceToDeviceStackSafe( + IN PDEVICE_OBJECT SourceDevice, + IN PDEVICE_OBJECT TargetDevice, + OUT PDEVICE_OBJECT *AttachedToDeviceObject); + typedef enum { dsStopped,