Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[hpoussin] 14512: Add serial port enumerator driver:

by hpoussin＠svn.reactos.com

Add serial port enumerator driver: - Enumerate legacy mice - Should also detect PnP serial devices even if they are not yet reported It is implemented as an upper filter for serial port driver (serial.sys) Add corresponding registry entries Modified: trunk/reactos/Makefile Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/drivers/bus/Makefile Added: trunk/reactos/drivers/bus/serenum/ Added: trunk/reactos/drivers/bus/serenum/detect.c Added: trunk/reactos/drivers/bus/serenum/fdo.c Added: trunk/reactos/drivers/bus/serenum/makefile Added: trunk/reactos/drivers/bus/serenum/misc.c Added: trunk/reactos/drivers/bus/serenum/pdo.c Added: trunk/reactos/drivers/bus/serenum/serenum.c Added: trunk/reactos/drivers/bus/serenum/serenum.h Added: trunk/reactos/drivers/bus/serenum/serenum.rc _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-04-05 18:59:56 UTC (rev 14511) +++ trunk/reactos/Makefile 2005-04-05 19:04:07 UTC (rev 14512) @@ -34,8 +34,8 @@ HALS = halx86/up halx86/mp # Bus drivers -# acpi isapnp pci -BUS = acpi isapnp pci +# acpi isapnp pci serenum +BUS = acpi isapnp pci serenum # Filesystem libraries # vfatlib _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-04-05 18:59:56 UTC (rev 14511) +++ trunk/reactos/bootdata/hivesys.inf 2005-04-05 19:04:07 UTC (rev 14512) @@ -469,6 +469,19 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Start",0x00010001,0x0 0000001 HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Type",0x00010001,0x00 000001 +; Serial port enumerator +HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ErrorControl",0x00010 001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Group",0x00000000,"PN P Filter" +HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ImagePath",0x00020000 ,"system32\drivers\serenum.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Start",0x00010001,0x0 0000003 +HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Type",0x00010001,0x00 000001 +;hard coded values +HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","0",0x00000000,"A CPI\PNP0501" +HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","Count",0x0001000 1,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","NextInstance",0x 00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","UpperFilters",0x00 010000,"serenum" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","UpperFilters",0x00 010000,"serenum" + ; SB16 driver HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Group",0x00000000,"Bas e" HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ServiceType",0x0001000 1,0x00000001 _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-04-05 18:59:56 UTC (rev 14511) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-04-05 19:04:07 UTC (rev 14512) @@ -29,6 +29,7 @@ drivers\bus\acpi\acpi.sys 2 drivers\bus\isapnp\isapnp.sys 2 drivers\bus\pci\pci.sys 2 +drivers\bus\serenum\serenum.sys 2 drivers\dd\beep\beep.sys 2 drivers\dd\bootvid\bootvid.sys 2 drivers\dd\null\null.sys 2 _____ Modified: trunk/reactos/drivers/bus/Makefile --- trunk/reactos/drivers/bus/Makefile 2005-04-05 18:59:56 UTC (rev 14511) +++ trunk/reactos/drivers/bus/Makefile 2005-04-05 19:04:07 UTC (rev 14512) @@ -6,7 +6,7 @@ include $(PATH_TO_TOP)/rules.mak -DRIVERS = acpi isapnp pci +DRIVERS = acpi isapnp pci serenum all: $(DRIVERS) _____ Added: trunk/reactos/drivers/bus/serenum/detect.c --- trunk/reactos/drivers/bus/serenum/detect.c 2005-04-05 18:59:56 UTC (rev 14511) +++ trunk/reactos/drivers/bus/serenum/detect.c 2005-04-05 19:04:07 UTC (rev 14512) @@ -0,0 +1,541 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial enumerator driver + * FILE: drivers/bus/serenum/detect.c + * PURPOSE: Detection of serial devices + * + * PROGRAMMERS: Jason Filby (jasonfilby(a)yahoo.com) + * Filip Navara (xnavara(a)volny.cz) + * HervÚ Poussineau (hpoussin(a)reactos.com) + */ + +#define NDEBUG +#include "serenum.h" + +static NTSTATUS +SerenumDeviceIoControl( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG CtlCode, + IN PVOID InputBuffer OPTIONAL, + IN ULONG InputBufferSize, + IN OUT PVOID OutputBuffer OPTIONAL, + IN OUT PULONG OutputBufferSize) +{ + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + + KeInitializeEvent (&Event, NotificationEvent, FALSE); + + Irp = IoBuildDeviceIoControlRequest(CtlCode, + DeviceObject, + InputBuffer, + InputBufferSize, + OutputBuffer, + (OutputBufferSize) ? *OutputBufferSize : 0, + FALSE, + &Event, + &IoStatus); + if (Irp == NULL) + { + DPRINT("Serenum: IoBuildDeviceIoControlRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoCallDriver(DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + DPRINT("Serenum: Operation pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + if (OutputBufferSize) + { + *OutputBufferSize = IoStatus.Information; + } + + return Status; +} + +static NTSTATUS +ReadBytes( + IN PDEVICE_OBJECT LowerDevice, + OUT PUCHAR Buffer, + IN ULONG BufferSize, + OUT PULONG FilledBytes) +{ + PIRP Irp; + IO_STATUS_BLOCK ioStatus; + KEVENT event; + NTSTATUS Status; + + KeInitializeEvent(&event, NotificationEvent, FALSE); + Irp = IoBuildSynchronousFsdRequest( + IRP_MJ_READ, + LowerDevice, + Buffer, BufferSize, + 0, + &event, + &ioStatus); + if (!Irp) + return FALSE; + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL); + Status = ioStatus.Status; + } + DPRINT("Serenum: bytes received: %lu/%lu\n", + ioStatus.Information, BufferSize); + *FilledBytes = ioStatus.Information; + return Status; +} + +static NTSTATUS +ReportDetectedDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PUNICODE_STRING DeviceDescription, + IN PUNICODE_STRING DeviceId, + IN PUNICODE_STRING HardwareIds, + IN PUNICODE_STRING CompatibleIds) +{ + PDEVICE_OBJECT Pdo = NULL; + PPDO_DEVICE_EXTENSION PdoDeviceExtension; + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + NTSTATUS Status; + + DPRINT("Serenum: SerenumReportDetectedDevice() called with %wZ (%wZ) detected\n", DeviceId, DeviceDescription); + + Status = IoCreateDevice( + DeviceObject->DriverObject, + sizeof(PDO_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &Pdo); + if (!NT_SUCCESS(Status)) goto ByeBye; + + Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; + Pdo->Flags |= DO_POWER_PAGABLE; + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)Pdo->DeviceExtension; + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + RtlZeroMemory(PdoDeviceExtension, sizeof(PDO_DEVICE_EXTENSION)); + PdoDeviceExtension->Common.IsFDO = FALSE; + Status = SerenumDuplicateUnicodeString(&PdoDeviceExtension->DeviceDescription, DeviceDescription, PagedPool); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = SerenumDuplicateUnicodeString(&PdoDeviceExtension->DeviceId, DeviceId, PagedPool); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = SerenumDuplicateUnicodeString(&PdoDeviceExtension->HardwareIds, HardwareIds, PagedPool); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = SerenumDuplicateUnicodeString(&PdoDeviceExtension->CompatibleIds, CompatibleIds, PagedPool); + if (!NT_SUCCESS(Status)) goto ByeBye; + + /* Device attached to serial port (Pdo) may delegate work to + * serial port stack (Fdo = DeviceObject variable) */ + Pdo->StackSize = DeviceObject->StackSize + 1; + + FdoDeviceExtension->AttachedPdo = Pdo; + PdoDeviceExtension->AttachedFdo = DeviceObject; + + Pdo->Flags |= DO_BUFFERED_IO; + Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; + +ByeBye: + if (Pdo) + { + if (PdoDeviceExtension->DeviceDescription.Buffer) + RtlFreeUnicodeString(&PdoDeviceExtension->DeviceDescription); + if (PdoDeviceExtension->DeviceId.Buffer) + RtlFreeUnicodeString(&PdoDeviceExtension->DeviceId); + if (PdoDeviceExtension->HardwareIds.Buffer) + RtlFreeUnicodeString(&PdoDeviceExtension->HardwareIds); + if (PdoDeviceExtension->CompatibleIds.Buffer) + RtlFreeUnicodeString(&PdoDeviceExtension->CompatibleIds); + IoDeleteDevice(Pdo); + } + return Status; +} + +static BOOLEAN +SerenumIsValidPnpIdString( + IN PUCHAR Buffer, + IN ULONG BufferLength) +{ + /* FIXME: SerenumIsValidPnpIdString not implemented */ + DPRINT1("Serenum: SerenumIsValidPnpIdString() unimplemented\n"); + return STATUS_SUCCESS; +} + +static NTSTATUS +ReportDetectedPnpDevice( + IN PUCHAR Buffer, + IN ULONG BufferLength) +{ + ULONG i; + /* FIXME: ReportDetectedPnpDevice not implemented */ + DPRINT1("Serenum: ReportDetectedPnpDevice() unimplemented\n"); + DPRINT1(""); + for (i = 0; i < BufferLength; i++) + DbgPrint("%c", Buffer[i]); + DbgPrint("\n"); + /* Call ReportDetectedDevice */ + return STATUS_SUCCESS; +} + +#define BEGIN_ID '(' +#define END_ID ')' + +static NTSTATUS +SerenumWait(ULONG milliseconds) +{ + KTIMER Timer; + LARGE_INTEGER DueTime; + + DueTime.QuadPart = -milliseconds * 10; + KeInitializeTimer(&Timer); + KeSetTimer(&Timer, DueTime, NULL); + return KeWaitForSingleObject(&Timer, Executive, KernelMode, FALSE, NULL); +} + +NTSTATUS +SerenumDetectPnpDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PDEVICE_OBJECT LowerDevice) +{ + UCHAR Buffer[256]; + ULONG BaudRate; + ULONG TotalBytesReceived = 0; + ULONG Size; + ULONG Msr, Purge; + ULONG i; + BOOLEAN BufferContainsBeginId, BufferContainsEndId; + SERIAL_LINE_CONTROL Lcr; + SERIAL_TIMEOUTS Timeouts; + SERIALPERF_STATS PerfStats; + NTSTATUS Status; + + /* 1. COM port initialization, check for device enumerate */ + CHECKPOINT; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + SerenumWait(200); + Size = sizeof(Msr); + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, + NULL, 0, &Msr, &Size); + if (!NT_SUCCESS(Status)) return Status; + if ((Msr & SR_MSR_DSR) == 0) goto SerenumDisconnectIdle; + + /* 2. COM port setup, 1st phase */ + CHECKPOINT; + BaudRate = SERIAL_BAUD_1200; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, + &BaudRate, sizeof(BaudRate), NULL, 0); + if (!NT_SUCCESS(Status)) return Status; + Lcr.WordLength = 7; + Lcr.Parity = NO_PARITY; + Lcr.StopBits = STOP_BIT_1; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, + &Lcr, sizeof(Lcr), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + SerenumWait(200); + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + SerenumWait(200); + + /* 3. Wait for response, 1st phase */ + CHECKPOINT; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Timeouts.ReadIntervalTimeout = 0; + Timeouts.ReadTotalTimeoutMultiplier = 0; + Timeouts.ReadTotalTimeoutConstant = 200; + Timeouts.WriteTotalTimeoutMultiplier = Timeouts.WriteTotalTimeoutConstant = 0; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, + &Timeouts, sizeof(Timeouts), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = ReadBytes(LowerDevice, Buffer, sizeof(Buffer), &Size); + if (!NT_SUCCESS(Status)) return Status; + if (Size != 0) goto SerenumCollectPnpComDeviceId; + + /* 4. COM port setup, 2nd phase */ + CHECKPOINT; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Purge = SERIAL_PURGE_RXABORT | SERIAL_PURGE_RXCLEAR; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_PURGE, + &Purge, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + SerenumWait(200); + + /* 5. Wait for response, 2nd phase */ + CHECKPOINT; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = ReadBytes(LowerDevice, Buffer, 1, &TotalBytesReceived); + if (!NT_SUCCESS(Status)) return Status; + if (TotalBytesReceived != 0) goto SerenumCollectPnpComDeviceId; + Size = sizeof(Msr); + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, + NULL, 0, &Msr, &Size); + if (!NT_SUCCESS(Status)) return Status; + if ((Msr & SR_MSR_DSR) == 0) goto SerenumVerifyDisconnect; else goto SerenumConnectIdle; + + /* 6. Collect PnP COM device ID */ +SerenumCollectPnpComDeviceId: + CHECKPOINT; + Timeouts.ReadIntervalTimeout = 200; + Timeouts.ReadTotalTimeoutMultiplier = 0; + Timeouts.ReadTotalTimeoutConstant = 2200; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, + &Timeouts, sizeof(Timeouts), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = ReadBytes(LowerDevice, &Buffer[TotalBytesReceived], sizeof(Buffer) - TotalBytesReceived, &Size); + if (!NT_SUCCESS(Status)) return Status; + TotalBytesReceived += Size; + Size = sizeof(PerfStats); + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_STATS, + NULL, 0, &PerfStats, &Size); + if (!NT_SUCCESS(Status)) return Status; + if (PerfStats.FrameErrorCount + PerfStats.ParityErrorCount != 0) goto SerenumConnectIdle; + BufferContainsBeginId = BufferContainsEndId = FALSE; + for (i = 0; i < TotalBytesReceived; i++) + { + if (Buffer[i] == BEGIN_ID) BufferContainsBeginId = TRUE; + if (Buffer[i] == END_ID) BufferContainsEndId = TRUE; + } + if (TotalBytesReceived == 1 || BufferContainsEndId) + { + if (SerenumIsValidPnpIdString(Buffer, TotalBytesReceived)) + return ReportDetectedPnpDevice(Buffer, TotalBytesReceived); + goto SerenumConnectIdle; + } + if (!BufferContainsBeginId) goto SerenumConnectIdle; + if (!BufferContainsEndId) goto SerenumConnectIdle; + Size = sizeof(Msr); + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, + NULL, 0, &Msr, &Size); + if (!NT_SUCCESS(Status)) return Status; + if ((Msr & SR_MSR_DSR) == 0) goto SerenumVerifyDisconnect; + + /* 7. Verify disconnect */ +SerenumVerifyDisconnect: + CHECKPOINT; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + SerenumWait(5000); + goto SerenumDisconnectIdle; + + /* 8. Connect idle */ +SerenumConnectIdle: + CHECKPOINT; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + BaudRate = SERIAL_BAUD_300; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, + &BaudRate, sizeof(BaudRate), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Lcr.WordLength = 7; + Lcr.Parity = NO_PARITY; + Lcr.StopBits = STOP_BIT_1; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, + &Lcr, sizeof(Lcr), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + if (TotalBytesReceived == 0) + return STATUS_DEVICE_NOT_CONNECTED; + else + return STATUS_SUCCESS; + + /* 9. Disconnect idle */ +SerenumDisconnectIdle: + CHECKPOINT; + /* FIXME: report to OS device removal, if it was present */ + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + BaudRate = SERIAL_BAUD_300; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, + &BaudRate, sizeof(BaudRate), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Lcr.WordLength = 7; + Lcr.Parity = NO_PARITY; + Lcr.StopBits = STOP_BIT_1; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, + &Lcr, sizeof(Lcr), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + return STATUS_DEVICE_NOT_CONNECTED; +} + +NTSTATUS +SerenumDetectLegacyDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PDEVICE_OBJECT LowerDevice) +{ + ULONG Fcr, Mcr; + ULONG BaudRate; + ULONG Command; + SERIAL_TIMEOUTS Timeouts; + SERIAL_LINE_CONTROL LCR; + ULONG i, Count; + UCHAR Buffer[16]; + UNICODE_STRING DeviceDescription; + UNICODE_STRING DeviceId; + UNICODE_STRING HardwareIds; + UNICODE_STRING CompatibleIds; + NTSTATUS Status; + + RtlZeroMemory(Buffer, sizeof(Buffer)); + + /* Reset UART */ + CHECKPOINT; + Mcr = 0; /* MCR: DTR/RTS/OUT2 off */ + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, + &Mcr, sizeof(Mcr), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Set communications parameters */ + CHECKPOINT; + /* DLAB off */ + Fcr = 0; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL, + &Fcr, sizeof(Fcr), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + /* Set serial port speed */ + BaudRate = SERIAL_BAUD_1200; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, + &BaudRate, sizeof(BaudRate), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + /* Set LCR */ + LCR.WordLength = 7; + LCR.Parity = NO_PARITY; + LCR.StopBits = STOP_BITS_2; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, + &LCR, sizeof(LCR), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Flush receive buffer */ + CHECKPOINT; + Command = SERIAL_PURGE_RXCLEAR; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, + &Command, sizeof(Command), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + /* Wait 100 ms */ + SerenumWait(100); + + /* Enable DTR/RTS */ + CHECKPOINT; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Set timeout to 500 microseconds */ + CHECKPOINT; + Timeouts.ReadIntervalTimeout = 100; + Timeouts.ReadTotalTimeoutMultiplier = 0; + Timeouts.ReadTotalTimeoutConstant = 500; + Timeouts.WriteTotalTimeoutMultiplier = Timeouts.WriteTotalTimeoutConstant = 0; + Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, + &Timeouts, sizeof(Timeouts), NULL, NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Fill the read buffer */ + CHECKPOINT; + Status = ReadBytes(LowerDevice, Buffer, sizeof(Buffer)/sizeof(Buffer[0]), &Count); + if (!NT_SUCCESS(Status)) return Status; + + for (i = 0; i < Count; i++) + { + if (Buffer[i] == 'B') + { + /* Sign for Microsoft Ballpoint */ + /* Hardware id: *PNP0F09 + * Compatible id: *PNP0F0F, SERIAL_MOUSE + */ + RtlInitUnicodeString(&DeviceDescription, L"Microsoft Ballpoint device"); + RtlInitUnicodeString(&DeviceId, L"*PNP0F09"); + SerenumInitMultiSzString(&HardwareIds, "*PNP0F09", NULL); + SerenumInitMultiSzString(&CompatibleIds, "*PNP0F0F", "SERIAL_MOUSE", NULL); + Status = ReportDetectedDevice(DeviceObject, + &DeviceDescription, &DeviceId, &HardwareIds, &CompatibleIds); + RtlFreeUnicodeString(&HardwareIds); + RtlFreeUnicodeString(&CompatibleIds); + return Status; + } + else if (Buffer[i] == 'M') + { + /* Sign for Microsoft Mouse protocol followed by button specifier */ + if (i == sizeof(Buffer) - 1) + { + /* Overflow Error */ + return STATUS_DEVICE_NOT_CONNECTED; + } + switch (Buffer[i + 1]) + { + case '3': + /* Hardware id: *PNP0F08 + * Compatible id: SERIAL_MOUSE + */ + RtlInitUnicodeString(&DeviceDescription, L"Microsoft Mouse with 3-buttons"); + RtlInitUnicodeString(&DeviceId, L"*PNP0F08"); + SerenumInitMultiSzString(&HardwareIds, "*PNP0F08", NULL); + SerenumInitMultiSzString(&CompatibleIds, "SERIAL_MOUSE", NULL); + default: + /* Hardware id: *PNP0F01 + * Compatible id: SERIAL_MOUSE + */ + RtlInitUnicodeString(&DeviceDescription, L"Microsoft Mouse with 2-buttons or Microsoft Wheel Mouse"); + RtlInitUnicodeString(&DeviceId, L"*PNP0F01"); + SerenumInitMultiSzString(&HardwareIds, "*PNP0F01", NULL); + SerenumInitMultiSzString(&CompatibleIds, "SERIAL_MOUSE", NULL); + } + Status = ReportDetectedDevice(DeviceObject, + &DeviceDescription, &DeviceId, &HardwareIds, &CompatibleIds); + RtlFreeUnicodeString(&HardwareIds); + RtlFreeUnicodeString(&CompatibleIds); + return Status; + } + } + + return STATUS_DEVICE_NOT_CONNECTED; +} Property changes on: trunk/reactos/drivers/bus/serenum/detect.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/bus/serenum/fdo.c --- trunk/reactos/drivers/bus/serenum/fdo.c 2005-04-05 18:59:56 UTC (rev 14511) +++ trunk/reactos/drivers/bus/serenum/fdo.c 2005-04-05 19:04:07 UTC (rev 14512) @@ -0,0 +1,213 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial enumerator driver + * FILE: drivers/bus/serenum/fdo.c + * PURPOSE: IRP_MJ_PNP operations for FDOs + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ + +#define NDEBUG +#include "serenum.h" + +NTSTATUS STDCALL +SerenumAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo) +{ + PDEVICE_OBJECT Fdo; + PFDO_DEVICE_EXTENSION DeviceExtension; + //UNICODE_STRING SymbolicLinkName; + NTSTATUS Status; + + DPRINT("Serenum: SerenumAddDevice called. Pdo = %p\n", Pdo); + + /* Create new device object */ + Status = IoCreateDevice(DriverObject, + sizeof(FDO_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (!NT_SUCCESS(Status)) + { + DPRINT("Serenum: IoCreateDevice() failed with status 0x%08lx\n", Status); + return Status; + } + + /* Register device interface */ +#if 0 /* FIXME: activate */ + Status = IoRegisterDeviceInterface(Pdo, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, NULL, &SymbolicLinkName); + if (!NT_SUCCESS(Status)) + { + DPRINT("Serenum: IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); + goto ByeBye; + } + DPRINT1("Serenum: IoRegisterDeviceInterface() returned '%wZ'\n", &SymbolicLinkName); + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT("Serenum: IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status); + goto ByeBye; + } + RtlFreeUnicodeString(&SymbolicLinkName); +#endif + + DeviceExtension = (PFDO_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(FDO_DEVICE_EXTENSION)); + DeviceExtension->Common.IsFDO = TRUE; + DeviceExtension->Common.PnpState = dsStopped; + DeviceExtension->Pdo = Pdo; + IoInitializeRemoveLock(&DeviceExtension->RemoveLock, SERENUM_TAG, 0, 0); + Fdo->Flags |= DO_POWER_PAGABLE; + Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); + if (!NT_SUCCESS(Status)) + { + DPRINT("Serenum: IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + IoDeleteDevice(Fdo); + return Status; + } + Fdo->Flags |= DO_BUFFERED_IO; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +SerenumFdoStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PCOMMON_DEVICE_EXTENSION DeviceExtension; + + DPRINT("Serenum: SerenumFdoStartDevice() called\n"); + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + ASSERT(DeviceExtension->PnpState == dsStopped); + DeviceExtension->PnpState = dsStarted; + + return STATUS_SUCCESS; +} + +NTSTATUS +SerenumFdoQueryBusRelations( + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_RELATIONS* pDeviceRelations) +{ + PFDO_DEVICE_EXTENSION DeviceExtension; + PDEVICE_RELATIONS DeviceRelations; + ULONG NumPDO; + ULONG i; + NTSTATUS Status; + + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(DeviceExtension->Common.IsFDO); + + /* Do enumeration if needed */ + if (!(DeviceExtension->Flags & FLAG_ENUMERATION_DONE)) + { + ASSERT(DeviceExtension->AttachedPdo == NULL); + /* Detect plug-and-play devices */ + Status = SerenumDetectPnpDevice(DeviceObject, DeviceExtension->LowerDevice); + if (Status == STATUS_DEVICE_NOT_CONNECTED) + { + /* Detect legacy devices */ + Status = SerenumDetectLegacyDevice(DeviceObject, DeviceExtension->LowerDevice); + if (Status == STATUS_DEVICE_NOT_CONNECTED) + Status = STATUS_SUCCESS; + } + DeviceExtension->Flags |= FLAG_ENUMERATION_DONE; + } + NumPDO = (DeviceExtension->AttachedPdo != NULL ? 1 : 0); + + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag( + PagedPool, + sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) * (NumPDO - 1), + SERENUM_TAG); + if (!DeviceRelations) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Fill returned structure */ + DeviceRelations->Count = NumPDO; + for (i = 0; i < NumPDO; i++) + { + ObReferenceObject(DeviceExtension->AttachedPdo); + DeviceRelations->Objects[i] = DeviceExtension->AttachedPdo; + } + + *pDeviceRelations = DeviceRelations; + return Status; +} + +NTSTATUS +SerenumFdoPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + ULONG MinorFunction; + PIO_STACK_LOCATION Stack; + ULONG_PTR Information = 0; + NTSTATUS Status; + + Stack = IoGetCurrentIrpStackLocation(Irp); + MinorFunction = Stack->MinorFunction; + + switch (MinorFunction) + { + /* FIXME: do all these minor functions + IRP_MN_QUERY_REMOVE_DEVICE 0x1 + IRP_MN_REMOVE_DEVICE 0x2 + IRP_MN_CANCEL_REMOVE_DEVICE 0x3 + IRP_MN_STOP_DEVICE 0x4 + IRP_MN_QUERY_STOP_DEVICE 0x5 + IRP_MN_CANCEL_STOP_DEVICE 0x6 + IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations (optional) 0x7 + IRP_MN_QUERY_INTERFACE (optional) 0x8 + IRP_MN_QUERY_CAPABILITIES (optional) 0x9 + IRP_MN_FILTER_RESOURCE_REQUIREMENTS (optional or required) 0xb + IRP_MN_QUERY_PNP_DEVICE_STATE (optional) 0x14 + IRP_MN_DEVICE_USAGE_NOTIFICATION (required or optional) 0x16 + IRP_MN_SURPRISE_REMOVAL 0x17 + */ + case IRP_MN_START_DEVICE: /* 0x0 */ + { + DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + /* Call lower driver */ + Status = ForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status)) + Status = SerenumFdoStartDevice(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_DEVICE_RELATIONS: /* 0x7 */ + { + switch (Stack->Parameters.QueryDeviceRelations.Type) + { + case BusRelations: + { + PDEVICE_RELATIONS DeviceRelations; + DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + Status = SerenumFdoQueryBusRelations(DeviceObject, &DeviceRelations); + Information = (ULONG_PTR)DeviceRelations; + break; + } + default: + DPRINT1("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + Stack->Parameters.QueryDeviceRelations.Type); + return ForwardIrpAndForget(DeviceObject, Irp); + } + break; + } + default: + { + DPRINT1("Serenum: IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + return ForwardIrpAndForget(DeviceObject, Irp); + } + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} Property changes on: trunk/reactos/drivers/bus/serenum/fdo.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/bus/serenum/makefile --- trunk/reactos/drivers/bus/serenum/makefile 2005-04-05 18:59:56 UTC (rev 14511) +++ trunk/reactos/drivers/bus/serenum/makefile 2005-04-05 19:04:07 UTC (rev 14512) @@ -0,0 +1,20 @@ +# $Id: makefile 12852 2005-01-06 13:58:04Z mf $ + +PATH_TO_TOP = ../../.. + +TARGET_TYPE = driver + +TARGET_NAME = serenum + +TARGET_CFLAGS = -Wall -Werror -D__USE_W32API + +TARGET_OBJECTS = \ + detect.o \ + fdo.o \ + misc.o \ + pdo.o \ + serenum.o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk Property changes on: trunk/reactos/drivers/bus/serenum/makefile ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/bus/serenum/misc.c --- trunk/reactos/drivers/bus/serenum/misc.c 2005-04-05 18:59:56 UTC (rev 14511) +++ trunk/reactos/drivers/bus/serenum/misc.c 2005-04-05 19:04:07 UTC (rev 14512) @@ -0,0 +1,201 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial enumerator driver + * FILE: drivers/dd/serenum/misc.c + * PURPOSE: Misceallenous operations + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ + +#define NDEBUG +#include "serenum.h" +#include <stdarg.h> + +NTSTATUS +SerenumDuplicateUnicodeString( + OUT PUNICODE_STRING Destination, + IN PUNICODE_STRING Source, + IN POOL_TYPE PoolType) +{ + if (Source == NULL) + { + RtlInitUnicodeString(Destination, NULL); + return STATUS_SUCCESS; + } + + Destination->Buffer = ExAllocatePool(PoolType, Source->MaximumLength); + if (Destination->Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Destination->MaximumLength = Source->MaximumLength; + Destination->Length = Source->Length; + RtlCopyMemory(Destination->Buffer, Source->Buffer, Source->MaximumLength); + + return STATUS_SUCCESS; +} + +/* I really want ANSI strings as last arguments because + * PnP ids are ANSI-encoded in PnP device string + * identification */ +NTSTATUS +SerenumInitMultiSzString( + OUT PUNICODE_STRING Destination, + ... /* list of PCSZ */) +{ + va_list args; + PCSZ Source; + ANSI_STRING AnsiString; + UNICODE_STRING UnicodeString; + ULONG DestinationSize = 0; + NTSTATUS Status = STATUS_SUCCESS; + + /* Calculate length needed for destination unicode string */ + va_start(args, Destination); + Source = va_arg(args, PCSZ); + while (Source != NULL) + { + RtlInitAnsiString(&AnsiString, Source); + DestinationSize += RtlAnsiStringToUnicodeSize(&AnsiString) + + sizeof(WCHAR) /* final NULL */; + Source = va_arg(args, PCSZ); + } + va_end(args); + if (DestinationSize == 0) + { + RtlInitUnicodeString(Destination, NULL); + return STATUS_SUCCESS; + } + + /* Initialize destination string */ + DestinationSize += sizeof(WCHAR); // final NULL + Destination->Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, DestinationSize, SERENUM_TAG); + if (!Destination->Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + Destination->Length = 0; + Destination->MaximumLength = (USHORT)DestinationSize; + + /* Copy arguments to destination string */ + /* Use a temporary unicode string, which buffer is shared with + * destination string, to copy arguments */ + UnicodeString.Length = Destination->Length; + UnicodeString.MaximumLength = Destination->MaximumLength; + UnicodeString.Buffer = Destination->Buffer; + va_start(args, Destination); + Source = va_arg(args, PCSZ); + while (Source != NULL) + { + RtlInitAnsiString(&AnsiString, Source); + Status = RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, FALSE); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Destination->Buffer, SERENUM_TAG); + break; + } + Destination->Length += UnicodeString.Length + sizeof(WCHAR); + UnicodeString.MaximumLength -= UnicodeString.Length + sizeof(WCHAR); + UnicodeString.Buffer += UnicodeString.Length / sizeof(WCHAR) + 1; + UnicodeString.Length = 0; + Source = va_arg(args, PCSZ); + } + va_end(args); + if (NT_SUCCESS(Status)) + { + /* Finish multi-sz string */ + Destination->Buffer[Destination->Length / sizeof(WCHAR)] = L'\0'; + Destination->Length += sizeof(WCHAR); + } + return Status; +} + +NTSTATUS STDCALL +ForwardIrpAndWaitCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +ForwardIrpAndWait( + IN PDEVICE_OBJECT DeviceObject, [truncated at 1000 lines; 711 more skipped]

