Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[cgutman] 53501: [ACPI] - Assign unique IDs to all special case devices (thermal zones, power resources, processors, power/sleep buttons)
by cgutman＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: cgutman Date: Tue Aug 30 20:35:31 2011 New Revision: 53501 URL: http://svn.reactos.org/svn/reactos?rev=53501&view=rev Log: [ACPI] - Assign unique IDs to all special case devices (thermal zones, power resources, processors, power/sleep buttons) Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Tue Aug 30 20:35:31 2011 @@ -60,7 +60,8 @@ KEVENT AcpiEventQueue; KDPC event_dpc; -int ProcessorCount; +int ProcessorCount, PowerDeviceCount, PowerButtonCount, FixedPowerButtonCount; +int FixedSleepButtonCount, SleepButtonCount, ThermalZoneCount; static int acpi_device_register ( @@ -1146,7 +1147,7 @@ char *uid = NULL; ACPI_DEVICE_ID_LIST *cid_list = NULL; int i = 0; - char processor_uid[5]; + char static_uid_buffer[5]; if (!child) return_VALUE(AE_BAD_PARAMETER); @@ -1271,10 +1272,12 @@ break; case ACPI_BUS_TYPE_POWER: hid = ACPI_POWER_HID; + uid = static_uid_buffer; + sprintf(uid, "%d", (PowerDeviceCount++)); break; case ACPI_BUS_TYPE_PROCESSOR: hid = ACPI_PROCESSOR_HID; - uid = processor_uid; + uid = static_uid_buffer; sprintf(uid, "%d", (ProcessorCount++)); break; case ACPI_BUS_TYPE_SYSTEM: @@ -1282,18 +1285,28 @@ break; case ACPI_BUS_TYPE_THERMAL: hid = ACPI_THERMAL_HID; + uid = static_uid_buffer; + sprintf(uid, "%d", (ThermalZoneCount++)); break; case ACPI_BUS_TYPE_POWER_BUTTON: hid = ACPI_BUTTON_HID_POWER; + uid = static_uid_buffer; + sprintf(uid, "%d", (PowerButtonCount++)); break; case ACPI_BUS_TYPE_POWER_BUTTONF: hid = ACPI_BUTTON_HID_POWERF; + uid = static_uid_buffer; + sprintf(uid, "%d", (FixedPowerButtonCount++)); break; case ACPI_BUS_TYPE_SLEEP_BUTTON: hid = ACPI_BUTTON_HID_SLEEP; + uid = static_uid_buffer; + sprintf(uid, "%d", (SleepButtonCount++)); break; case ACPI_BUS_TYPE_SLEEP_BUTTONF: hid = ACPI_BUTTON_HID_SLEEPF; + uid = static_uid_buffer; + sprintf(uid, "%d", (FixedSleepButtonCount++)); break; }

1 0

