[ros-diffs] [hpoussin] 14495: Fix file properties

Fix file properties
Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c
Modified: trunk/reactos/drivers/dd/serial/legacy.c
  _____  

Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c
--- trunk/reactos/drivers/dd/serial/circularbuffer.c	2005-04-04
23:12:21 UTC (rev 14494)
+++ trunk/reactos/drivers/dd/serial/circularbuffer.c	2005-04-04
23:17:28 UTC (rev 14495)
@@ -1,97 +1,97 @@

-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            drivers/dd/serial/circularbuffer.c
- * PURPOSE:         Operations on a circular buffer
- * 
- * PROGRAMMERS:     HervÚ Poussineau (poussine(a)freesurf.fr)
- */
-
-#define NDEBUG
-#include "serial.h"
-
-NTSTATUS
-InitializeCircularBuffer(
-	IN PCIRCULAR_BUFFER pBuffer,
-	IN ULONG BufferSize)
-{
-	DPRINT("Serial: InitializeCircularBuffer(pBuffer %p, BufferSize
%lu)\n", pBuffer, BufferSize);
-	pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool,
BufferSize * sizeof(UCHAR), SERIAL_TAG);
-	if (!pBuffer->Buffer)
-		return STATUS_INSUFFICIENT_RESOURCES;
-	pBuffer->Length = BufferSize;
-	pBuffer->ReadPosition = pBuffer->WritePosition = 0;
-	return STATUS_SUCCESS;
-}
-
-NTSTATUS
-FreeCircularBuffer(
-	IN PCIRCULAR_BUFFER pBuffer)
-{
-	DPRINT("Serial: FreeCircularBuffer(pBuffer %p)\n", pBuffer);
-	ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG);
-	return STATUS_SUCCESS;
-}
-
-BOOLEAN
-IsCircularBufferEmpty(
-	IN PCIRCULAR_BUFFER pBuffer)
-{
-	DPRINT("Serial: IsCircularBufferEmpty(pBuffer %p)\n", pBuffer);
-	return (pBuffer->ReadPosition == pBuffer->WritePosition);
-}
-
-NTSTATUS
-PushCircularBufferEntry(
-	IN PCIRCULAR_BUFFER pBuffer,
-	IN UCHAR Entry)
-{
-	ULONG NextPosition;
-	DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry
0x%x)\n", pBuffer, Entry);
-	ASSERT(pBuffer->Length);
-	NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length;
-	if (NextPosition == pBuffer->ReadPosition)
-		return STATUS_BUFFER_TOO_SMALL;
-	pBuffer->Buffer[pBuffer->WritePosition] = Entry;
-	pBuffer->WritePosition = NextPosition;
-	return STATUS_SUCCESS;
-}
-
-NTSTATUS
-PopCircularBufferEntry(
-	IN PCIRCULAR_BUFFER pBuffer,
-	OUT PUCHAR Entry)
-{
-	DPRINT("Serial: PopCircularBufferEntry(pBuffer %p)\n", pBuffer);
-	ASSERT(pBuffer->Length);
-	if (IsCircularBufferEmpty(pBuffer))
-		return STATUS_ARRAY_BOUNDS_EXCEEDED;
-	*Entry = pBuffer->Buffer[pBuffer->ReadPosition];
-	pBuffer->ReadPosition = (pBuffer->ReadPosition + 1) %
pBuffer->Length;
-	return STATUS_SUCCESS;
-}
-
-NTSTATUS
-IncreaseCircularBufferSize(
-	IN PCIRCULAR_BUFFER pBuffer,
-	IN ULONG NewBufferSize)
-{
-	PUCHAR NewBuffer;
-	
-	DPRINT("Serial: IncreaseCircularBufferSize(pBuffer %p,
NewBufferSize %lu)\n", pBuffer, NewBufferSize);
-	ASSERT(pBuffer->Length);
-	if (pBuffer->Length > NewBufferSize)
-		return STATUS_INVALID_PARAMETER;
-	else if (pBuffer->Length == NewBufferSize)
-		return STATUS_SUCCESS;
-	
-	NewBuffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool,
NewBufferSize * sizeof(UCHAR), SERIAL_TAG);
-	if (!NewBuffer)
-		return STATUS_INSUFFICIENT_RESOURCES;
-	RtlCopyMemory(NewBuffer, pBuffer->Buffer, pBuffer->Length *
sizeof(UCHAR));
-	ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG);
-	pBuffer->Buffer = NewBuffer;
-	pBuffer->Length = NewBufferSize;
-	return STATUS_SUCCESS;
-}
+/* $Id:
+ * 
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            drivers/dd/serial/circularbuffer.c
+ * PURPOSE:         Operations on a circular buffer
+ * 
+ * PROGRAMMERS:     HervÚ Poussineau (poussine(a)freesurf.fr)
+ */
+
+#define NDEBUG
+#include "serial.h"
+
+NTSTATUS
+InitializeCircularBuffer(
+	IN PCIRCULAR_BUFFER pBuffer,
+	IN ULONG BufferSize)
+{
+	DPRINT("Serial: InitializeCircularBuffer(pBuffer %p, BufferSize
%lu)\n", pBuffer, BufferSize);
+	pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool,
BufferSize * sizeof(UCHAR), SERIAL_TAG);
+	if (!pBuffer->Buffer)
+		return STATUS_INSUFFICIENT_RESOURCES;
+	pBuffer->Length = BufferSize;
+	pBuffer->ReadPosition = pBuffer->WritePosition = 0;
+	return STATUS_SUCCESS;
+}
+
+NTSTATUS
+FreeCircularBuffer(
+	IN PCIRCULAR_BUFFER pBuffer)
+{
+	DPRINT("Serial: FreeCircularBuffer(pBuffer %p)\n", pBuffer);
+	ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG);
+	return STATUS_SUCCESS;
+}
+
+BOOLEAN
+IsCircularBufferEmpty(
+	IN PCIRCULAR_BUFFER pBuffer)
+{
+	DPRINT("Serial: IsCircularBufferEmpty(pBuffer %p)\n", pBuffer);
+	return (pBuffer->ReadPosition == pBuffer->WritePosition);
+}
+
+NTSTATUS
+PushCircularBufferEntry(
+	IN PCIRCULAR_BUFFER pBuffer,
+	IN UCHAR Entry)
+{
+	ULONG NextPosition;
+	DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry
0x%x)\n", pBuffer, Entry);
+	ASSERT(pBuffer->Length);
+	NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length;
+	if (NextPosition == pBuffer->ReadPosition)
+		return STATUS_BUFFER_TOO_SMALL;
+	pBuffer->Buffer[pBuffer->WritePosition] = Entry;
+	pBuffer->WritePosition = NextPosition;
+	return STATUS_SUCCESS;
+}
+
+NTSTATUS
+PopCircularBufferEntry(
+	IN PCIRCULAR_BUFFER pBuffer,
+	OUT PUCHAR Entry)
+{
+	DPRINT("Serial: PopCircularBufferEntry(pBuffer %p)\n", pBuffer);
+	ASSERT(pBuffer->Length);
+	if (IsCircularBufferEmpty(pBuffer))
+		return STATUS_ARRAY_BOUNDS_EXCEEDED;
+	*Entry = pBuffer->Buffer[pBuffer->ReadPosition];
+	pBuffer->ReadPosition = (pBuffer->ReadPosition + 1) %
pBuffer->Length;
+	return STATUS_SUCCESS;
+}
+
+NTSTATUS
+IncreaseCircularBufferSize(
+	IN PCIRCULAR_BUFFER pBuffer,
+	IN ULONG NewBufferSize)
+{
+	PUCHAR NewBuffer;
+	
+	DPRINT("Serial: IncreaseCircularBufferSize(pBuffer %p,
NewBufferSize %lu)\n", pBuffer, NewBufferSize);
+	ASSERT(pBuffer->Length);
+	if (pBuffer->Length > NewBufferSize)
+		return STATUS_INVALID_PARAMETER;
+	else if (pBuffer->Length == NewBufferSize)
+		return STATUS_SUCCESS;
+	
+	NewBuffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool,
NewBufferSize * sizeof(UCHAR), SERIAL_TAG);
+	if (!NewBuffer)
+		return STATUS_INSUFFICIENT_RESOURCES;
+	RtlCopyMemory(NewBuffer, pBuffer->Buffer, pBuffer->Length *
sizeof(UCHAR));
+	ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG);
+	pBuffer->Buffer = NewBuffer;
+	pBuffer->Length = NewBufferSize;
+	return STATUS_SUCCESS;
+}
Property changes on: trunk/reactos/drivers/dd/serial/circularbuffer.c
___________________________________________________________________
Name: svn:keywords
   + author date id revision