19 years, 8 months

[sedwards] 14511: use -D__USE_W32API

by sedwards＠svn.reactos.com

use -D__USE_W32API Modified: trunk/rosapps/cmdutils/mode/makefile _____ Modified: trunk/rosapps/cmdutils/mode/makefile --- trunk/rosapps/cmdutils/mode/makefile 2005-04-05 18:49:53 UTC (rev 14510) +++ trunk/rosapps/cmdutils/mode/makefile 2005-04-05 18:59:56 UTC (rev 14511) @@ -11,7 +11,7 @@ TARGET_OBJECTS = $(TARGET_NAME).o -#TARGET_GCCLIBS = iberty +TARGET_CFLAGS = -D__USE_W32API include $(PATH_TO_TOP)/rules.mak

19 years, 8 months

[chorns] 14510: Rebuild source if a header is changed

by chorns＠svn.reactos.com

Rebuild source if a header is changed Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-04-05 18:20:45 UTC (rev 14509) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-04-05 18:49:53 UTC (rev 14510) @@ -143,6 +143,29 @@ $(RBUILD_COMMON_OBJECTS) \ $(RBUILD_SPECIAL_OBJECTS) +RBUILD_BACKEND_DEVCPP_HEADERS = \ + devcpp.h + +RBUILD_BACKEND_MINGW_HEADERS = \ + mingw.h \ + modulehandler.h + +RBUILD_BACKEND_HEADERS = \ + backend.h \ + $(addprefix devcpp$(SEP), $(RBUILD_BACKEND_DEVCPP_HEADERS)) \ + $(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) + +RBUILD_HEADERS = \ + $(addprefix $(RBUILD_BASE_), \ + exception.h \ + pch.h \ + rbuild.h \ + ssprintf.h \ + test.h \ + XML.h \ + $(addprefix backend$(SEP), $(RBUILD_BACKEND_HEADERS)) \ + ) + RBUILD_TESTS = \ tests$(SEP)cdfiletest.cpp \ tests$(SEP)definetest.cpp \ @@ -182,131 +205,131 @@ $(ECHO_LD) ${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ -$(RBUILD_INT_)automaticdependency.o: $(RBUILD_BASE_)automaticdependency.cpp $(RBUILD_INT) +$(RBUILD_INT_)automaticdependency.o: $(RBUILD_BASE_)automaticdependency.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)bootstrap.o: $(RBUILD_BASE_)bootstrap.cpp $(RBUILD_INT) +$(RBUILD_INT_)bootstrap.o: $(RBUILD_BASE_)bootstrap.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)cdfile.o: $(RBUILD_BASE_)cdfile.cpp $(RBUILD_INT) +$(RBUILD_INT_)cdfile.o: $(RBUILD_BASE_)cdfile.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_INT) +$(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)define.o: $(RBUILD_BASE_)define.cpp $(RBUILD_INT) +$(RBUILD_INT_)define.o: $(RBUILD_BASE_)define.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)exception.o: $(RBUILD_BASE_)exception.cpp $(RBUILD_INT) +$(RBUILD_INT_)exception.o: $(RBUILD_BASE_)exception.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)include.o: $(RBUILD_BASE_)include.cpp $(RBUILD_INT) +$(RBUILD_INT_)include.o: $(RBUILD_BASE_)include.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)installfile.o: $(RBUILD_BASE_)installfile.cpp $(RBUILD_INT) +$(RBUILD_INT_)installfile.o: $(RBUILD_BASE_)installfile.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)linkerflag.o: $(RBUILD_BASE_)linkerflag.cpp $(RBUILD_INT) +$(RBUILD_INT_)linkerflag.o: $(RBUILD_BASE_)linkerflag.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)module.o: $(RBUILD_BASE_)module.cpp $(RBUILD_INT) +$(RBUILD_INT_)module.o: $(RBUILD_BASE_)module.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)project.o: $(RBUILD_BASE_)project.cpp $(RBUILD_INT) +$(RBUILD_INT_)project.o: $(RBUILD_BASE_)project.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)rbuild.o: $(RBUILD_BASE_)rbuild.cpp $(RBUILD_INT) +$(RBUILD_INT_)rbuild.o: $(RBUILD_BASE_)rbuild.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)ssprintf.o: $(RBUILD_BASE_)ssprintf.cpp $(RBUILD_INT) +$(RBUILD_INT_)ssprintf.o: $(RBUILD_BASE_)ssprintf.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)stubbedcomponent.o: $(RBUILD_BASE_)stubbedcomponent.cpp $(RBUILD_INT) +$(RBUILD_INT_)stubbedcomponent.o: $(RBUILD_BASE_)stubbedcomponent.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)XML.o: $(RBUILD_BASE_)XML.cpp $(RBUILD_INT) +$(RBUILD_INT_)XML.o: $(RBUILD_BASE_)XML.cpp $(RBUILD_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_BACKEND_INT_)backend.o: $(RBUILD_BACKEND_BASE_)backend.cpp $(RBUILD_BACKEND_INT) +$(RBUILD_BACKEND_INT_)backend.o: $(RBUILD_BACKEND_BASE_)backend.cpp $(RBUILD_BACKEND_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_MINGW_INT_)mingw.o: $(RBUILD_MINGW_BASE_)mingw.cpp $(RBUILD_MINGW_INT) +$(RBUILD_MINGW_INT_)mingw.o: $(RBUILD_MINGW_BASE_)mingw.cpp $(RBUILD_MINGW_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_MINGW_INT_)modulehandler.o: $(RBUILD_MINGW_BASE_)modulehandler.cpp $(RBUILD_MINGW_INT) +$(RBUILD_MINGW_INT_)modulehandler.o: $(RBUILD_MINGW_BASE_)modulehandler.cpp $(RBUILD_MINGW_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_DEVCPP_INT_)devcpp.o: $(RBUILD_DEVCPP_BASE_)devcpp.cpp $(RBUILD_DEVCPP_INT) +$(RBUILD_DEVCPP_INT_)devcpp.o: $(RBUILD_DEVCPP_BASE_)devcpp.cpp $(RBUILD_DEVCPP_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_OUT) +$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_OUT) $(RBUILD_HEADERS) $(ECHO_LD) ${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ -$(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)functiontest.o: $(RBUILD_TESTS_BASE_)functiontest.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)functiontest.o: $(RBUILD_TESTS_BASE_)functiontest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)iftest.o: $(RBUILD_TESTS_BASE_)iftest.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)iftest.o: $(RBUILD_TESTS_BASE_)iftest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)includetest.o: $(RBUILD_TESTS_BASE_)includetest.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)includetest.o: $(RBUILD_TESTS_BASE_)includetest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)invoketest.o: $(RBUILD_TESTS_BASE_)invoketest.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)invoketest.o: $(RBUILD_TESTS_BASE_)invoketest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)linkerflagtest.o: $(RBUILD_TESTS_BASE_)linkerflagtest.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)linkerflagtest.o: $(RBUILD_TESTS_BASE_)linkerflagtest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)moduletest.o: $(RBUILD_TESTS_BASE_)moduletest.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)moduletest.o: $(RBUILD_TESTS_BASE_)moduletest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)projecttest.o: $(RBUILD_TESTS_BASE_)projecttest.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)projecttest.o: $(RBUILD_TESTS_BASE_)projecttest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)sourcefiletest.o: $(RBUILD_TESTS_BASE_)sourcefiletest.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)sourcefiletest.o: $(RBUILD_TESTS_BASE_)sourcefiletest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)symboltest.o: $(RBUILD_TESTS_BASE_)symboltest.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)symboltest.o: $(RBUILD_TESTS_BASE_)symboltest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)alltests.o: $(RBUILD_TESTS_BASE_)alltests.cpp $(RBUILD_TESTS_INT) +$(RBUILD_TESTS_INT_)alltests.o: $(RBUILD_TESTS_BASE_)alltests.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@