[janderwald] 53500: [HIDUSB] - Add stub hidusb driver - Hidusb driver is reponsible to connect with the hidclass driver (not yet present) and connect hid framework with usb hid devices
by janderwald＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: janderwald Date: Tue Aug 30 16:01:00 2011 New Revision: 53500 URL: http://svn.reactos.org/svn/reactos?rev=53500&view=rev Log: [HIDUSB] - Add stub hidusb driver - Hidusb driver is reponsible to connect with the hidclass driver (not yet present) and connect hid framework with usb hid devices Added: branches/usb-bringup/drivers/usb/hidusb/ (with props) branches/usb-bringup/drivers/usb/hidusb/CMakeLists.txt (with props) branches/usb-bringup/drivers/usb/hidusb/hidusb.c (with props) branches/usb-bringup/drivers/usb/hidusb/hidusb.h (with props) Propchange: branches/usb-bringup/drivers/usb/hidusb/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Aug 30 16:01:00 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/usb/hidusb/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/usb/hidusb/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/usb/hidusb/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/usb-bringup/drivers/usb/hidusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/usb/hidusb/CMakeLists.txt (added) +++ branches/usb-bringup/drivers/usb/hidusb/CMakeLists.txt [iso-8859-1] Tue Aug 30 16:01:00 2011 @@ -1,0 +1,11 @@ + +list(APPEND SOURCE + hidusb.c + usbhub.rc) + +add_library(hidusb SHARED ${SOURCE}) + +set_module_type(hidusb kernelmodedriver) +add_importlibs(hidusb hidclass ntoskrnl usbd) + +add_cab_target(usbhub 2) Propchange: branches/usb-bringup/drivers/usb/hidusb/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/usb/hidusb/hidusb.c (added) +++ branches/usb-bringup/drivers/usb/hidusb/hidusb.c [iso-8859-1] Tue Aug 30 16:01:00 2011 @@ -1,0 +1,151 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Human Interface Device Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/hidusb/hidusb.c + * PURPOSE: HID USB Interface Driver + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "hidusb.h" + +NTSTATUS +NTAPI +HidCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // sanity check for hidclass driver + // + ASSERT(IoStack->MajorFunction == IRP_MJ_CREATE || IoStack->MajorFunction == IRP_MJ_CLOSE); + + // + // complete request + // + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // informal debug print + // + DPRINT1("HIDUSB Request: %x\n", IoStack->MajorFunction); + + // + // done + // + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +HidInternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHID_DEVICE_EXTENSION DeviceExtension; + + // + // get hid device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // copy stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // submit request + // + return IoCallDriver(DeviceExtension->NextDeviceObject); +} + +NTSTATUS +NTAPI +HidPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegPath) +{ + HID_MINIDRIVER_REGISTRATION Registration; + NTSTATUS Status; + + // + // initialize driver object + // + DriverObject->MajorFunction[IRP_MJ_CREATE] = HidCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = HidCreate; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = HidInternalDeviceControl; + DriverObject->MajorFunction[IRP_MJ_POWER] = HidPower; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = HidSystemControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = HidPnp; + + // + // prepare registration info + // + RtlZeroMemory(&Registration, sizeof(HID_MINIDRIVER_REGISTRATION)); + + // + // fill in registration info + // + Registration.Revision = HID_REVISION; + Registration.DriverObject = DriverObject; + Registration.RegistryPath = RegPath; + Registration.DeviceExtensionSize = sizeof(HID_USB_DEVICE_EXTENSION); + Registration.DevicesArePolled = FALSE; + + // + // register driver + // + Status = HidRegisterMinidriver(&Registration); + + // + // informal debug + // + DPRINT1("********* HIDUSB *********\n"); + DPRINT1("HIDUSB Registration Status %x\n", Status); + + return Status; +} Propchange: branches/usb-bringup/drivers/usb/hidusb/hidusb.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/usb/hidusb/hidusb.h (added) +++ branches/usb-bringup/drivers/usb/hidusb/hidusb.h [iso-8859-1] Tue Aug 30 16:01:00 2011 @@ -1,0 +1,22 @@ +#pragma once + +#define _HIDPI_ +#define _HIDPI_NO_FUNCTION_MACROS_ +#include <ntddk.h> +#include <hidport.h> +#include <debug.h> + +typedef struct +{ + // + // event for completion + // + KEVENT Event; + + // + // list for pending requests + // + LIST_ENTRY PendingRequests; + +}HID_USB_DEVICE_EXTENSION, *PHID_USB_DEVICE_EXTENSION; + Propchange: branches/usb-bringup/drivers/usb/hidusb/hidusb.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 53499: [DDK] - Add header for hid framework
by janderwald＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: janderwald Date: Tue Aug 30 15:46:09 2011 New Revision: 53499 URL: http://svn.reactos.org/svn/reactos?rev=53499&view=rev Log: [DDK] - Add header for hid framework Added: branches/usb-bringup/include/ddk/hidport.h (with props) Added: branches/usb-bringup/include/ddk/hidport.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/ddk/hidport… ============================================================================== --- branches/usb-bringup/include/ddk/hidport.h (added) +++ branches/usb-bringup/include/ddk/hidport.h [iso-8859-1] Tue Aug 30 15:46:09 2011 @@ -1,0 +1,95 @@ +#pragma once + +#include <hidclass.h> + +typedef struct _HID_MINIDRIVER_REGISTRATION +{ + ULONG Revision; + PDRIVER_OBJECT DriverObject; + PUNICODE_STRING RegistryPath; + ULONG DeviceExtensionSize; + BOOLEAN DevicesArePolled; + UCHAR Reserved[3]; +}HID_MINIDRIVER_REGISTRATION, *PHID_MINIDRIVER_REGISTRATION; + +typedef struct _HID_DEVICE_EXTENSION +{ + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT NextDeviceObject; + PVOID MiniDeviceExtension; +}HID_DEVICE_EXTENSION, *PHID_DEVICE_EXTENSION; + +typedef struct _HID_DEVICE_ATTRIBUTES +{ + ULONG Size; + USHORT VendorID; + USHORT ProductID; + USHORT VersionNumber; + USHORT Reserved[11]; +}HID_DEVICE_ATTRIBUTES, * PHID_DEVICE_ATTRIBUTES; + +#include <pshpack1.h> + +typedef struct _HID_DESCRIPTOR +{ + UCHAR bLength; + UCHAR bDescriptorType; + USHORT bcdHID; + UCHAR bCountry; + UCHAR bNumDescriptors; + + struct _HID_DESCRIPTOR_DESC_LIST + { + UCHAR bReportType; + USHORT wReportLength; + }DescriptorList [1]; +}HID_DESCRIPTOR, * PHID_DESCRIPTOR; + +#include <poppack.h> + + +typedef +VOID +(*HID_SEND_IDLE_CALLBACK)( + __in PVOID Context +); + +typedef struct _HID_SUBMIT_IDLE_NOTIFICATION_CALLBACK_INFO +{ + HID_SEND_IDLE_CALLBACK IdleCallback; + PVOID IdleContext; +}HID_SUBMIT_IDLE_NOTIFICATION_CALLBACK_INFO, *PHID_SUBMIT_IDLE_NOTIFICATION_CALLBACK_INFO; + +NTSTATUS +NTAPI +HidRegisterMinidriver( + IN PHID_MINIDRIVER_REGISTRATION MinidriverRegistration +); + +#if(NTDDI_VERSION>=NTDDI_WINXPSP1) + +NTSTATUS +HidNotifyPresence( + IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN IsPresent +); + +#endif + +#define IOCTL_HID_GET_DEVICE_DESCRIPTOR HID_CTL_CODE(0) +#define IOCTL_HID_GET_REPORT_DESCRIPTOR HID_CTL_CODE(1) +#define IOCTL_HID_READ_REPORT HID_CTL_CODE(2) +#define IOCTL_HID_WRITE_REPORT HID_CTL_CODE(3) +#define IOCTL_HID_GET_STRING HID_CTL_CODE(4) +#define IOCTL_HID_ACTIVATE_DEVICE HID_CTL_CODE(7) +#define IOCTL_HID_DEACTIVATE_DEVICE HID_CTL_CODE(8) +#define IOCTL_HID_GET_DEVICE_ATTRIBUTES HID_CTL_CODE(9) +#define IOCTL_HID_SEND_IDLE_NOTIFICATION_REQUEST HID_CTL_CODE(10) + +#define HID_HID_DESCRIPTOR_TYPE 0x21 +#define HID_REPORT_DESCRIPTOR_TYPE 0x22 +#define HID_PHYSICAL_DESCRIPTOR_TYPE 0x23 + +#define HID_STRING_ID_IMANUFACTURER 14 +#define HID_STRING_ID_IPRODUCT 15 +#define HID_STRING_ID_ISERIALNUMBER 16 Propchange: branches/usb-bringup/include/ddk/hidport.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 53498: [NTOSKRNL] Update amd64 kd64 from ros-amd64-bringup
by tkreuzer＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: tkreuzer Date: Tue Aug 30 14:43:11 2011 New Revision: 53498 URL: http://svn.reactos.org/svn/reactos?rev=53498&view=rev Log: [NTOSKRNL] Update amd64 kd64 from ros-amd64-bringup Modified: trunk/reactos/include/reactos/windbgkd.h trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c Modified: trunk/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/windbgkd.h… ============================================================================== --- trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] Tue Aug 30 14:43:11 2011 @@ -195,6 +195,15 @@ #define DBGKD_PARTITION_ALTERNATE 0x01 // +// AMD64 Control Space types +// +#define AMD64_DEBUG_CONTROL_SPACE_KPCR 0 +#define AMD64_DEBUG_CONTROL_SPACE_KPRCB 1 +#define AMD64_DEBUG_CONTROL_SPACE_KSPECIAL 2 +#define AMD64_DEBUG_CONTROL_SPACE_KTHREAD 3 + + +// // KD Packet Structure // typedef struct _KD_PACKET Modified: trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/amd64/kdx64.… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c [iso-8859-1] Tue Aug 30 14:43:11 2011 @@ -22,8 +22,43 @@ KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State, IN PCONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + PKPRCB Prcb; + ULONG i; + + /* Check for success */ + if (NT_SUCCESS(State->u.Continue2.ContinueStatus)) + { + /* Check if we're tracing */ + if (State->u.Continue2.ControlSet.TraceFlag) + { + /* Enable TF */ + Context->EFlags |= EFLAGS_TF; + } + else + { + /* Remove it */ + Context->EFlags &= ~EFLAGS_TF; + } + + /* Loop all processors */ + for (i = 0; i < KeNumberProcessors; i++) + { + /* Get the PRCB and update DR7 and DR6 */ + Prcb = KiProcessorBlock[i]; + Prcb->ProcessorState.SpecialRegisters.KernelDr7 = + State->u.Continue2.ControlSet.Dr7; + Prcb->ProcessorState.SpecialRegisters.KernelDr6 = 0; + } + + /* Check if we have new symbol information */ + if (State->u.Continue2.ControlSet.CurrentSymbolStart != 1) + { + /* Update it */ + KdpCurrentSymbolStart = + State->u.Continue2.ControlSet.CurrentSymbolStart; + KdpCurrentSymbolEnd= State->u.Continue2.ControlSet.CurrentSymbolEnd; + } + } } VOID @@ -31,8 +66,29 @@ KdpSetContextState(IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange, IN PCONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + PKPRCB Prcb = KeGetCurrentPrcb(); + + /* Copy i386 specific debug registers */ + WaitStateChange->ControlReport.Dr6 = Prcb->ProcessorState.SpecialRegisters. + KernelDr6; + WaitStateChange->ControlReport.Dr7 = Prcb->ProcessorState.SpecialRegisters. + KernelDr7; + + /* Copy i386 specific segments */ + WaitStateChange->ControlReport.SegCs = (USHORT)Context->SegCs; + WaitStateChange->ControlReport.SegDs = (USHORT)Context->SegDs; + WaitStateChange->ControlReport.SegEs = (USHORT)Context->SegEs; + WaitStateChange->ControlReport.SegFs = (USHORT)Context->SegFs; + + /* Copy EFlags */ + WaitStateChange->ControlReport.EFlags = Context->EFlags; + + /* Set Report Flags */ + WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; + if (WaitStateChange->ControlReport.SegCs == KGDT64_R0_CODE) + { + WaitStateChange->ControlReport.ReportFlags |= REPORT_STANDARD_CS; + } } NTSTATUS @@ -40,9 +96,18 @@ KdpSysReadMsr(IN ULONG Msr, OUT PLARGE_INTEGER MsrValue) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + /* Use SEH to protect from invalid MSRs */ + _SEH2_TRY + { + MsrValue->QuadPart = __readmsr(Msr); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return STATUS_NO_SUCH_DEVICE); + } + _SEH2_END + + return STATUS_SUCCESS; } NTSTATUS @@ -50,9 +115,18 @@ KdpSysWriteMsr(IN ULONG Msr, IN PLARGE_INTEGER MsrValue) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + /* Use SEH to protect from invalid MSRs */ + _SEH2_TRY + { + __writemsr(Msr, MsrValue->QuadPart); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return STATUS_NO_SUCH_DEVICE); + } + _SEH2_END + + return STATUS_SUCCESS; } NTSTATUS @@ -93,9 +167,47 @@ IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + PVOID ControlStart; + PKPRCB Prcb = KiProcessorBlock[Processor]; + PKIPCR Pcr = CONTAINING_RECORD(Prcb, KIPCR, Prcb); + + switch (BaseAddress) + { + case AMD64_DEBUG_CONTROL_SPACE_KPCR: + /* Copy a pointer to the Pcr */ + ControlStart = &Pcr; + *ActualLength = sizeof(PVOID); + break; + + case AMD64_DEBUG_CONTROL_SPACE_KPRCB: + /* Copy a pointer to the Prcb */ + ControlStart = &Prcb; + *ActualLength = sizeof(PVOID); + break; + + case AMD64_DEBUG_CONTROL_SPACE_KSPECIAL: + /* Copy SpecialRegisters */ + ControlStart = &Prcb->ProcessorState.SpecialRegisters; + *ActualLength = sizeof(KSPECIAL_REGISTERS); + break; + + case AMD64_DEBUG_CONTROL_SPACE_KTHREAD: + /* Copy a pointer to the current Thread */ + ControlStart = &Prcb->CurrentThread; + *ActualLength = sizeof(PVOID); + break; + + default: + *ActualLength = 0; + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + + /* Copy the memory */ + RtlCopyMemory(Buffer, ControlStart, min(Length, *ActualLength)); + + /* Finish up */ + return STATUS_SUCCESS; } NTSTATUS @@ -106,9 +218,27 @@ IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + PVOID ControlStart; + PKPRCB Prcb = KiProcessorBlock[Processor]; + + switch (BaseAddress) + { + case AMD64_DEBUG_CONTROL_SPACE_KSPECIAL: + /* Copy SpecialRegisters */ + ControlStart = &Prcb->ProcessorState.SpecialRegisters; + *ActualLength = sizeof(KSPECIAL_REGISTERS); + break; + + default: + *ActualLength = 0; + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + + /* Copy the memory */ + RtlCopyMemory(ControlStart, Buffer, min(Length, *ActualLength)); + + return STATUS_SUCCESS; } NTSTATUS @@ -117,13 +247,54 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PVOID DataValue, + OUT PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + /* Verify parameters */ + if (InterfaceType != Isa || BusNumber != 0 || AddressSpace != 1) + { + /* No data was read */ + *ActualDataSize = 0; + return STATUS_INVALID_PARAMETER; + } + + /* Check for correct alignment */ + if ((IoAddress & (DataSize - 1))) + { + /* Invalid alignment */ + *ActualDataSize = 0; + return STATUS_DATATYPE_MISALIGNMENT; + } + + switch (DataSize) + { + case sizeof(UCHAR): + /* Read one UCHAR */ + *(PUCHAR)DataValue = READ_PORT_UCHAR((PUCHAR)IoAddress); + break; + + case sizeof(USHORT): + /* Read one USHORT */ + *(PUSHORT)DataValue = READ_PORT_USHORT((PUSHORT)IoAddress); + break; + + case sizeof(ULONG): + /* Read one ULONG */ + *(PULONG)DataValue = READ_PORT_ULONG((PULONG)IoAddress); + break; + + default: + /* Invalid data size */ + *ActualDataSize = 0; + return STATUS_INVALID_PARAMETER; + } + + /* Return the size of the data */ + *ActualDataSize = DataSize; + + /* Success! */ + return STATUS_SUCCESS; } NTSTATUS @@ -136,6 +307,56 @@ IN ULONG DataSize, OUT PULONG ActualDataSize) { + /* Verify parameters */ + if (InterfaceType != Isa || BusNumber != 0 || AddressSpace != 1) + { + /* No data was written */ + *ActualDataSize = 0; + return STATUS_INVALID_PARAMETER; + } + + /* Check for correct alignment */ + if ((IoAddress & (DataSize - 1))) + { + /* Invalid alignment */ + *ActualDataSize = 0; + return STATUS_DATATYPE_MISALIGNMENT; + } + + switch (DataSize) + { + case sizeof(UCHAR): + /* Write one UCHAR */ + WRITE_PORT_UCHAR((PUCHAR)IoAddress, *(PUCHAR)DataValue); + break; + + case sizeof(USHORT): + /* Write one USHORT */ + WRITE_PORT_USHORT((PUSHORT)IoAddress, *(PUSHORT)DataValue); + break; + + case sizeof(ULONG): + /* Write one ULONG */ + WRITE_PORT_ULONG((PULONG)IoAddress, *(PULONG)DataValue); + break; + + default: + /* Invalid data size */ + *ActualDataSize = 0; + return STATUS_INVALID_PARAMETER; + } + + /* Return the size of the data */ + *ActualDataSize = DataSize; + + /* Success! */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdpSysCheckLowMemory(IN ULONG Flags) +{ UNIMPLEMENTED; while (TRUE); return STATUS_UNSUCCESSFUL; @@ -143,15 +364,6 @@ NTSTATUS NTAPI -KdpSysCheckLowMemory(IN ULONG Flags) -{ - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI KdpAllowDisable(VOID) { UNIMPLEMENTED;