Name: svn:eol-style
   + native
Property changes on: trunk/reactos/drivers/dd/serial/cleanup.c
___________________________________________________________________
Name: svn:keywords
   + author date id revision
Property changes on: trunk/reactos/drivers/dd/serial/close.c
___________________________________________________________________
Name: svn:keywords
   + author date id revision
Property changes on: trunk/reactos/drivers/dd/serial/create.c
___________________________________________________________________
Name: cleanup.c
   - close.c
Name: svn:keywords
   + author date id revision
Property changes on: trunk/reactos/drivers/dd/serial/devctrl.c
___________________________________________________________________
Name: cleanup.c
   - close.c
Name: svn:keywords
   + author date id revision
Property changes on: trunk/reactos/drivers/dd/serial/info.c
___________________________________________________________________
Name: cleanup.c
   - close.c
Name: svn:keywords
   + author date id revision
  _____  

Modified: trunk/reactos/drivers/dd/serial/legacy.c
--- trunk/reactos/drivers/dd/serial/legacy.c	2005-04-04 23:12:21 UTC
(rev 14494)
+++ trunk/reactos/drivers/dd/serial/legacy.c	2005-04-04 23:17:28 UTC
(rev 14495)
@@ -1,194 +1,194 @@

-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            drivers/bus/serial/legacy.c
- * PURPOSE:         Legacy serial port enumeration
- * 
- * PROGRAMMERS:     HervÚ Poussineau (poussine(a)freesurf.fr)
- *                  Mark Junker (mjscod(a)gmx.de)
- */
-
-#define NDEBUG
-#include "serial.h"
-
-UART_TYPE
-SerialDetectUartType(
-	IN PUCHAR BaseAddress)
-{
-	UCHAR Lcr, TestLcr;
-	UCHAR OldScr, Scr5A, ScrA5;
-	BOOLEAN FifoEnabled;
-	UCHAR NewFifoStatus;
-	
-	Lcr = READ_PORT_UCHAR(SER_LCR(BaseAddress));
-	WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr ^ 0xFF);
-	TestLcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)) ^ 0xFF;
-	WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr);
-	
-	/* Accessing the LCR must work for a usable serial port */
-	if (TestLcr != Lcr)
-		return UartUnknown;
-	
-	/* Ensure that all following accesses are done as required */
-	READ_PORT_UCHAR(SER_RBR(BaseAddress));
-	READ_PORT_UCHAR(SER_IER(BaseAddress));
-	READ_PORT_UCHAR(SER_IIR(BaseAddress));
-	READ_PORT_UCHAR(SER_LCR(BaseAddress));
-	READ_PORT_UCHAR(SER_MCR(BaseAddress));
-	READ_PORT_UCHAR(SER_LSR(BaseAddress));
-	READ_PORT_UCHAR(SER_MSR(BaseAddress));
-	READ_PORT_UCHAR(SER_SCR(BaseAddress));
-	
-	/* Test scratch pad */
-	OldScr = READ_PORT_UCHAR(SER_SCR(BaseAddress));
-	WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0x5A);
-	Scr5A = READ_PORT_UCHAR(SER_SCR(BaseAddress));
-	WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0xA5);
-	ScrA5 = READ_PORT_UCHAR(SER_SCR(BaseAddress));
-	WRITE_PORT_UCHAR(SER_SCR(BaseAddress), OldScr);
-	
-	/* When non-functional, we have a 8250 */
-	if (Scr5A != 0x5A || ScrA5 != 0xA5)
-		return Uart8250;
-	
-	/* Test FIFO type */
-	FifoEnabled = (READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0x80) !=
0;
-	WRITE_PORT_UCHAR(SER_FCR(BaseAddress), SR_FCR_ENABLE_FIFO);
-	NewFifoStatus = READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0xC0;
-	if (!FifoEnabled)
-		WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0);
-	switch (NewFifoStatus)
-	{
-		case 0x00:
-			return Uart16450;
-		case 0x40:
-		case 0x80:
-			/* Not sure about this but the documentation
says that 0x40
-			 * indicates an unusable FIFO but my tests only
worked
-			 * with 0x80 */
-			return Uart16550;
-	}
-	
-	/* FIFO is only functional for 16550A+ */
-	return Uart16550A;
-}
-
-static NTSTATUS
-DetectLegacyDevice(
-	IN PDRIVER_OBJECT DriverObject,
-	IN ULONG ComPortBase,
-	IN ULONG Irq,
-	IN PULONG pComPortNumber OPTIONAL)
-{
-	ULONG ResourceListSize;
-	PCM_RESOURCE_LIST ResourceList;
-	PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor;
-	BOOLEAN ConflictDetected;
-	UART_TYPE UartType;
-	PDEVICE_OBJECT Pdo = NULL;
-	PDEVICE_OBJECT Fdo;
-	KIRQL Dirql;
-	NTSTATUS Status;
-	
-	/* Create resource list */
-	ResourceListSize = sizeof(CM_RESOURCE_LIST) +
sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
-	ResourceList =
(PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize,
SERIAL_TAG);
-	if (!ResourceList)
-		return STATUS_INSUFFICIENT_RESOURCES;
-	ResourceList->Count = 1;
-	ResourceList->List[0].InterfaceType = InterfaceTypeUndefined;
-	ResourceList->List[0].BusNumber = -1; /* unknown */
-	ResourceList->List[0].PartialResourceList.Version = 1;
-	ResourceList->List[0].PartialResourceList.Revision = 1;
-	ResourceList->List[0].PartialResourceList.Count = 2;
-	ResourceDescriptor =
&ResourceList->List[0].PartialResourceList.PartialDescriptors[0];
-	ResourceDescriptor->Type = CmResourceTypePort;
-	ResourceDescriptor->ShareDisposition =
CmResourceShareDriverExclusive;
-	ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO;
-	ResourceDescriptor->u.Port.Start.u.HighPart = 0;
-	ResourceDescriptor->u.Port.Start.u.LowPart = ComPortBase;
-	ResourceDescriptor->u.Port.Length = 8;
-	
-	ResourceDescriptor =
&ResourceList->List[0].PartialResourceList.PartialDescriptors[1];
-	ResourceDescriptor->Type = CmResourceTypeInterrupt;
-	ResourceDescriptor->ShareDisposition = CmResourceShareShared;
-	ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED;
-	ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector(
-		Internal, 0, 0, Irq,
-		&Dirql,
-		&ResourceDescriptor->u.Interrupt.Affinity);
-	ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql;
-	
-	/* Report resource list */
-	Status = IoReportResourceForDetection(
-		DriverObject, ResourceList, ResourceListSize,
-		NULL, NULL, 0,
-		&ConflictDetected);
-	if (Status == STATUS_CONFLICTING_ADDRESSES)
-	{
-		DPRINT("Serial: conflict detected for serial port at
0x%lx (Irq %lu)\n", ComPortBase, Irq);
-		ExFreePoolWithTag(ResourceList, SERIAL_TAG);
-		return STATUS_DEVICE_NOT_CONNECTED;
-	}
-	if (!NT_SUCCESS(Status))
-	{
-		ExFreePoolWithTag(ResourceList, SERIAL_TAG);
-		return Status;
-	}
-	
-	/* Test if port exists */
-	UartType = SerialDetectUartType((PUCHAR)ComPortBase);
-	
-	/* Report device if detected... */
-	if (UartType != UartUnknown)
-	{
-		Status = IoReportDetectedDevice(
-			DriverObject,
-			ResourceList->List[0].InterfaceType,
ResourceList->List[0].BusNumber, -1 /* unknown */,
-			ResourceList, NULL,
-			TRUE,
-			&Pdo);
-		if (NT_SUCCESS(Status))
-		{
-			Status = SerialAddDeviceInternal(DriverObject,
Pdo, UartType, pComPortNumber, &Fdo);
-			if (NT_SUCCESS(Status))
-			{
-				Status = SerialPnpStartDevice(Fdo,
ResourceList);
-			}
-		}
-	}
-	else
-	{
-		/* Release resources */
-		Status = IoReportResourceForDetection(
-			DriverObject, NULL, 0,
-			NULL, NULL, 0,
-			&ConflictDetected);
-		Status = STATUS_DEVICE_NOT_CONNECTED;
-	}
-	ExFreePoolWithTag(ResourceList, SERIAL_TAG);
-	return Status;
-}
-
-NTSTATUS
-DetectLegacyDevices(
-	IN PDRIVER_OBJECT DriverObject)
-{
-	ULONG ComPortBase[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
-	ULONG Irq[] = { 4, 3, 4, 3 };
-	ULONG ComPortNumber[] = { 1, 2, 3, 4 };
-	ULONG i;
-	NTSTATUS Status;
-	NTSTATUS ReturnedStatus = STATUS_SUCCESS;
-	
-	for (i = 0; i < sizeof(ComPortBase)/sizeof(ComPortBase[0]); i++)
-	{
-		Status = DetectLegacyDevice(DriverObject,
ComPortBase[i], Irq[i], &ComPortNumber[i]);
-		if (!NT_SUCCESS(Status) && Status !=
STATUS_DEVICE_NOT_CONNECTED)
-			ReturnedStatus = Status;
-		DPRINT("Serial: Legacy device at 0x%x (IRQ %lu): status
= 0x%08lx\n", ComPortBase[i], Irq[i], Status);
-	}
-	
-	return ReturnedStatus;
-}
+/* $Id:
+ * 
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            drivers/bus/serial/legacy.c
+ * PURPOSE:         Legacy serial port enumeration
+ * 
+ * PROGRAMMERS:     HervÚ Poussineau (poussine(a)freesurf.fr)
+ *                  Mark Junker (mjscod(a)gmx.de)
+ */
+
+#define NDEBUG
+#include "serial.h"
+
+UART_TYPE
+SerialDetectUartType(
+	IN PUCHAR BaseAddress)
+{
+	UCHAR Lcr, TestLcr;
+	UCHAR OldScr, Scr5A, ScrA5;
+	BOOLEAN FifoEnabled;
+	UCHAR NewFifoStatus;
+	
+	Lcr = READ_PORT_UCHAR(SER_LCR(BaseAddress));
+	WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr ^ 0xFF);
+	TestLcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)) ^ 0xFF;
+	WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr);
+	
+	/* Accessing the LCR must work for a usable serial port */
+	if (TestLcr != Lcr)
+		return UartUnknown;
+	
+	/* Ensure that all following accesses are done as required */
+	READ_PORT_UCHAR(SER_RBR(BaseAddress));
+	READ_PORT_UCHAR(SER_IER(BaseAddress));
+	READ_PORT_UCHAR(SER_IIR(BaseAddress));
+	READ_PORT_UCHAR(SER_LCR(BaseAddress));
+	READ_PORT_UCHAR(SER_MCR(BaseAddress));
+	READ_PORT_UCHAR(SER_LSR(BaseAddress));
+	READ_PORT_UCHAR(SER_MSR(BaseAddress));
+	READ_PORT_UCHAR(SER_SCR(BaseAddress));
+	
+	/* Test scratch pad */
+	OldScr = READ_PORT_UCHAR(SER_SCR(BaseAddress));
+	WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0x5A);
+	Scr5A = READ_PORT_UCHAR(SER_SCR(BaseAddress));
+	WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0xA5);
+	ScrA5 = READ_PORT_UCHAR(SER_SCR(BaseAddress));
+	WRITE_PORT_UCHAR(SER_SCR(BaseAddress), OldScr);
+	
+	/* When non-functional, we have a 8250 */
+	if (Scr5A != 0x5A || ScrA5 != 0xA5)
+		return Uart8250;
+	
+	/* Test FIFO type */
+	FifoEnabled = (READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0x80) !=
0;
+	WRITE_PORT_UCHAR(SER_FCR(BaseAddress), SR_FCR_ENABLE_FIFO);
+	NewFifoStatus = READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0xC0;
+	if (!FifoEnabled)
+		WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0);
+	switch (NewFifoStatus)
+	{
+		case 0x00:
+			return Uart16450;
+		case 0x40:
+		case 0x80:
+			/* Not sure about this but the documentation
says that 0x40
+			 * indicates an unusable FIFO but my tests only
worked
+			 * with 0x80 */
+			return Uart16550;
+	}
+	
+	/* FIFO is only functional for 16550A+ */
+	return Uart16550A;
+}
+
+static NTSTATUS
+DetectLegacyDevice(
+	IN PDRIVER_OBJECT DriverObject,
+	IN ULONG ComPortBase,
+	IN ULONG Irq,
+	IN PULONG pComPortNumber OPTIONAL)
+{
+	ULONG ResourceListSize;
+	PCM_RESOURCE_LIST ResourceList;
+	PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor;
+	BOOLEAN ConflictDetected;
+	UART_TYPE UartType;
+	PDEVICE_OBJECT Pdo = NULL;
+	PDEVICE_OBJECT Fdo;
+	KIRQL Dirql;
+	NTSTATUS Status;
+	
+	/* Create resource list */
+	ResourceListSize = sizeof(CM_RESOURCE_LIST) +
sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
+	ResourceList =
(PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize,
SERIAL_TAG);
+	if (!ResourceList)
+		return STATUS_INSUFFICIENT_RESOURCES;
+	ResourceList->Count = 1;
+	ResourceList->List[0].InterfaceType = InterfaceTypeUndefined;
+	ResourceList->List[0].BusNumber = -1; /* unknown */
+	ResourceList->List[0].PartialResourceList.Version = 1;
+	ResourceList->List[0].PartialResourceList.Revision = 1;
+	ResourceList->List[0].PartialResourceList.Count = 2;
+	ResourceDescriptor =
&ResourceList->List[0].PartialResourceList.PartialDescriptors[0];
+	ResourceDescriptor->Type = CmResourceTypePort;
+	ResourceDescriptor->ShareDisposition =
CmResourceShareDriverExclusive;
+	ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO;
+	ResourceDescriptor->u.Port.Start.u.HighPart = 0;
+	ResourceDescriptor->u.Port.Start.u.LowPart = ComPortBase;
+	ResourceDescriptor->u.Port.Length = 8;
+	
+	ResourceDescriptor =
&ResourceList->List[0].PartialResourceList.PartialDescriptors[1];
+	ResourceDescriptor->Type = CmResourceTypeInterrupt;
+	ResourceDescriptor->ShareDisposition = CmResourceShareShared;
+	ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED;
+	ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector(
+		Internal, 0, 0, Irq,
+		&Dirql,
+		&ResourceDescriptor->u.Interrupt.Affinity);
+	ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql;
+	
+	/* Report resource list */
+	Status = IoReportResourceForDetection(
+		DriverObject, ResourceList, ResourceListSize,
+		NULL, NULL, 0,
+		&ConflictDetected);
+	if (Status == STATUS_CONFLICTING_ADDRESSES)
+	{
+		DPRINT("Serial: conflict detected for serial port at
0x%lx (Irq %lu)\n", ComPortBase, Irq);
+		ExFreePoolWithTag(ResourceList, SERIAL_TAG);
+		return STATUS_DEVICE_NOT_CONNECTED;
+	}
+	if (!NT_SUCCESS(Status))
+	{
+		ExFreePoolWithTag(ResourceList, SERIAL_TAG);
+		return Status;
+	}
+	
+	/* Test if port exists */
+	UartType = SerialDetectUartType((PUCHAR)ComPortBase);
+	
+	/* Report device if detected... */
+	if (UartType != UartUnknown)
+	{
+		Status = IoReportDetectedDevice(
+			DriverObject,
+			ResourceList->List[0].InterfaceType,
ResourceList->List[0].BusNumber, -1 /* unknown */,
+			ResourceList, NULL,
+			TRUE,
+			&Pdo);
+		if (NT_SUCCESS(Status))
+		{
+			Status = SerialAddDeviceInternal(DriverObject,
Pdo, UartType, pComPortNumber, &Fdo);
+			if (NT_SUCCESS(Status))
+			{
+				Status = SerialPnpStartDevice(Fdo,
ResourceList);
+			}
+		}
+	}
+	else
+	{
+		/* Release resources */
+		Status = IoReportResourceForDetection(
+			DriverObject, NULL, 0,
+			NULL, NULL, 0,
+			&ConflictDetected);
+		Status = STATUS_DEVICE_NOT_CONNECTED;
+	}
+	ExFreePoolWithTag(ResourceList, SERIAL_TAG);
+	return Status;
+}
+
+NTSTATUS
+DetectLegacyDevices(
+	IN PDRIVER_OBJECT DriverObject)
+{
+	ULONG ComPortBase[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
+	ULONG Irq[] = { 4, 3, 4, 3 };
+	ULONG ComPortNumber[] = { 1, 2, 3, 4 };
+	ULONG i;
+	NTSTATUS Status;
+	NTSTATUS ReturnedStatus = STATUS_SUCCESS;
+	
+	for (i = 0; i < sizeof(ComPortBase)/sizeof(ComPortBase[0]); i++)
+	{
+		Status = DetectLegacyDevice(DriverObject,
ComPortBase[i], Irq[i], &ComPortNumber[i]);
+		if (!NT_SUCCESS(Status) && Status !=
STATUS_DEVICE_NOT_CONNECTED)
+			ReturnedStatus = Status;
+		DPRINT("Serial: Legacy device at 0x%x (IRQ %lu): status
= 0x%08lx\n", ComPortBase[i], Irq[i], Status);
+	}
+	
+	return ReturnedStatus;
+}
Property changes on: trunk/reactos/drivers/dd/serial/legacy.c
___________________________________________________________________
Name: svn:keywords
   + author date id revision
Name: svn:eol-style
   + native
Property changes on: trunk/reactos/drivers/dd/serial/makefile
___________________________________________________________________
Name: cleanup.c
   - close.c
Property changes on: trunk/reactos/drivers/dd/serial/misc.c
___________________________________________________________________
Name: cleanup.c
   - close.c
Name: svn:keywords
   + author date id revision
Property changes on: trunk/reactos/drivers/dd/serial/pnp.c
___________________________________________________________________
Name: cleanup.c
   - close.c
Name: svn:keywords
   + author date id revision
Property changes on: trunk/reactos/drivers/dd/serial/power.c
___________________________________________________________________
Name: cleanup.c
   - close.c
Name: svn:keywords
   + author date id revision
Property changes on: trunk/reactos/drivers/dd/serial/rw.c
___________________________________________________________________
Name: cleanup.c
   - close.c
Name: svn:keywords
   + author date id revision
Property changes on: trunk/reactos/drivers/dd/serial/serial.c
___________________________________________________________________
Name: cleanup.c
   - close.c
Property changes on: trunk/reactos/drivers/dd/serial/serial.h
___________________________________________________________________
Name: cleanup.c
   - close.c
Name: svn:keywords
   + author date id revision
Property changes on: trunk/reactos/drivers/dd/serial/serial.rc
___________________________________________________________________
Name: cleanup.c
   - close.c