19 years, 8 months

[chorns] 14509: Simplify directory handling

by chorns＠svn.reactos.com

Simplify directory handling Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-05 17:50:21 UTC (rev 14508) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-05 18:20:45 UTC (rev 14509) @@ -18,7 +18,6 @@ using std::map; typedef set<string> set_string; -typedef map<string,Directory*> directory_map; string @@ -42,33 +41,13 @@ } -class Directory -{ -public: - string name; - directory_map subdirs; - Directory ( const string& name ); - void Add ( const char* subdir ); - void GenerateTree ( const string& parent, - bool verbose ); -private: - bool mkdir_p ( const char* path ); - string ReplaceVariable ( string name, - string value, - string path ); - string GetIntermediatePath (); - string GetOutputPath (); - void ResolveVariablesInPath ( char* buf, - string path ); - bool CreateDirectory ( string path ); -}; - Directory::Directory ( const string& name_ ) : name(name_) { } -void Directory::Add ( const char* subdir ) +void +Directory::Add ( const char* subdir ) { size_t i; string s1 = string ( subdir ); @@ -187,6 +166,7 @@ } } + static class MingwFactory : public Backend::Factory { public: @@ -200,29 +180,23 @@ MingwBackend::MingwBackend ( Project& project, bool verbose ) : Backend ( project, verbose ), - int_directories ( new Directory("$(INTERMEDIATE)") ), - out_directories ( new Directory("$(OUTPUT)") ) + intermediateDirectory ( new Directory ("$(INTERMEDIATE)" ) ), + outputDirectory ( new Directory ( "$(OUTPUT)" ) ) { } MingwBackend::~MingwBackend() { - delete int_directories; - delete out_directories; + delete intermediateDirectory; + delete outputDirectory; } string -MingwBackend::AddDirectoryTarget ( const string& directory, bool out ) +MingwBackend::AddDirectoryTarget ( const string& directory, + Directory* directoryTree ) { - const char* dir_name = "$(INTERMEDIATE)"; - Directory* dir = int_directories; - if ( out ) - { - dir_name = "$(OUTPUT)"; - dir = out_directories; - } - dir->Add ( directory.c_str() ); - return dir_name; + directoryTree->Add ( directory.c_str() ); + return directoryTree->name; } void @@ -538,8 +512,8 @@ MingwBackend::GenerateDirectories () { printf ( "Creating directories..." ); - int_directories->GenerateTree ( "", verbose ); - out_directories->GenerateTree ( "", verbose ); + intermediateDirectory->GenerateTree ( "", verbose ); + outputDirectory->GenerateTree ( "", verbose ); printf ( "done\n" ); } @@ -625,7 +599,7 @@ string targetFilenameNoFixup = installDirectory + SSEP + installfile.base + SSEP + installfile.newname; string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetFilenameNoFixup ), - true ); + outputDirectory ); out.push_back ( targetFilename ); } } @@ -643,7 +617,7 @@ string targetFilenameNoFixup = installDirectory + SSEP + module.installBase + SSEP + module.installName; string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetFilenameNoFixup ), - true ); + outputDirectory ); out.push_back ( targetFilename ); } } @@ -668,10 +642,10 @@ { string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( installDirectory + SSEP + targetDirectory + SSEP + targetFilename ), - true ); + outputDirectory ); string normalizedTargetDirectory = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( installDirectory + SSEP + targetDirectory ), - true ); + outputDirectory ); fprintf ( fMakefile, "%s: %s %s\n", normalizedTargetFilename.c_str (), @@ -708,7 +682,7 @@ { string sourceFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( module.GetPath () ), - true ); + outputDirectory ); OutputInstallTarget ( installDirectory, sourceFilename, module.installName, @@ -732,7 +706,7 @@ { string system32ConfigDirectory = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( installDirectory + SSEP + "system32" + SSEP "config" ), - true ); + outputDirectory ); return system32ConfigDirectory + SSEP "default " + system32ConfigDirectory + SSEP "sam " + system32ConfigDirectory + SSEP "security " + @@ -745,7 +719,7 @@ { string system32ConfigDirectory = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( installDirectory + SSEP + "system32" + SSEP "config" ), - true ); + outputDirectory ); string registrySourceFiles = GetRegistrySourceFiles (); string registryTargetFiles = GetRegistryTargetFiles ( installDirectory ); @@ -772,7 +746,7 @@ string installDirectoryNoFixup = "reactos"; string installDirectory = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( installDirectoryNoFixup ), - true ); + outputDirectory ); vector<string> vInstallTargetFiles; GetInstallTargetFiles ( installDirectoryNoFixup, vInstallTargetFiles ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-05 17:50:21 UTC (rev 14508) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-05 18:20:45 UTC (rev 14509) @@ -15,14 +15,41 @@ extern std::string v2s ( const string_list& v, int wrap_at ); +typedef std::map<std::string,Directory*> directory_map; + +class Directory +{ +public: + std::string name; + directory_map subdirs; + Directory ( const std::string& name ); + void Add ( const char* subdir ); + void GenerateTree ( const std::string& parent, + bool verbose ); +private: + bool mkdir_p ( const char* path ); + std::string ReplaceVariable ( std::string name, + std::string value, + std::string path ); + std::string GetIntermediatePath (); + std::string GetOutputPath (); + void ResolveVariablesInPath ( char* buf, + std::string path ); + bool CreateDirectory ( std::string path ); +}; + + class MingwBackend : public Backend { public: MingwBackend ( Project& project, bool verbose ); virtual ~MingwBackend (); virtual void Process (); - std::string AddDirectoryTarget ( const std::string& directory, bool out ); + std::string AddDirectoryTarget ( const std::string& directory, + Directory* directoryTree ); bool usePipe; + Directory* intermediateDirectory; + Directory* outputDirectory; private: void CreateMakefile (); void CloseMakefile () const; @@ -66,7 +93,6 @@ void GenerateInstallTarget (); FILE* fMakefile; bool use_pch; - Directory *int_directories, *out_directories; }; std::string FixupTargetFilename ( const std::string& targetFilename ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-05 17:50:21 UTC (rev 14508) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-05 18:20:45 UTC (rev 14509) @@ -100,10 +100,12 @@ /*static*/ string MingwModuleHandler::PassThruCacheDirectory ( - const string &file, bool out ) + const string &file, + Directory* directoryTree ) { string directory ( GetDirectory ( RemoveVariables ( file ) ) ); - string generatedFilesDirectory = backend->AddDirectoryTarget ( directory, out ); + string generatedFilesDirectory = backend->AddDirectoryTarget ( directory, + directoryTree ); if ( directory.find ( generatedFilesDirectory ) != string::npos ) /* This path already includes the generated files directory variable */ return file; @@ -118,7 +120,7 @@ { string target = PassThruCacheDirectory ( FixupTargetFilename ( module.GetPath () ), - true ); + backend->outputDirectory ); if ( pclean_files ) { string_list& clean_files = *pclean_files; @@ -134,7 +136,7 @@ { string target = PassThruCacheDirectory ( FixupTargetFilename ( module.GetDependencyPath () ), - true ); + backend->outputDirectory ); if ( pclean_files ) { string_list& clean_files = *pclean_files; @@ -228,8 +230,8 @@ if ( extension == ".spec" || extension == ".SPEC" ) { string basename = GetBasename ( filename ); - return PassThruCacheDirectory ( FixupTargetFilename ( basename + ".stubs.c" ), - false ); + return PassThruCacheDirectory ( NormalizeFilename ( basename + ".stubs.c" ), + backend->intermediateDirectory ); } else return filename; @@ -241,8 +243,9 @@ if ( module.type == StaticLibrary ) return GetTargetFilename ( module, NULL ); return PassThruCacheDirectory ( ReplaceExtension ( - FixupTargetFilename ( module.GetPath () ), - ".temp.a" ), false ); + NormalizeFilename ( module.GetPath () ), + ".temp.a" ), + backend->intermediateDirectory ); } bool @@ -345,10 +348,10 @@ else newExtension = ".o"; string obj_file = PassThruCacheDirectory ( - FixupTargetFilename ( ReplaceExtension ( + NormalizeFilename ( ReplaceExtension ( RemoveVariables ( sourceFilename ), newExtension ) ), - false ); + backend->intermediateDirectory ); if ( pclean_files ) { string_list& clean_files = *pclean_files; @@ -825,12 +828,12 @@ string def_file = PassThruCacheDirectory ( basename + ".spec.def", - false ); + backend->intermediateDirectory ); CLEAN_FILE(def_file); string stub_file = PassThruCacheDirectory ( basename + ".stubs.c", - false ); + backend->intermediateDirectory ); CLEAN_FILE(stub_file) fprintf ( fMakefile, @@ -925,7 +928,7 @@ string mapFilename = PassThruCacheDirectory ( GetBasename ( module.GetPath () ) + ".map", - true ); + backend->outputDirectory ); CLEAN_FILE ( mapFilename ); fprintf ( fMakefile, @@ -1475,7 +1478,8 @@ { string defFilename = module.GetBasePath () + SSEP + module.importLibrary->definition; if ( IsWineModule () ) - return PassThruCacheDirectory ( defFilename, false ); + return PassThruCacheDirectory ( NormalizeFilename ( defFilename ), + backend->intermediateDirectory ); else return defFilename; } @@ -1522,9 +1526,13 @@ const string& filename ) const { string basename = GetBasename ( filename ); - string defDependency = PassThruCacheDirectory ( FixupTargetFilename ( basename + ".spec.def" ), false ); + string defDependency = PassThruCacheDirectory ( + NormalizeFilename ( basename + ".spec.def" ), + backend->intermediateDirectory ); dependencies.push_back ( defDependency ); - string stubsDependency = PassThruCacheDirectory ( FixupTargetFilename ( basename + ".stubs.c" ), false ); + string stubsDependency = PassThruCacheDirectory ( + NormalizeFilename ( basename + ".stubs.c" ), + backend->intermediateDirectory ); dependencies.push_back ( stubsDependency ); } @@ -1533,11 +1541,6 @@ string_list& dependencies ) const { string dkNkmLibNoFixup = "dk/nkm/lib"; - // TODO FIXME - verify this is the correct dependency... - // easiest way to tell is to remove it and see what breaks - /*dependencies += PassThruCacheDirectory ( - FixupTargetFilename ( dkNkmLibNoFixup ), - false, NULL );*/ const vector<File*>& files = module.non_if_data.files; for ( size_t i = 0; i < files.size (); i++ ) { @@ -2205,8 +2208,8 @@ const CDFile& cdfile = *module.project.cdfiles[i]; string targetFilenameNoFixup = bootcdDirectory + SSEP + cdfile.base + SSEP + cdfile.nameoncd; string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( - FixupTargetFilename ( targetFilenameNoFixup ), - true ); + NormalizeFilename ( targetFilenameNoFixup ), + backend->outputDirectory ); fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, @@ -2229,8 +2232,8 @@ if ( directories.size () > 0 ) directories += " "; directories += PassThruCacheDirectory ( - FixupTargetFilename ( targetDirectory ), - true ); + NormalizeFilename ( targetDirectory ), + backend->outputDirectory ); } } return directories; @@ -2247,8 +2250,8 @@ if ( directories.size () > 0 ) directories += " "; directories += PassThruCacheDirectory ( - FixupTargetFilename ( targetDirectory ), - true ); + NormalizeFilename ( targetDirectory ), + backend->outputDirectory ); } return directories; } @@ -2299,8 +2302,8 @@ string isoboot = FixupTargetFilename ( "boot/freeldr/bootsect/isoboot.o" ); string bootcdReactosNoFixup = bootcdDirectory + "/reactos"; string bootcdReactos = PassThruCacheDirectory ( - FixupTargetFilename ( bootcdReactosNoFixup ), - true ); + NormalizeFilename ( bootcdReactosNoFixup ), + backend->outputDirectory ); CLEAN_FILE ( bootcdReactos ); string reactosInf = ros_temp + FixupTargetFilename ( bootcdReactosNoFixup + "/reactos.inf" ); string reactosDff = NormalizeFilename ( "bootdata/packages/reactos.dff" ); @@ -2359,7 +2362,7 @@ void MingwTestModuleHandler::GenerateTestModuleTarget () { - string targetMacro ( GetTargetMacro (module) ); + string targetMacro ( GetTargetMacro ( module ) ); string workingDirectory = GetWorkingDirectory ( ); string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-05 17:50:21 UTC (rev 14508) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-05 18:20:45 UTC (rev 14509) @@ -25,7 +25,8 @@ static void SetUsePch ( bool use_pch ); static std::string PassThruCacheDirectory ( - const std::string &f, bool out ); + const std::string &f, + Directory* directoryTree ); static std::string GetTargetFilename ( const Module& module,

19 years, 8 months

[gvg] 14508: Implement exception handling for Xen

by gvg＠svn.reactos.com

Implement exception handling for Xen Modified: branches/xen/reactos/boot/freeldr/freeldr/Makefile Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xencons.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c Modified: branches/xen/reactos/boot/freeldr/freeldr/include/machine.h Modified: branches/xen/reactos/boot/freeldr/freeldr/machine.c _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/Makefile --- branches/xen/reactos/boot/freeldr/freeldr/Makefile 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/Makefile 2005-04-05 17:50:21 UTC (rev 14508) @@ -174,6 +174,7 @@ xencons.o \ xenctrlif.o \ xenmem.o \ + xenvideo.o \ _alloca.o # For Mingw32 builds ARCH_OBJS = $(addprefix i386/,$(ARCH_I386_OBJS)) _____ Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386.h 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386.h 2005-04-05 17:50:21 UTC (rev 14508) @@ -0,0 +1,47 @@ +/* + * FreeLoader + * + * Copyright (C) 2003 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __I386_I386_H_ +#define __I386_I386_H_ + +extern void i386DivideByZero(); +extern void i386DebugException(); +extern void i386NMIException(); +extern void i386Breakpoint(); +extern void i386Overflow(); +extern void i386BoundException(); +extern void i386InvalidOpcode(); +extern void i386FPUNotAvailable(); +extern void i386DoubleFault(); +extern void i386CoprocessorSegment(); +extern void i386InvalidTSS(); +extern void i386SegmentNotPresent(); +extern void i386StackException(); +extern void i386GeneralProtectionFault(); +extern void i386PageFault(); +extern void i386CoprocessorError(); +extern void i386AlignmentCheck(); +extern void i386MachineCheck(); + +extern void (*i386TrapSaveDRHook)(unsigned long *DRRegs); + +#endif /* __I386_I386_H_ */ + +/* EOF */ Property changes on: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S 2005-04-05 17:50:21 UTC (rev 14508) @@ -26,59 +26,7 @@ #define SCREEN_ATTR 0x1f /* Bright white on blue background */ -.macro SAVE_CPU_REGS - movl %eax,i386_EAX - movl %ebx,i386_EBX - movl %ecx,i386_ECX - movl %edx,i386_EDX - movl %esp,i386_ESP - movl %ebp,i386_EBP - movl %esi,i386_ESI - movl %edi,i386_EDI - movw %ds,%ax - movw %ax,i386_DS - movw %es,%ax - movw %ax,i386_ES - movw %fs,%ax - movw %ax,i386_FS - movw %gs,%ax - movw %ax,i386_GS - movw %ss,%ax - movw %ax,i386_SS - popl %eax - movl %eax,i386_EIP - popl %eax - movw %ax,i386_CS - popl %eax - movl %eax,i386_EFLAGS - movl %cr0,%eax - movl %eax,i386_CR0 - //movl %cr1,%eax - //movl %eax,i386_CR1 - movl %cr2,%eax - movl %eax,i386_CR2 - movl %cr3,%eax - movl %eax,i386_CR3 - movl %dr0,%eax - movl %eax,i386_DR0 - movl %dr1,%eax - movl %eax,i386_DR1 - movl %dr2,%eax - movl %eax,i386_DR2 - movl %dr3,%eax - movl %eax,i386_DR3 - movl %dr6,%eax - movl %eax,i386_DR6 - movl %dr7,%eax - movl %eax,i386_DR7 - sgdt i386_GDTR - sidt i386_IDTR - sldt i386_LDTR - str i386_TR -.endm - - i386ExceptionHandlerText: .ascii "An error occured in FreeLoader\n" .ascii VERSION @@ -260,6 +208,10 @@ i386_TR: .word 0 +/* Hook to save debug registers */ +EXTERN(i386TrapSaveDRHook) + .long 0 + /* Used to store the current X and Y position on the screen */ i386_ScreenPosX: .long 0 @@ -270,8 +222,70 @@ i386CommonExceptionHandler: .code32 - SAVE_CPU_REGS + movl %eax,i386_EAX + movl %ebx,i386_EBX + movl %ecx,i386_ECX + movl %edx,i386_EDX + movl %esp,i386_ESP + movl %ebp,i386_EBP + movl %esi,i386_ESI + movl %edi,i386_EDI + movw %ds,%ax + movw %ax,i386_DS + movw %es,%ax + movw %ax,i386_ES + movw %fs,%ax + movw %ax,i386_FS + movw %gs,%ax + movw %ax,i386_GS + movw %ss,%ax + movw %ax,i386_SS + popl %eax + movl %eax,i386_EIP + popl %eax + movw %ax,i386_CS + popl %eax + movl %eax,i386_EFLAGS + movl %cr0,%eax + movl %eax,i386_CR0 + //movl %cr1,%eax + //movl %eax,i386_CR1 + movl %cr2,%eax + movl %eax,i386_CR2 + movl %cr3,%eax + movl %eax,i386_CR3 +/* Check for a hook to save debug regs (it's here for the benefit of Xen) */ + movl i386TrapSaveDRHook,%eax + test %eax,%eax + jz save_dr + +/* Hook present, call it */ + pushl $i386_DR0 + call *%eax + jmp end_save_dr + +save_dr: +/* No hook present, we can save the regs ourselves */ + movl %dr0,%eax + movl %eax,i386_DR0 + movl %dr1,%eax + movl %eax,i386_DR1 + movl %dr2,%eax + movl %eax,i386_DR2 + movl %dr3,%eax + movl %eax,i386_DR3 + movl %dr6,%eax + movl %eax,i386_DR6 + movl %dr7,%eax + movl %eax,i386_DR7 + +end_save_dr: + sgdt i386_GDTR + sidt i386_IDTR + sldt i386_LDTR + str i386_TR + pushl $SCREEN_ATTR call MachVideoClearScreen add $4,%esp @@ -444,9 +458,8 @@ incl i386_ScreenPosY incl i386_ScreenPosY - cli i386ExceptionHandlerHang: - hlt + call MachDie jmp i386ExceptionHandlerHang iret _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-04-05 17:50:21 UTC (rev 14508) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * FreeLoader * * This program is free software; you can redistribute it and/or modify @@ -54,6 +53,19 @@ MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; MachVtbl.RTCGetCurrentDateTime = PcRTCGetCurrentDateTime; MachVtbl.HwDetect = PcHwDetect; + MachVtbl.Die = PcDie; } +VOID +PcDie() +{ + while (1) + { + __asm__ __volatile__( + " cli\n" + " hlt\n" + ); + } +} + /* EOF */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-04-05 17:50:21 UTC (rev 14508) @@ -57,6 +57,8 @@ VOID PcHwDetect(VOID); +VOID PcDie(VOID); + #endif /* __I386_MACHPC_H_ */ /* EOF */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-04-05 17:50:21 UTC (rev 14508) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * FreeLoader * * This program is free software; you can redistribute it and/or modify @@ -52,4 +51,19 @@ MachVtbl.DiskGetCacheableBlockCount = XboxDiskGetCacheableBlockCount; MachVtbl.RTCGetCurrentDateTime = XboxRTCGetCurrentDateTime; MachVtbl.HwDetect = XboxHwDetect; + MachVtbl.Die = XboxDie; } + +VOID +XboxDie() +{ + while (1) + { + __asm__ __volatile__( + " cli\n" + " hlt\n" + ); + } +} + +/* EOF */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-04-05 17:50:21 UTC (rev 14508) @@ -60,6 +60,8 @@ VOID XboxHwDetect(VOID); +VOID XboxDie(VOID); + #endif /* __I386_HWXBOX_H_ */ /* EOF */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-04-05 17:50:21 UTC (rev 14508) @@ -21,13 +21,13 @@ #include "freeldr.h" #include "machxen.h" +#include "i386.h" #include <rosxen.h> #include <xen.h> #include <hypervisor.h> BOOL XenActive = FALSE; -int XenCtrlIfEvtchn; VOID XenMachInit(VOID) @@ -57,8 +57,55 @@ MachVtbl.DiskGetCacheableBlockCount = XenDiskGetCacheableBlockCount; MachVtbl.RTCGetCurrentDateTime = XenRTCGetCurrentDateTime; MachVtbl.HwDetect = XenHwDetect; + MachVtbl.Die = XenDie; } +VOID +XenDie() +{ + XenConsFlush(); + while (1) + { + HYPERVISOR_shutdown(); + } +} + +extern void (*i386TrapSaveDRHook)(unsigned long *DRRegs); +extern void i386Breakpoint(); + +static trap_info_t trap_table[] = { + { 0, 0, FLAT_RING1_CS, (unsigned long)i386DivideByZero }, + { 1, 0, FLAT_RING1_CS, (unsigned long)i386DebugException }, + { 2, 0, FLAT_RING1_CS, (unsigned long)i386NMIException }, + { 3, 3, FLAT_RING1_CS, (unsigned long)i386Breakpoint }, + { 4, 3, FLAT_RING1_CS, (unsigned long)i386Overflow }, + { 5, 3, FLAT_RING1_CS, (unsigned long)i386BoundException }, + { 6, 0, FLAT_RING1_CS, (unsigned long)i386InvalidOpcode }, + { 7, 0, FLAT_RING1_CS, (unsigned long)i386FPUNotAvailable }, + { 8, 0, FLAT_RING1_CS, (unsigned long)i386DoubleFault }, + { 9, 0, FLAT_RING1_CS, (unsigned long)i386CoprocessorSegment }, + { 10, 0, FLAT_RING1_CS, (unsigned long)i386InvalidTSS }, + { 11, 0, FLAT_RING1_CS, (unsigned long)i386SegmentNotPresent }, + { 12, 0, FLAT_RING1_CS, (unsigned long)i386StackException }, + { 13, 0, FLAT_RING1_CS, (unsigned long)i386GeneralProtectionFault }, + { 14, 0, FLAT_RING1_CS, (unsigned long)i386PageFault }, + { 16, 0, FLAT_RING1_CS, (unsigned long)i386CoprocessorError }, + { 17, 0, FLAT_RING1_CS, (unsigned long)i386AlignmentCheck }, + { 18, 0, FLAT_RING1_CS, (unsigned long)i386MachineCheck }, + { 0, 0, 0, 0 } +}; + +static void +XenTrapSaveDR(unsigned long *DRRegs) +{ + unsigned Reg; + + for (Reg = 0; Reg < 8; Reg++) + { + DRRegs[Reg] = HYPERVISOR_get_debugreg(Reg); + } +} + /* _start is the default name ld will use as the entry point. When xen * loads the domain, it will start execution at the elf entry point. */ @@ -95,18 +142,21 @@ __asm__ __volatile__("mov %%eax,%%esp\n" : : "a"(NewStackPtr)); /* Don't use stack based variables after this */ + i386TrapSaveDRHook = XenTrapSaveDR; + HYPERVISOR_set_trap_table(trap_table); + /* Start freeldr */ XenActive = TRUE; BootDrive = 0x80; BootMain(XenStartInfo->cmd_line); /* Shouldn't get here */ - HYPERVISOR_shutdown(); + XenDie(); } #define XEN_UNIMPLEMENTED(routine) \ printf(routine " unimplemented. Shutting down\n"); \ - HYPERVISOR_shutdown() + XenDie() BOOL XenConsKbHit() @@ -122,12 +172,6 @@ return 0; } -VOID -XenVideoClearScreen(UCHAR Attr) - { - XEN_UNIMPLEMENTED("XenVideoClearScreen"); - } - VIDEODISPLAYMODE XenVideoSetDisplayMode(char *DisplayMode, BOOL Init) { @@ -161,12 +205,6 @@ } VOID -XenVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y) - { - XEN_UNIMPLEMENTED("XenVideoPutChar"); - } - -VOID XenVideoCopyOffScreenBufferToVRAM(PVOID Buffer) { XEN_UNIMPLEMENTED("XenVideoCopyOffScreenBufferToVRAM"); _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h 2005-04-05 17:50:21 UTC (rev 14508) @@ -45,6 +45,7 @@ VOID XenConsPutChar(int Ch); BOOL XenConsKbHit(); int XenConsGetCh(); +VOID XenConsFlush(); VOID XenVideoClearScreen(UCHAR Attr); VIDEODISPLAYMODE XenVideoSetDisplayMode(char *DisplayMode, BOOL Init); @@ -71,6 +72,8 @@ VOID XenHwDetect(VOID); +VOID XenDie(VOID); + #endif /* __I386_MACHXEN_H_ */ /* EOF */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xencons.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xencons.c 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xencons.c 2005-04-05 17:50:21 UTC (rev 14508) @@ -37,8 +37,8 @@ static char OutputBuffer[OUTPUT_BUFFER_SIZE]; static unsigned OutputPtr = 0; -static void -FlushOutput() +VOID +XenConsFlush() { ctrl_msg_t Msg; @@ -69,7 +69,7 @@ { if (OUTPUT_BUFFER_SIZE <= OutputPtr) { - FlushOutput(); + XenConsFlush(); } OutputBuffer[OutputPtr++] = Ch; } @@ -81,7 +81,7 @@ { PutCharInBuffer('\r'); PutCharInBuffer('\n'); - FlushOutput(); + XenConsFlush(); } else { _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c 2005-04-05 17:50:21 UTC (rev 14508) @@ -204,7 +204,7 @@ if (0 != HYPERVISOR_mmu_update(&MmuReq, 1, NULL)) { HYPERVISOR_console_io(CONSOLEIO_write, sizeof(ErrMsg), ErrMsg); - HYPERVISOR_shutdown(); + XenDie(); } } @@ -217,7 +217,7 @@ if (0 != HYPERVISOR_mmu_update(&MmuReq, 1, NULL)) { HYPERVISOR_console_io(CONSOLEIO_write, sizeof(ErrMsg), ErrMsg); - HYPERVISOR_shutdown(); + XenDie(); } XenPageDir = (PPDE) HighAddr; @@ -231,7 +231,7 @@ if (0 != HYPERVISOR_mmu_update(&MmuReq, 1, NULL)) { HYPERVISOR_console_io(CONSOLEIO_write, sizeof(ErrMsg), ErrMsg); - HYPERVISOR_shutdown(); + XenDie(); } /* Map the page tables near the top of mem */ @@ -247,7 +247,7 @@ if (0 != HYPERVISOR_mmu_update(&MmuReq, 1, NULL)) { HYPERVISOR_console_io(CONSOLEIO_write, sizeof(ErrMsg), ErrMsg); - HYPERVISOR_shutdown(); + XenDie(); } } @@ -276,7 +276,7 @@ if (0 != HYPERVISOR_mmu_update(&MmuReq, 1, NULL)) { HYPERVISOR_console_io(CONSOLEIO_write, sizeof(ErrMsg), ErrMsg); - HYPERVISOR_shutdown(); + XenDie(); } } } @@ -296,7 +296,7 @@ if (0 != HYPERVISOR_mmu_update(&MmuReq, 1, NULL)) { HYPERVISOR_console_io(CONSOLEIO_write, sizeof(ErrMsg), ErrMsg); - HYPERVISOR_shutdown(); + XenDie(); } } _____ Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c 2005-04-05 17:50:21 UTC (rev 14508) @@ -0,0 +1,105 @@ +/* + * FreeLoader + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * Xen virtualization of the console isn't that great, it doesn't properly + * virtualize full-screen access. We simulate it by sending ANSI control + * codes and assume a display size of 80x25. This should be enough for proper + * display on e.g. linux consoles and xterms. + */ + +#include "freeldr.h" +#include "machxen.h" + +#define ROWS 25 +#define COLS 80 + +static unsigned CurrentX = (unsigned) -1; +static unsigned CurrentY = (unsigned) -1; +static UCHAR CurrentAttr = 0x07; + + +static VOID +AnsiMoveToPos(unsigned X, unsigned Y) +{ + CurrentX = X; + CurrentY = Y; + printf("\033[%d;%dH", Y + 1, X + 1); +} + +static VOID +AnsiSetAttr(UCHAR Attr) +{ + /* Convert color from BIOS (RGB) to ANSI (BGR) */ + static UCHAR ConvertColor[] = + { 0x00, 0x04, 0x02, 0x06, 0x01, 0x05, 0x03, 0x07 }; + char Bright[3]; + + CurrentAttr = Attr; + /* Check for bright foreground */ + if (0 != (Attr & 0x08)) + { + strcpy(Bright, "1;"); + } + else + { + Bright[0] = '\0'; + } + printf("\033[%s3%d;4%dm", Bright, ConvertColor[Attr & 0x07], + ConvertColor[(Attr >> 4) & 0x07]); +} + +static VOID +AnsiClearScreen() +{ + printf("\033[H\033[J\n"); +} + +VOID +XenVideoClearScreen(UCHAR Attr) +{ + if (Attr != CurrentAttr) + { + AnsiSetAttr(Attr); + } + AnsiClearScreen(); +} + +VOID +XenVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y) +{ + /* Don't write outside the screen or on the bottom-right position, + it might trigger a scroll operation */ + if (COLS <= X || ROWS <= Y + || (X == COLS - 1 && Y == ROWS - 1)) + { + return; + } + + if (X != CurrentX || Y != CurrentY) + { + AnsiMoveToPos(X, Y); + } + if (Attr != CurrentAttr) + { + AnsiSetAttr(Attr); + } + XenConsPutChar(Ch); + CurrentX++; +} + +/* EOF */ Property changes on: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/include/machine.h --- branches/xen/reactos/boot/freeldr/freeldr/include/machine.h 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/include/machine.h 2005-04-05 17:50:21 UTC (rev 14508) @@ -64,6 +64,8 @@ VOID (*RTCGetCurrentDateTime)(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); VOID (*HwDetect)(VOID); + + VOID (*Die)(VOID); } MACHVTBL, *PMACHVTBL; VOID MachInit(VOID); @@ -93,6 +95,7 @@ #define MachDiskGetCacheableBlockCount(Drive) MachVtbl.DiskGetCacheableBlockCount(Drive) #define MachRTCGetCurrentDateTime(Y, Mo, D, H, Mi, S) MachVtbl.RTCGetCurrentDateTime((Y), (Mo), (D), (H), (Mi), (S)); #define MachHwDetect() MachVtbl.HwDetect() +#define MachDie() MachVtbl.Die() #endif /* __MACHINE_H_ */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/machine.c --- branches/xen/reactos/boot/freeldr/freeldr/machine.c 2005-04-05 17:22:02 UTC (rev 14507) +++ branches/xen/reactos/boot/freeldr/freeldr/machine.c 2005-04-05 17:50:21 UTC (rev 14508) @@ -43,6 +43,7 @@ #undef MachDiskGetCacheableBlockCount #undef MachRTCGetCurrentDateTime #undef MachHwDetect +#undef MachDie MACHVTBL MachVtbl; @@ -184,4 +185,10 @@ MachVtbl.HwDetect(); } +VOID +MachDie(VOID) +{ + MachVtbl.Die(); +} + /* EOF */

19 years, 8 months

[chorns] 14507: Generate registry hives on 'make install'

by chorns＠svn.reactos.com

Generate registry hives on 'make install' Modified: branches/xmlbuildsystem/reactos/Makefile Added: branches/xmlbuildsystem/reactos/tools/mkhive/mkhive.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/tools.mak _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-05 17:12:52 UTC (rev 14506) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-05 17:22:02 UTC (rev 14507) @@ -90,6 +90,7 @@ ECHO_NCI =@echo [NCI] $@ ECHO_CABMAN =@echo [CABMAN] $< ECHO_CDMAKE =@echo [CDMAKE] $@ + ECHO_MKHIVE =@echo [MKHIVE] $@ ECHO_REGTESTS=@echo [REGTESTS] $@ ECHO_TEST =@echo [TEST] $@ else @@ -115,6 +116,7 @@ ECHO_NCI = ECHO_CABMAN = ECHO_CDMAKE = + ECHO_MKHIVE = ECHO_REGTESTS= ECHO_TEST = endif @@ -139,7 +141,7 @@ objcopy = $(Q)mingw32-objcopy dlltool = $(Q)mingw32-dlltool windres = $(Q)mingw32-windres - rm = rm -f + rm = $(Q)rm -f cp = $(Q)cp NUL = /dev/null else # mingw32-windows @@ -157,7 +159,7 @@ objcopy = $(Q)objcopy dlltool = $(Q)dlltool windres = $(Q)windres - rm = del /f /q + rm = $(Q)del /f /q cp = $(Q)copy /y NUL = NUL endif _____ Added: branches/xmlbuildsystem/reactos/tools/mkhive/mkhive.mak --- branches/xmlbuildsystem/reactos/tools/mkhive/mkhive.mak 2005-04-05 17:12:52 UTC (rev 14506) +++ branches/xmlbuildsystem/reactos/tools/mkhive/mkhive.mak 2005-04-05 17:22:02 UTC (rev 14507) @@ -0,0 +1,66 @@ +MKHIVE_BASE = $(TOOLS_BASE_)mkhive +MKHIVE_BASE_ = $(MKHIVE_BASE)$(SEP) +MKHIVE_INT = $(INTERMEDIATE_)$(MKHIVE_BASE) +MKHIVE_INT_ = $(MKHIVE_INT)$(SEP) +MKHIVE_OUT = $(OUTPUT_)$(MKHIVE_BASE) +MKHIVE_OUT_ = $(MKHIVE_OUT)$(SEP) + +$(MKHIVE_INT): $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(MKHIVE_OUT): $(TOOLS_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + +MKHIVE_TARGET = \ + $(EXEPREFIX)$(MKHIVE_OUT_)mkhive$(EXEPOSTFIX) + +MKHIVE_SOURCES = $(addprefix $(MKHIVE_BASE_), \ + binhive.c \ + infcache.c \ + mkhive.c \ + reginf.c \ + registry.c \ + ) + +MKHIVE_OBJECTS = \ + $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) + +MKHIVE_HOST_CFLAGS = -g -Werror -Wall + +MKHIVE_HOST_LFLAGS = -g + +.PHONY: mkhive +mkhive: $(MKHIVE_TARGET) + +$(MKHIVE_TARGET): $(MKHIVE_OBJECTS) $(MKHIVE_OUT) + $(ECHO_LD) + ${host_gcc} $(MKHIVE_OBJECTS) $(MKHIVE_HOST_LFLAGS) -o $@ + +$(MKHIVE_INT_)binhive.o: $(MKHIVE_BASE_)binhive.c $(MKHIVE_INT) + $(ECHO_CC) + ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ + +$(MKHIVE_INT_)infcache.o: $(MKHIVE_BASE_)infcache.c $(MKHIVE_INT) + $(ECHO_CC) + ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ + +$(MKHIVE_INT_)mkhive.o: $(MKHIVE_BASE_)mkhive.c $(MKHIVE_INT) + $(ECHO_CC) + ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ + +$(MKHIVE_INT_)reginf.o: $(MKHIVE_BASE_)reginf.c $(MKHIVE_INT) + $(ECHO_CC) + ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ + +$(MKHIVE_INT_)registry.o: $(MKHIVE_BASE_)registry.c $(MKHIVE_INT) + $(ECHO_CC) + ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ + +.PHONY: mkhive_clean +mkhive_clean: $(MKHIVE_TARGET) + -@$(rm) $(MKHIVE_TARGET) $(MKHIVE_OBJECTS) 2>$(NUL) +clean: mkhive_clean _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-05 17:12:52 UTC (rev 14506) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-05 17:22:02 UTC (rev 14507) @@ -680,7 +680,7 @@ fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, - "\t${cp} %s %s\n", + "\t${cp} %s %s 1>$(NUL)\n", sourceFilename.c_str (), normalizedTargetFilename.c_str () ); } @@ -717,7 +717,56 @@ } } +string +MingwBackend::GetRegistrySourceFiles () +{ + return "bootdata" SSEP "hivecls.inf " + "bootdata" SSEP "hivedef.inf " + "bootdata" SSEP "hiveinst.inf " + "bootdata" SSEP "hivesft.inf " + "bootdata" SSEP "hivesys.inf"; +} + +string +MingwBackend::GetRegistryTargetFiles ( const string& installDirectory ) +{ + string system32ConfigDirectory = MingwModuleHandler::PassThruCacheDirectory ( + NormalizeFilename ( installDirectory + SSEP + "system32" + SSEP "config" ), + true ); + return system32ConfigDirectory + SSEP "default " + + system32ConfigDirectory + SSEP "sam " + + system32ConfigDirectory + SSEP "security " + + system32ConfigDirectory + SSEP "software " + + system32ConfigDirectory + SSEP "system"; +} + void +MingwBackend::OutputRegistryInstallTarget ( const string& installDirectory ) +{ + string system32ConfigDirectory = MingwModuleHandler::PassThruCacheDirectory ( + NormalizeFilename ( installDirectory + SSEP + "system32" + SSEP "config" ), + true ); + + string registrySourceFiles = GetRegistrySourceFiles (); + string registryTargetFiles = GetRegistryTargetFiles ( installDirectory ); + fprintf ( fMakefile, + "install_registry: %s\n", + registryTargetFiles.c_str () ); + fprintf ( fMakefile, + "%s: %s %s $(MKHIVE_TARGET)\n", + registryTargetFiles.c_str (), + registrySourceFiles.c_str (), + system32ConfigDirectory.c_str () ); + fprintf ( fMakefile, + "\t$(ECHO_MKHIVE)\n" ); + fprintf ( fMakefile, + "\t$(MKHIVE_TARGET) bootdata %s bootdata" SSEP "hiveinst.inf\n", + system32ConfigDirectory.c_str () ); + fprintf ( fMakefile, + "\n" ); +} + +void MingwBackend::GenerateInstallTarget () { string installDirectoryNoFixup = "reactos"; @@ -730,11 +779,12 @@ string installTargetFiles = v2s ( vInstallTargetFiles, 5 ); fprintf ( fMakefile, - "install: %s %s\n", + "install: %s %s install_registry\n", installDirectory.c_str (), installTargetFiles.c_str () ); OutputNonModuleInstallTargets ( installDirectoryNoFixup ); OutputModuleInstallTargets ( installDirectoryNoFixup ); + OutputRegistryInstallTarget ( installDirectoryNoFixup ); fprintf ( fMakefile, "\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-05 17:12:52 UTC (rev 14506) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-05 17:22:02 UTC (rev 14507) @@ -60,6 +60,9 @@ const std::string& targetDirectory ); void OutputNonModuleInstallTargets ( const std::string& installDirectory ); void OutputModuleInstallTargets ( const std::string& installDirectory ); + std::string GetRegistrySourceFiles (); + std::string GetRegistryTargetFiles ( const std::string& installDirectory ); + void OutputRegistryInstallTarget ( const std::string& installDirectory ); void GenerateInstallTarget (); FILE* fMakefile; bool use_pch; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-05 17:12:52 UTC (rev 14506) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-05 17:22:02 UTC (rev 14507) @@ -2189,7 +2189,7 @@ fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, - "\t${cp} %s %s\n", + "\t${cp} %s %s 1>$(NUL)\n", m.GetPath ().c_str (), targetFilename.c_str () ); } @@ -2210,7 +2210,7 @@ fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, - "\t${cp} %s %s\n", + "\t${cp} %s %s 1>$(NUL)\n", cdfile.GetPath ().c_str (), targetFilename.c_str () ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-04-05 17:12:52 UTC (rev 14506) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-04-05 17:22:02 UTC (rev 14507) @@ -57,6 +57,7 @@ include tools/buildno/buildno.mak include tools/cabman/cabman.mak include tools/cdmake/cdmake.mak +include tools/mkhive/mkhive.mak include tools/nci/nci.mak include tools/rbuild/rbuild.mak include tools/unicode/unicode.mak

19 years, 8 months

[hbirr] 14506: - Changed the calculation of the current sector count to read or write from both sides of a floppy in one step.

by hbirr＠svn.reactos.com

- Changed the calculation of the current sector count to read or write from both sides of a floppy in one step. - Set the EOT sector always to the last sector of a floppy. Modified: trunk/reactos/drivers/storage/floppy/readwrite.c _____ Modified: trunk/reactos/drivers/storage/floppy/readwrite.c --- trunk/reactos/drivers/storage/floppy/readwrite.c 2005-04-05 17:07:56 UTC (rev 14505) +++ trunk/reactos/drivers/storage/floppy/readwrite.c 2005-04-05 17:12:52 UTC (rev 14506) @@ -654,10 +654,10 @@ KdPrint(("floppy: ReadWritePassive(): computing number of sectors to transfer (StartSector 0x%x): ", StartSector)); /* 1-based sector number */ - if( ((DriveInfo->DiskGeometry.SectorsPerTrack - StartSector) + 1) < + if( (((DriveInfo->DiskGeometry.TracksPerCylinder - Head) * DriveInfo->DiskGeometry.SectorsPerTrack - StartSector) + 1 ) < (Length - TransferByteOffset) / DriveInfo->DiskGeometry.BytesPerSector) { - CurrentTransferSectors = (UCHAR)(DriveInfo->DiskGeometry.SectorsPerTrack - StartSector) + 1; + CurrentTransferSectors = (UCHAR)((DriveInfo->DiskGeometry.TracksPerCylinder - Head) * DriveInfo->DiskGeometry.SectorsPerTrack - StartSector) + 1; } else { @@ -703,7 +703,7 @@ /* Issue the read/write command to the controller. Note that it expects the opposite of WriteToDevice. */ if(HwReadWriteData(DriveInfo->ControllerInfo, !WriteToDevice, DriveInfo->UnitNumber, Cylinder, Head, StartSector, - DriveInfo->BytesPerSectorCode, StartSector + CurrentTransferSectors, 0, 0xff) != STATUS_SUCCESS) + DriveInfo->BytesPerSectorCode, DriveInfo->DiskGeometry.SectorsPerTrack, 0, 0xff) != STATUS_SUCCESS) { KdPrint(("floppy: ReadWritePassive(): HwReadWriteData returned failure; unable to read; completing with STATUS_UNSUCCESSFUL\n")); RWFreeAdapterChannel(DriveInfo->ControllerInfo->AdapterObject);

19 years, 8 months

[hbirr] 14505: Initialize the maximum length of the device description to allocate more than map register.

by hbirr＠svn.reactos.com

Initialize the maximum length of the device description to allocate more than map register. Modified: trunk/reactos/drivers/storage/floppy/floppy.c _____ Modified: trunk/reactos/drivers/storage/floppy/floppy.c --- trunk/reactos/drivers/storage/floppy/floppy.c 2005-04-05 15:53:09 UTC (rev 14504) +++ trunk/reactos/drivers/storage/floppy/floppy.c 2005-04-05 17:07:56 UTC (rev 14505) @@ -861,6 +861,7 @@ DeviceDescription.DmaChannel = gControllerInfo[i].Dma; DeviceDescription.InterfaceType = gControllerInfo[i].InterfaceType; DeviceDescription.BusNumber = gControllerInfo[i].BusNumber; + DeviceDescription.MaximumLength = 2*18*512; /* based on a 1.44MB floppy */ /* DMA 0,1,2,3 are 8-bit; 4,5,6,7 are 16-bit (4 is chain i think) */ DeviceDescription.DmaWidth = gControllerInfo[i].Dma > 3 ? Width16Bits: Width8Bits;

19 years, 8 months

[hbirr] 14504: Set the correct CurrentVa in the call to IoFlushAdapterBuffers.

by hbirr＠svn.reactos.com

Set the correct CurrentVa in the call to IoFlushAdapterBuffers. Modified: trunk/reactos/drivers/storage/floppy/readwrite.c _____ Modified: trunk/reactos/drivers/storage/floppy/readwrite.c --- trunk/reactos/drivers/storage/floppy/readwrite.c 2005-04-05 15:51:02 UTC (rev 14503) +++ trunk/reactos/drivers/storage/floppy/readwrite.c 2005-04-05 15:53:09 UTC (rev 14504) @@ -723,7 +723,7 @@ /* Read is complete; flush & free adapter channel */ IoFlushAdapterBuffers(DriveInfo->ControllerInfo->AdapterObject, Irp->MdlAddress, DriveInfo->ControllerInfo->MapRegisterBase, - MmGetMdlVirtualAddress(Irp->MdlAddress), + (PVOID)((ULONG_PTR)MmGetMdlVirtualAddress(Irp->MdlAddress) + TransferByteOffset), CurrentTransferBytes, WriteToDevice); /* Read the results from the drive */

19 years, 8 months

[hbirr] 14503: Changed back to IoBuildSynchronousFsdRequest.

by hbirr＠svn.reactos.com

Changed back to IoBuildSynchronousFsdRequest. Modified: trunk/reactos/ntoskrnl/io/rw.c _____ Modified: trunk/reactos/ntoskrnl/io/rw.c --- trunk/reactos/ntoskrnl/io/rw.c 2005-04-05 15:08:18 UTC (rev 14502) +++ trunk/reactos/ntoskrnl/io/rw.c 2005-04-05 15:51:02 UTC (rev 14503) @@ -103,12 +103,13 @@ _SEH_TRY { - Irp = IoBuildAsynchronousFsdRequest(IRP_MJ_READ, - FileObject->DeviceObject, - Buffer, - Length, - ByteOffset, - IoStatusBlock); + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, + FileObject->DeviceObject, + Buffer, + Length, + ByteOffset, + EventObject, + IoStatusBlock); } _SEH_HANDLE { @@ -130,13 +131,6 @@ return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status; } - Irp->UserEvent = EventObject; - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* synchronous irp's are queued to requestor thread's irp cancel/cleanup list */ - IoQueueThreadIrp(Irp); - } - KeClearEvent(&FileObject->Event); /* Trigger FileObject/Event dereferencing */ @@ -283,12 +277,13 @@ _SEH_TRY { - Irp = IoBuildAsynchronousFsdRequest(IRP_MJ_WRITE, - FileObject->DeviceObject, - Buffer, - Length, - ByteOffset, - IoStatusBlock); + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE, + FileObject->DeviceObject, + Buffer, + Length, + ByteOffset, + EventObject, + IoStatusBlock); } _SEH_HANDLE { @@ -310,13 +305,6 @@ return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status; } - Irp->UserEvent = EventObject; - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* synchronous irp's are queued to requestor thread's irp cancel/cleanup list */ - IoQueueThreadIrp(Irp); - } - KeClearEvent(&FileObject->Event); /* Trigger FileObject/Event dereferencing */

19 years, 8 months

← Newer
1
...
34
35
36
37
38
39
40
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005