1 0

[tkreuzer] 53497: [HAL] Small cleanup and fix amd64 build (don't use the PIT)
by tkreuzer＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: tkreuzer Date: Tue Aug 30 14:19:10 2011 New Revision: 53497 URL: http://svn.reactos.org/svn/reactos?rev=53497&view=rev Log: [HAL] Small cleanup and fix amd64 build (don't use the PIT) Modified: trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/hal/halx86/amd64/stubs.c trunk/reactos/hal/halx86/generic/i386/systimer.S trunk/reactos/hal/halx86/generic/timer.c Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Tue Aug 30 14:19:10 2011 @@ -18,13 +18,13 @@ generic/profil.c generic/reboot.c generic/sysinfo.c - generic/timer.c generic/usage.c) if(ARCH MATCHES i386) list(APPEND HAL_GENERIC_SOURCE generic/bios.c generic/halinit.c + generic/timer.c generic/i386/portio.c generic/i386/systimer.S generic/i386/trap.S) Modified: trunk/reactos/hal/halx86/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/stubs.c?r… ============================================================================== --- trunk/reactos/hal/halx86/amd64/stubs.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/amd64/stubs.c [iso-8859-1] Tue Aug 30 14:19:10 2011 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING.ARM in the top level directory * FILE: hal/halx86/amd64/stubs.c * PURPOSE: HAL stubs - * PROGRAMMERS: + * PROGRAMMERS: */ /* INCLUDES *******************************************************************/ @@ -95,3 +95,18 @@ return Result; } +VOID +NTAPI +HalCalibratePerformanceCounter(IN volatile PLONG Count, + IN ULONGLONG NewCount) +{ + UNIMPLEMENTED; +} + +ULONG +NTAPI +HalSetTimeIncrement(IN ULONG Increment) +{ + UNIMPLEMENTED; + return 0; +} Modified: trunk/reactos/hal/halx86/generic/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/i386/sy… ============================================================================== --- trunk/reactos/hal/halx86/generic/i386/systimer.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/i386/systimer.S [iso-8859-1] Tue Aug 30 14:19:10 2011 @@ -14,8 +14,6 @@ EXTERN _HalpAcquireSystemHardwareSpinLock@0:PROC EXTERN _HalpReleaseCmosSpinLock@0:PROC EXTERN _DbgBreakPoint@0:PROC -EXTERN _HalpCurrentRollOver:DWORD -EXTERN _HalpPerfCounterCutoff:DWORD #define PIC1_BASE HEX(20) /* IO base address for master PIC */ #define PIC2_BASE HEX(A0) /* IO base address for slave PIC */ @@ -42,14 +40,6 @@ .data ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING -PUBLIC _HalpPerfCounter -_HalpLastPerfCounterLow: .long 0 -_HalpLastPerfCounterHigh: .long 0 -_HalpPerfCounter: -_HalpPerfCounterLow: .long 0 -_HalpPerfCounterHigh: .long 0 -_HalpSystemHardwareFlags: .long 0 - /* FUNCTIONS *****************************************************************/ .code Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Tue Aug 30 14:19:10 2011 @@ -18,6 +18,7 @@ #define PIT_LATCH 0x00 LARGE_INTEGER HalpLastPerfCounter; +LARGE_INTEGER HalpPerfCounter; ULONG HalpPerfCounterCutoff; BOOLEAN HalpClockSetMSRate; ULONG HalpCurrentTimeIncrement;

1 0

[tkreuzer] 53496: [HAL] We cannot make any assumptions about the latency whith which the timer interrupt fires after a rollover, since VBox (other VMs probably as well) doesn't always meet this. Ad...
by tkreuzer＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: tkreuzer Date: Tue Aug 30 12:01:01 2011 New Revision: 53496 URL: http://svn.reactos.org/svn/reactos?rev=53496&view=rev Log: [HAL] We cannot make any assumptions about the latency whith which the timer interrupt fires after a rollover, since VBox (other VMs probably as well) doesn't always meet this. Add another check to KeQueryPerformanceCounter that gracefully handles missing interrupts. Also raise to DISPATCH_LEVEL, since the function is not reentrant. Modified: trunk/reactos/hal/halx86/generic/timer.c Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Tue Aug 30 12:01:01 2011 @@ -253,6 +253,7 @@ { LARGE_INTEGER CurrentPerfCounter; ULONG CounterValue, ClockDelta; + KIRQL OldIrql; /* If caller wants performance frequency, return hardcoded value */ if (PerformanceFrequency) PerformanceFrequency->QuadPart = PIT_FREQUENCY; @@ -262,6 +263,10 @@ /* Check if interrupts are disabled */ if(!(__readeflags() & EFLAGS_INTERRUPT_MASK)) return HalpPerfCounter; + + /* Raise irql to DISPATCH_LEVEL */ + OldIrql = KeGetCurrentIrql(); + if (OldIrql < DISPATCH_LEVEL) KfRaiseIrql(DISPATCH_LEVEL); do { @@ -287,13 +292,21 @@ /* Add the clock delta */ CurrentPerfCounter.QuadPart += ClockDelta; - /* This must be true unless HalpPerfCounter has changed sign, - which takes approximately 245,118 years */ - ASSERT(CurrentPerfCounter.QuadPart >= HalpLastPerfCounter.QuadPart); + /* Check if the value is smaller then before, this means, we somehow + missed an interrupt. This is a sign that the timer interrupt + is very inaccurate. Probably a virtual machine. */ + if (CurrentPerfCounter.QuadPart < HalpLastPerfCounter.QuadPart) + { + /* We missed an interrupt. Assume we will receive it later */ + CurrentPerfCounter.QuadPart += HalpCurrentRollOver; + } /* Update the last counter value */ HalpLastPerfCounter = CurrentPerfCounter; + /* Restore previous irql */ + if (OldIrql < DISPATCH_LEVEL) KfLowerIrql(OldIrql); + /* Return the result */ return CurrentPerfCounter; }

1 0

[tkreuzer] 53495: [HAL] - Rewrite KeQueryPerformanceCounter in C - Implement support for changing the clock rate
by tkreuzer＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: tkreuzer Date: Tue Aug 30 08:52:17 2011 New Revision: 53495 URL: http://svn.reactos.org/svn/reactos?rev=53495&view=rev Log: [HAL] - Rewrite KeQueryPerformanceCounter in C - Implement support for changing the clock rate Modified: trunk/reactos/hal/halx86/generic/i386/systimer.S trunk/reactos/hal/halx86/generic/timer.c Modified: trunk/reactos/hal/halx86/generic/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/i386/sy… ============================================================================== --- trunk/reactos/hal/halx86/generic/i386/systimer.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/i386/systimer.S [iso-8859-1] Tue Aug 30 08:52:17 2011 @@ -64,38 +64,38 @@ /* Save EFLAGS and kill interrupts */ pushfd cli - + /* Get the current interrupt mask on the PICs */ xor eax, eax in al, PIC2_DATA shl eax, 8 in al, PIC1_DATA - + /* Save it */ push eax - + /* Now mask everything except the RTC and PIC 2 chain-interrupt */ mov eax, NOT (HEX(04) OR HEX(100)) - + /* Program the PICs */ out PIC1_DATA, al shr eax, 8 out PIC2_DATA, al - + /* Now get the IDT */ sidt [ebp-8] mov ecx, [ebp-6] - + /* Get the IDT entry for the RTC */ mov eax, HEX(38) shl eax, 3 add ecx, eax - + /* Save the original RTC ISR */ push [ecx] push [ecx+4] push ecx - + /* Now load our new handler */ mov eax, offset OnlyOnePersonCanWriteHalCode mov [ecx], ax @@ -106,10 +106,10 @@ /* Reset our counter */ mov dword ptr [ebp-12], 0 - + /* Acquire CMOS lock */ call _HalpAcquireSystemHardwareSpinLock@0 - + /* Now initialize register A on the CMOS */ mov ax, HEX(2D00) OR CMOS_REGISTER_A out CMOS_ADDR, al @@ -117,21 +117,21 @@ mov al, ah out CMOS_DATA, al jmp $+2 - + /* Read register B */ mov ax, CMOS_REGISTER_B out CMOS_ADDR, al jmp $+2 in al, CMOS_DATA jmp $+2 - + /* Don't touch the LastKnownGoodConfig hack */ and al, 1 mov ah, al - + /* Enable the interrupt */ or ah, HEX(42) - + /* Now write the register B */ mov al, CMOS_REGISTER_B out CMOS_ADDR, al @@ -139,47 +139,47 @@ mov al, ah out CMOS_DATA, al jmp $+2 - + /* Read register C */ mov al, CMOS_REGISTER_C out CMOS_ADDR, al jmp $+2 in al, CMOS_DATA jmp $+2 - + /* Read register D */ mov al, CMOS_REGISTER_D out CMOS_ADDR, al jmp $+2 in al, CMOS_DATA jmp $+2 - + /* Release CMOS lock */ mov dword ptr [ebp-12], 0 call _HalpReleaseCmosSpinLock@0 - + /* Initialize looper */ xor eax, eax - + /* Align to 16 bytes */ .align 16 - + /* Enable interrupts! */ sti jmp Looper - + /* Align to 16 bytes */ .align 16 - + /* Subtract one count */ Looper: sub eax, 1 jnz Looper - + /* ASSERT: If we got here, then the RTC never fired */ call _DbgBreakPoint@0 jmp Looper - + OnlyOnePersonCanWriteHalCode: /*********************** THIS IS THE RTC HANDLER **************************/ @@ -187,17 +187,17 @@ inc dword ptr [ebp-12] cmp dword ptr [ebp-12], 1 jnz ComputeStall - + /* * It is the first one -- we'll ignore it, since it fires randomly! * Get rid of the old return address and push the new one in (our looper) */ pop eax push offset Looper - + /* Acquire CMOS lock */ call _HalpAcquireSystemHardwareSpinLock@0 - + /* Now initialize register A on the CMOS */ mov ax, HEX(2D00) OR CMOS_REGISTER_A out CMOS_ADDR, al @@ -205,21 +205,21 @@ mov al, ah out CMOS_DATA, al jmp $+2 - + /* Read register B */ mov ax, CMOS_REGISTER_B out CMOS_ADDR, al jmp $+2 in al, CMOS_DATA jmp $+2 - + /* Don't touch the LastKnownGoodConfig hack */ and al, 1 mov ah, al - + /* Enable the interrupt */ or ah, HEX(42) - + /* Now write the register B */ mov al, CMOS_REGISTER_B out CMOS_ADDR, al @@ -227,34 +227,34 @@ mov al, ah out CMOS_DATA, al jmp $+2 - + /* Read register C */ mov al, CMOS_REGISTER_C out CMOS_ADDR, al jmp $+2 in al, CMOS_DATA jmp $+2 - + /* Read register D */ mov al, CMOS_REGISTER_D out CMOS_ADDR, al jmp $+2 in al, CMOS_DATA jmp $+2 - + /* Release CMOS lock */ call _HalpReleaseCmosSpinLock@0 - + /* Dismiss the interrupt */ mov al, PIC_EOI out PIC2_COMMAND, al mov al, PIC_SPECIFIC_EOI2 out PIC1_COMMAND, al - + /* Reset the counter and return back to the looper */ xor eax, eax iretd - + /******************* THIS IS THE 2ND RTC HANDLER **************************/ ComputeStall: @@ -263,26 +263,26 @@ xor edx, edx mov ecx, 125000 /* RTC fires every 125 ms */ div ecx - + /* Is the remainder 0? */ cmp edx, 0 jz FoundFactor - + /* Otherwise fix-up the loop count */ inc eax - + FoundFactor: /* Save the stall scale factor */ mov fs:[KPCR_STALL_SCALE_FACTOR], eax - + /* Prepare for interrupt return */ pop eax push offset AndItsNotYou mov eax, HEX(13) - + /* Acquire CMOS lock */ call _HalpAcquireSystemHardwareSpinLock@0 - + /* Now initialize register A on the CMOS */ mov ax, HEX(2D00) OR CMOS_REGISTER_A out CMOS_ADDR, al @@ -290,21 +290,21 @@ mov al, ah out CMOS_DATA, al jmp $+2 - + /* Read register B */ mov ax, CMOS_REGISTER_B out CMOS_ADDR, al jmp $+2 in al, CMOS_DATA jmp $+2 - + /* Don't touch the LastKnownGoodConfig hack */ and al, 1 mov ah, al - + /* Disable the interrupt */ or ah, 2 - + /* Now write the register B */ mov al, CMOS_REGISTER_B out CMOS_ADDR, al @@ -312,27 +312,27 @@ mov al, ah out CMOS_DATA, al jmp $+2 - + /* Read register C */ mov al, CMOS_REGISTER_C out CMOS_ADDR, al jmp $+2 in al, CMOS_DATA jmp $+2 - + /* Release CMOS lock */ call _HalpReleaseCmosSpinLock@0 - + /* Dismiss the interrupt */ mov al, PIC_EOI out PIC2_COMMAND, al mov al, PIC_SPECIFIC_EOI2 out PIC1_COMMAND, al - + /* Disable interrupts on return */ and word ptr [esp+8], NOT EFLAGS_INTERRUPT_MASK iretd - + /************************* WE ARE BACK FROM RTC ***************************/ AndItsNotYou: @@ -340,16 +340,16 @@ pop ecx pop [ecx+4] pop [ecx] - + /* Restore the mask */ pop eax out PIC1_DATA, al shr eax, 8 out PIC2_DATA, al - + /* Restore EFLAGS */ - popf - + popfd + /* Restore stack and return */ mov esp, ebp pop ebp @@ -368,9 +368,6 @@ mov eax, fs:[KPCR_STALL_SCALE_FACTOR] mul ecx - /* Align to 16 bytes */ - .align 16 - /* Jump to subtraction loop */ jmp SubtractLoop @@ -387,165 +384,4 @@ ret 4 #endif -PUBLIC _KeQueryPerformanceCounter@4 -_KeQueryPerformanceCounter@4: - - /* Check if we were called too early */ - cmp dword ptr _HalpCurrentRollOver, 0 - je NoCount - - /* Save volatiles */ - push ebx - push esi - -LoopPreInt: - - /* Disable interrupts */ - pushf - cli - -LoopPostInt: - - /* Get the current value */ - mov ebx, dword ptr _HalpPerfCounterLow - mov esi, dword ptr _HalpPerfCounterHigh - - /* Read 8254 timer */ - mov al, 0 /* Interrupt on terminal count */ - out PIT_MODE, al - in al, SYSTEM_CTRL_PORT_A - or al, byte ptr _HalpPerfCounterCutoff - out SYSTEM_CTRL_PORT_A, al - jmp $+2 - in al, PIT_CH0 - jmp $+2 - movzx ecx, al - in al, PIT_CH0 - mov ch, al - - /* Enable interrupts and do a short wait */ - popf - nop - jmp $+2 - - /* Disable them again */ - pushf - cli - - /* Get the counter value again */ - mov eax, dword ptr _HalpPerfCounterLow - mov edx, dword ptr _HalpPerfCounterHigh - - /* Check if someone updated the counter */ - cmp eax, ebx - jnz LoopPostInt - cmp edx, esi - jnz LoopPostInt - - /* Check if the current 8254 value causes rollover */ - neg ecx - add ecx, dword ptr _HalpCurrentRollOver - jnb DoRollOver - -SetSum: - - /* Calculate the sum */ - add eax, ecx - adc edx, 0 - - /* Check if we're above or below the last high value */ - cmp edx, dword ptr _HalpLastPerfCounterHigh - jb short BelowHigh - jnz short BelowLow - - /* Check if we're above or below the last low value */ - cmp eax, dword ptr _HalpLastPerfCounterLow - jb BelowHigh - -BelowLow: - - /* Update the last value and bring back interrupts */ - mov dword ptr _HalpLastPerfCounterLow, eax - mov dword ptr _HalpLastPerfCounterHigh, edx - popf - - /* Check if caller wants frequency */ - cmp dword ptr [esp+12], 0 - jz ReturnNoFreq - - /* Save hard-coded frequency */ - mov ecx, dword ptr [esp+12] - mov dword ptr [ecx], 1193182 - mov dword ptr [ecx+4], 0 - -ReturnNoFreq: - - /* Restore volatiles */ - pop esi - pop ebx - ret 4 - -NoCount: - - /* Return empty, called too soon */ - mov eax, 0 - mov edx, 0 - ret 4 - -DoRollOver: - - /* We might have an incoming interrupt, save EFLAGS and reset rollover */ - mov esi, [esp] - mov ecx, dword ptr _HalpCurrentRollOver - popf - - /* Check if interrupts were enabled and try again */ - test esi, EFLAGS_INTERRUPT_MASK - jnz LoopPreInt - - /* They're not, continue where we left */ - pushf - jmp SetSum - -BelowHigh: - - /* Get the last counter values */ - mov ebx, dword ptr _HalpLastPerfCounterLow - mov esi, dword ptr _HalpLastPerfCounterHigh - - /* Check if the previous value was 0 and go back if yes */ - mov ecx, ebx - or ecx, esi - jz BelowLow - - /* Make sure that the count is still valid */ - sub ebx, eax - sbb esi, edx - jnz InvalidCount - cmp ebx, dword ptr _HalpCurrentRollOver - jg InvalidCount - - /* Fixup the count with the last known value */ - sub eax, ebx - sbb edx, esi - - /* We might have an incoming interrupt, save EFLAGS */ - mov ecx, [esp] - popf - - /* Check if interrupts were enabled and try again */ - test ecx, EFLAGS_INTERRUPT_MASK - jnz LoopPreInt - - /* They're not, continue where we left */ - pushf - jmp BelowLow - -InvalidCount: - popf - xor eax, eax - mov dword ptr _HalpLastPerfCounterLow, eax - mov dword ptr _HalpLastPerfCounterHigh, eax - jmp LoopPreInt - END Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Tue Aug 30 08:52:17 2011 @@ -4,6 +4,7 @@ * FILE: hal/halx86/generic/timer.c * PURPOSE: HAL Timer Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -14,6 +15,9 @@ /* GLOBALS *******************************************************************/ +#define PIT_LATCH 0x00 + +LARGE_INTEGER HalpLastPerfCounter; ULONG HalpPerfCounterCutoff; BOOLEAN HalpClockSetMSRate; ULONG HalpCurrentTimeIncrement; @@ -21,53 +25,55 @@ ULONG HalpNextMSRate = 14; ULONG HalpLargestClockMS = 15; -LARGE_INTEGER HalpRolloverTable[15] = -{ - {{1197, 10032}}, - {{2394, 20064}}, - {{3591, 30096}}, - {{4767, 39952}}, - {{5964, 49984}}, - {{7161, 60016}}, - {{8358, 70048}}, - {{9555, 80080}}, - {{10731, 89936}}, - {{11949, 100144}}, - {{13125, 110000}}, - {{14322, 120032}}, - {{15519, 130064}}, - {{16695, 139920}}, - {{17892, 149952}} +static struct _HALP_ROLLOVER +{ + ULONG RollOver; + ULONG Increment; +} HalpRolloverTable[15] = +{ + {1197, 10032}, + {2394, 20064}, + {3591, 30096}, + {4767, 39952}, + {5964, 49984}, + {7161, 60016}, + {8358, 70048}, + {9555, 80080}, + {10731, 89936}, + {11949, 100144}, + {13125, 110000}, + {14322, 120032}, + {15519, 130064}, + {16695, 139920}, + {17892, 149952} }; /* PRIVATE FUNCTIONS *********************************************************/ -VOID -NTAPI -INIT_FUNCTION -HalpInitializeClock(VOID) -{ - PKPRCB Prcb = KeGetCurrentPrcb(); - ULONG Increment; - USHORT RollOver; +FORCEINLINE +ULONG +HalpRead8254Value(void) +{ + ULONG TimerValue; + + /* Send counter latch command for channel 0 */ + __outbyte(TIMER_CONTROL_PORT, PIT_LATCH); + __nop(); + + /* Read the value, LSB first */ + TimerValue = __inbyte(TIMER_CHANNEL0_DATA_PORT); + __nop(); + TimerValue |= __inbyte(TIMER_CHANNEL0_DATA_PORT) << 8; + + return TimerValue; +} + +VOID +NTAPI +HalpSetTimerRollOver(USHORT RollOver) +{ ULONG_PTR Flags; TIMER_CONTROL_PORT_REGISTER TimerControl; - - /* Check the CPU Type */ - if (Prcb->CpuType <= 4) - { - /* 486's or equal can't go higher then 10ms */ - HalpLargestClockMS = 10; - HalpNextMSRate = 9; - } - - /* Get increment and rollover for the largest time clock ms possible */ - Increment = HalpRolloverTable[HalpLargestClockMS - 1].HighPart; - RollOver = (USHORT)HalpRolloverTable[HalpLargestClockMS - 1].LowPart; - - /* Set the maximum and minimum increment with the kernel */ - HalpCurrentTimeIncrement = Increment; - KeSetTimeIncrement(Increment, HalpRolloverTable[0].HighPart); /* Disable interrupts */ Flags = __readeflags(); @@ -98,9 +104,31 @@ /* Restore interrupts if they were previously enabled */ __writeeflags(Flags); - - /* Save rollover and return */ +} + +VOID +NTAPI +INIT_FUNCTION +HalpInitializeClock(VOID) +{ + ULONG Increment; + USHORT RollOver; + + DPRINT("HalpInitializeClock()\n"); + + /* Get increment and rollover for the largest time clock ms possible */ + Increment = HalpRolloverTable[HalpLargestClockMS - 1].Increment; + RollOver = (USHORT)HalpRolloverTable[HalpLargestClockMS - 1].RollOver; + + /* Set the maximum and minimum increment with the kernel */ + KeSetTimeIncrement(Increment, HalpRolloverTable[0].Increment); + + /* Set the rollover value for the timer */ + HalpSetTimerRollOver(RollOver); + + /* Save rollover and increment */ HalpCurrentRollOver = RollOver; + HalpCurrentTimeIncrement = Increment; } #ifdef _M_IX86 @@ -109,6 +137,7 @@ FASTCALL HalpClockInterruptHandler(IN PKTRAP_FRAME TrapFrame) { + ULONG LastIncrement; KIRQL Irql; /* Enter trap */ @@ -121,16 +150,25 @@ HalpPerfCounter.QuadPart += HalpCurrentRollOver; HalpPerfCounterCutoff = KiEnableTimerWatchdog; + /* Save increment */ + LastIncrement = HalpCurrentTimeIncrement; + /* Check if someone changed the time rate */ if (HalpClockSetMSRate) { - /* Not yet supported */ - UNIMPLEMENTED; - ASSERT(FALSE); + /* Update the global values */ + HalpCurrentTimeIncrement = HalpRolloverTable[HalpNextMSRate - 1].Increment; + HalpCurrentRollOver = HalpRolloverTable[HalpNextMSRate - 1].RollOver; + + /* Set new timer rollover */ + HalpSetTimerRollOver((USHORT)HalpCurrentRollOver); + + /* We're done */ + HalpClockSetMSRate = FALSE; } /* Update the system time -- the kernel will exit this trap */ - KeUpdateSystemTime(TrapFrame, HalpCurrentTimeIncrement, Irql); + KeUpdateSystemTime(TrapFrame, LastIncrement, Irql); } /* Spurious, just end the interrupt */ @@ -206,7 +244,58 @@ HalpClockSetMSRate = TRUE; /* Return the increment */ - return HalpRolloverTable[Increment - 1].HighPart; + return HalpRolloverTable[Increment - 1].Increment; +} + +LARGE_INTEGER +NTAPI +KeQueryPerformanceCounter(PLARGE_INTEGER PerformanceFrequency) +{ + LARGE_INTEGER CurrentPerfCounter; + ULONG CounterValue, ClockDelta; + + /* If caller wants performance frequency, return hardcoded value */ + if (PerformanceFrequency) PerformanceFrequency->QuadPart = PIT_FREQUENCY; + + /* Check if we were called too early */ + if (HalpCurrentRollOver == 0) return HalpPerfCounter; + + /* Check if interrupts are disabled */ + if(!(__readeflags() & EFLAGS_INTERRUPT_MASK)) return HalpPerfCounter; + + do + { + /* Get the current performance counter value */ + CurrentPerfCounter = HalpPerfCounter; + + /* Read the 8254 counter value */ + CounterValue = HalpRead8254Value(); + + /* Repeat if the value has changed (a clock interrupt happened) */ + } while (CurrentPerfCounter.QuadPart != HalpPerfCounter.QuadPart); + + /* After someone changed the clock rate, during the first clock cycle we + might see a counter value larger than the rollover. In this case we + pretend it already has the new rollover value. */ + if (CounterValue > HalpCurrentRollOver) CounterValue = HalpCurrentRollOver; + + /* The interrupt is issued on the falling edge of the OUT line, when the + counter changes from 1 to max. Calculate a clock delta, so that directly + after the interrupt it is 0, going up to (HalpCurrentRollOver - 1). */ + ClockDelta = HalpCurrentRollOver - CounterValue; + + /* Add the clock delta */ + CurrentPerfCounter.QuadPart += ClockDelta; + + /* This must be true unless HalpPerfCounter has changed sign, + which takes approximately 245,118 years */ + ASSERT(CurrentPerfCounter.QuadPart >= HalpLastPerfCounter.QuadPart); + + /* Update the last counter value */ + HalpLastPerfCounter = CurrentPerfCounter; + + /* Return the result */ + return CurrentPerfCounter; } /* EOF */

1 0

[tkreuzer] 53494: [INTRIN] - add __nop()
by tkreuzer＠svn.reactos.org 29 Aug '11

29 Aug '11

Author: tkreuzer Date: Mon Aug 29 23:10:04 2011 New Revision: 53494 URL: http://svn.reactos.org/svn/reactos?rev=53494&view=rev Log: [INTRIN] - add __nop() Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Mon Aug 29 23:10:04 2011 @@ -1505,11 +1505,18 @@ __asm__ __volatile__("sidt %0" : : "m"(*(short*)Destination) : "memory"); } +/*** Misc operations ***/ + __INTRIN_INLINE void _mm_pause(void) { __asm__ __volatile__("pause" : : : "memory"); } +__INTRIN_INLINE void __nop(void) +{ + __asm__ __volatile__("nop"); +} + #ifdef __cplusplus } #endif

1 0

[gadamopoulos] 53493: [win32k] - attempt to fix build
by gadamopoulos＠svn.reactos.org 29 Aug '11

29 Aug '11

Author: gadamopoulos Date: Mon Aug 29 17:49:01 2011 New Revision: 53493 URL: http://svn.reactos.org/svn/reactos?rev=53493&view=rev Log: [win32k] - attempt to fix build Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Aug 29 17:49:01 2011 @@ -218,7 +218,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR_CH(UserMsgCall,"Failed to copy result from user mode!\n"); + ERR("Failed to copy result from user mode!\n"); Status = _SEH2_GetExceptionCode(); } _SEH2_END; @@ -229,7 +229,7 @@ if (!NT_SUCCESS(Status)) { - ERR_CH(UserMsgCall,"Call to user mode failed!\n"); + ERR("Call to user mode failed!\n"); if (0 < lParamBufferSize) { IntCbFreeMemory(Arguments);

1 0

[gadamopoulos] 53492: [win32k] - revert r53355. - it's changes are not needed as wine's spy channel is better, and this time we will get rid of all unwanted changes ( my previous commit did not fix...
by gadamopoulos＠svn.reactos.org 29 Aug '11

29 Aug '11

Author: gadamopoulos Date: Mon Aug 29 17:30:11 2011 New Revision: 53492 URL: http://svn.reactos.org/svn/reactos?rev=53492&view=rev Log: [win32k] - revert r53355. - it's changes are not needed as wine's spy channel is better, and this time we will get rid of all unwanted changes ( my previous commit did not fix all unwanted changes) Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] Mon Aug 29 17:30:11 2011 @@ -97,7 +97,6 @@ DbgChUserMisc, DbgChUserMonitor, DbgChUserMsg, - DbgChUserMsgCall, DbgChUserMsgQ, DbgChUserObj, DbgChUserPainting, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Aug 29 17:30:11 2011 @@ -173,8 +173,6 @@ ULONG ResultLength; ULONG ArgumentLength; LRESULT Result; - - TRACE_CH(UserMsgCall,"hwnd:0x%x, msg:%d, wparam:%d, lparam:%d\n", Wnd, Message, wParam, lParam); if (0 < lParamBufferSize) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Mon Aug 29 17:30:11 2011 @@ -164,9 +164,8 @@ { if (hWndPrev) { - TRACE("sending WM_KILLFOCUS to hwnd 0x%x\n", hWndPrev); IntNotifyWinEvent(EVENT_OBJECT_FOCUS, NULL, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntSendMessage(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); + co_IntPostOrSendMessage(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); } } @@ -177,7 +176,7 @@ { PWND pWnd = UserGetWindowObject(hWnd); IntNotifyWinEvent(EVENT_OBJECT_FOCUS, pWnd, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntSendMessage(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0); + co_IntPostOrSendMessage(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0); } } @@ -403,14 +402,13 @@ return 0; } ThreadQueue->FocusWindow = Window->head.h; - TRACE("Focus: 0x%x -> 0x%x\n", hWndPrev, Window->head.h); + TRACE("Focus: %d -> %d\n", hWndPrev, Window->head.h); co_IntSendKillFocusMessages(hWndPrev, Window->head.h); co_IntSendSetFocusMessages(hWndPrev, Window->head.h); } else { - TRACE("Focus: 0x%x -> 0x%x\n", hWndPrev, 0); ThreadQueue->FocusWindow = 0; if (co_HOOK_CallHooks( WH_CBT, HCBT_SETFOCUS, (WPARAM)0, (LPARAM)hWndPrev)) { @@ -699,7 +697,7 @@ DECLARE_RETURN(HWND); HWND ret; - TRACE("Enter NtUserSetFocus(0x%x)\n", hWnd); + TRACE("Enter NtUserSetFocus(%x)\n", hWnd); UserEnterExclusive(); if (hWnd) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Aug 29 17:30:11 2011 @@ -1182,7 +1182,6 @@ if (!(Window = UserGetWindowObject(hWnd))) { - ERR("UserGetWindowObject filed!\n"); RETURN( FALSE); } @@ -1197,7 +1196,6 @@ { if (Win32Thread->TIF_flags & TIF_INCLEANUP) { - ERR("Trying to send message to a thread in cleanup\n"); /* Never send messages to exiting threads */ RETURN( FALSE); } Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Mon Aug 29 17:30:11 2011 @@ -78,7 +78,6 @@ {L"UserMisc", DbgChUserMisc}, {L"UserMonitor", DbgChUserMonitor}, {L"UserMsg", DbgChUserMsg}, - {L"UserMsgCall", DbgChUserMsgCall}, {L"UserMsgQ", DbgChUserMsgQ}, {L"UserObj", DbgChUserObj}, {L"UserPainting", DbgChUserPainting},

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2011