Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[hpoussin] 23708: Add an assert in IntEngCreateXlate

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Aug 25 19:49:31 2006 New Revision: 23708 URL: http://svn.reactos.org/svn/reactos?rev=23708&view=rev Log: Add an assert in IntEngCreateXlate Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c Fri Aug 25 19:49:31 2006 @@ -158,6 +158,9 @@ ULONG DestRedMask = 0, DestGreenMask = 0, DestBlueMask = 0; ULONG i; + ASSERT(SourcePalType || PaletteSource); + ASSERT(DestPalType || PaletteDest); + XlateGDI = EngAllocMem(0, sizeof(XLATEGDI), TAG_XLATEOBJ); if (XlateGDI == NULL) {

18 years, 4 months

[ion] 23707: - Viva la deprecation! Trunk should now boot and the installer should work. - Basically revert the new HAL/KERNEL IRQ code by putting the old one in, but without the actual pain of svn reverting and losing all the previous code. - The old code goes in ntoskrnl\deprecated, and we only add a comment to the .rbuild file, re-export an old function, and initialize the old code in kernel.c. All the other kernel changes stay in-place to be tested. - Same for hal, basically replace irq.S wi

by ion＠svn.reactos.org

Author: ion Date: Fri Aug 25 18:50:01 2006 New Revision: 23707 URL: http://svn.reactos.org/svn/reactos?rev=23707&view=rev Log: - Viva la deprecation! Trunk should now boot and the installer should work. - Basically revert the new HAL/KERNEL IRQ code by putting the old one in, but without the actual pain of svn reverting and losing all the previous code. - The old code goes in ntoskrnl\deprecated, and we only add a comment to the .rbuild file, re-export an old function, and initialize the old code in kernel.c. All the other kernel changes stay in-place to be tested. - Same for hal, basically replace irq.S with irql.c in the .rbuild file, and disable the call to Halpinit1. All the other changes remain. Added: trunk/reactos/hal/halx86/generic/irql.c trunk/reactos/ntoskrnl/deprecated/ trunk/reactos/ntoskrnl/deprecated/irq.c trunk/reactos/ntoskrnl/deprecated/irqhand.S Modified: trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ntoskrnl.def trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Fri Aug 25 18:50:01 2006 @@ -31,7 +31,7 @@ <define name="_NTHAL_" /> <define name="__USE_W32API" /> <file>ipi.c</file> - <file>irq.S</file> + <file>irql.c</file> <file>processor.c</file> <file>resource.c</file> <file>spinlock.c</file> Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Fri Aug 25 18:50:01 2006 @@ -43,7 +43,7 @@ else if (BootPhase == 1) { /* Initialize the clock interrupt */ - HalpInitPhase1(); + //HalpInitPhase1(); /* Initialize display and make the screen black */ HalInitializeDisplay ((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); Added: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (added) +++ trunk/reactos/hal/halx86/generic/irql.c Fri Aug 25 18:50:01 2006 @@ -1,0 +1,425 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/hal/x86/irql.c + * PURPOSE: Implements IRQLs + * PROGRAMMER: David Welch (welch(a)cwcom.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ******************************************************************/ + +/* + * FIXME: Use EISA_CONTROL STRUCTURE INSTEAD OF HARD-CODED OFFSETS +*/ + +typedef union +{ + USHORT both; + struct + { + BYTE master; + BYTE slave; + }; +} +PIC_MASK; + +/* + * PURPOSE: - Mask for HalEnableSystemInterrupt and HalDisableSystemInterrupt + * - At startup enable timer and cascade + */ +#if defined(__GNUC__) +static PIC_MASK pic_mask = {.both = 0xFFFA}; +#else +static PIC_MASK pic_mask = { 0xFFFA }; +#endif + + +/* + * PURPOSE: Mask for disabling of acknowledged interrupts + */ +#if defined(__GNUC__) +static PIC_MASK pic_mask_intr = {.both = 0x0000}; +#else +static PIC_MASK pic_mask_intr = { 0 }; +#endif + +static ULONG HalpPendingInterruptCount[NR_IRQS]; + +#define DIRQL_TO_IRQ(x) (PROFILE_LEVEL - x) +#define IRQ_TO_DIRQL(x) (PROFILE_LEVEL - x) + +VOID STDCALL +KiInterruptDispatch2 (ULONG Irq, KIRQL old_level); + +/* FUNCTIONS ****************************************************************/ + +#undef KeGetCurrentIrql +KIRQL STDCALL KeGetCurrentIrql (VOID) +/* + * PURPOSE: Returns the current irq level + * RETURNS: The current irq level + */ +{ + return(KeGetPcr()->Irql); +} + +VOID NTAPI HalpInitPICs(VOID) +{ + memset(HalpPendingInterruptCount, 0, sizeof(HalpPendingInterruptCount)); + + /* Initialization sequence */ + WRITE_PORT_UCHAR((PUCHAR)0x20, 0x11); + WRITE_PORT_UCHAR((PUCHAR)0xa0, 0x11); + /* Start of hardware irqs (0x24) */ + WRITE_PORT_UCHAR((PUCHAR)0x21, IRQ_BASE); + WRITE_PORT_UCHAR((PUCHAR)0xa1, IRQ_BASE + 8); + /* 8259-1 is master */ + WRITE_PORT_UCHAR((PUCHAR)0x21, 0x4); + /* 8259-2 is slave */ + WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x2); + /* 8086 mode */ + WRITE_PORT_UCHAR((PUCHAR)0x21, 0x1); + WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x1); + /* Enable interrupts */ + WRITE_PORT_UCHAR((PUCHAR)0x21, pic_mask.master); + WRITE_PORT_UCHAR((PUCHAR)0xa1, pic_mask.slave); + + /* We can now enable interrupts */ + Ki386EnableInterrupts(); +} + +VOID HalpEndSystemInterrupt(KIRQL Irql) +/* + * FUNCTION: Enable all irqs with higher priority. + */ +{ + ULONG flags; + const USHORT mask[] = + { + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0xc000, 0xe000, 0xf000, + 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80, 0xffc0, 0xffe0, 0xfff0, + 0xfff8, 0xfffc, 0xfffe, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, + }; + + /* Interrupts should be disable while enabling irqs of both pics */ + Ki386SaveFlags(flags); + Ki386DisableInterrupts(); + + pic_mask_intr.both &= mask[Irql]; + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); + + /* restore flags */ + Ki386RestoreFlags(flags); +} + +VOID STATIC +HalpExecuteIrqs(KIRQL NewIrql) +{ + ULONG IrqLimit, i; + + IrqLimit = min(PROFILE_LEVEL - NewIrql, NR_IRQS); + + /* + * For each irq if there have been any deferred interrupts then now + * dispatch them. + */ + for (i = 0; i < IrqLimit; i++) + { + if (HalpPendingInterruptCount[i] > 0) + { + KeGetPcr()->Irql = (KIRQL)IRQ_TO_DIRQL(i); + + while (HalpPendingInterruptCount[i] > 0) + { + /* + * For each deferred interrupt execute all the handlers at DIRQL. + */ + HalpPendingInterruptCount[i]--; + KiInterruptDispatch2(i + IRQ_BASE, NewIrql); + } + KeGetPcr()->Irql--; + HalpEndSystemInterrupt(KeGetPcr()->Irql); + } + } + +} + +VOID STATIC +HalpLowerIrql(KIRQL NewIrql) +{ + if (NewIrql >= PROFILE_LEVEL) + { + KeGetPcr()->Irql = NewIrql; + return; + } + HalpExecuteIrqs(NewIrql); + if (NewIrql >= DISPATCH_LEVEL) + { + KeGetPcr()->Irql = NewIrql; + return; + } + KeGetPcr()->Irql = DISPATCH_LEVEL; + if (((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST]) + { + ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = FALSE; + KiDispatchInterrupt(); + } + KeGetPcr()->Irql = APC_LEVEL; + if (NewIrql == APC_LEVEL) + { + return; + } + if (KeGetCurrentThread() != NULL && + KeGetCurrentThread()->ApcState.KernelApcPending) + { + KiDeliverApc(KernelMode, NULL, NULL); + } + KeGetPcr()->Irql = PASSIVE_LEVEL; +} + +/********************************************************************** + * NAME EXPORTED + * KfLowerIrql + * + * DESCRIPTION + * Restores the irq level on the current processor + * + * ARGUMENTS + * NewIrql = Irql to lower to + * + * RETURN VALUE + * None + * + * NOTES + * Uses fastcall convention + */ +VOID FASTCALL +KfLowerIrql (KIRQL NewIrql) +{ + DPRINT("KfLowerIrql(NewIrql %d)\n", NewIrql); + + if (NewIrql > KeGetPcr()->Irql) + { + DbgPrint ("(%s:%d) NewIrql %x CurrentIrql %x\n", + __FILE__, __LINE__, NewIrql, KeGetPcr()->Irql); + KEBUGCHECK(0); + for(;;); + } + + HalpLowerIrql(NewIrql); +} + +/********************************************************************** + * NAME EXPORTED + * KfRaiseIrql + * + * DESCRIPTION + * Raises the hardware priority (irql) + * + * ARGUMENTS + * NewIrql = Irql to raise to + * + * RETURN VALUE + * previous irq level + * + * NOTES + * Uses fastcall convention + */ + +KIRQL FASTCALL +KfRaiseIrql (KIRQL NewIrql) +{ + KIRQL OldIrql; + + DPRINT("KfRaiseIrql(NewIrql %d)\n", NewIrql); + + if (NewIrql < KeGetPcr()->Irql) + { + DbgPrint ("%s:%d CurrentIrql %x NewIrql %x\n", + __FILE__,__LINE__,KeGetPcr()->Irql,NewIrql); + KEBUGCHECK (0); + for(;;); + } + + OldIrql = KeGetPcr()->Irql; + KeGetPcr()->Irql = NewIrql; + return OldIrql; +} + +/********************************************************************** + * NAME EXPORTED + * KeRaiseIrqlToDpcLevel + * + * DESCRIPTION + * Raises the hardware priority (irql) to DISPATCH level + * + * ARGUMENTS + * None + * + * RETURN VALUE + * Previous irq level + * + * NOTES + * Calls KfRaiseIrql + */ + +KIRQL STDCALL +KeRaiseIrqlToDpcLevel (VOID) +{ + return KfRaiseIrql (DISPATCH_LEVEL); +} + + +/********************************************************************** + * NAME EXPORTED + * KeRaiseIrqlToSynchLevel + * + * DESCRIPTION + * Raises the hardware priority (irql) to CLOCK2 level + * + * ARGUMENTS + * None + * + * RETURN VALUE + * Previous irq level + * + * NOTES + * Calls KfRaiseIrql + */ + +KIRQL STDCALL +KeRaiseIrqlToSynchLevel (VOID) +{ + return KfRaiseIrql (CLOCK2_LEVEL); +} + + +BOOLEAN STDCALL +HalBeginSystemInterrupt (KIRQL Irql, + ULONG Vector, + PKIRQL OldIrql) +{ + ULONG irq; + if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) + { + return(FALSE); + } + irq = Vector - IRQ_BASE; + pic_mask_intr.both |= ((1 << irq) & 0xfffe); // do not disable the timer interrupt + + if (irq < 8) + { + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); + WRITE_PORT_UCHAR((PUCHAR)0x20, 0x20); + } + else + { + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); + /* Send EOI to the PICs */ + WRITE_PORT_UCHAR((PUCHAR)0x20,0x20); + WRITE_PORT_UCHAR((PUCHAR)0xa0,0x20); + } + + if (KeGetPcr()->Irql >= Irql) + { + HalpPendingInterruptCount[irq]++; + return(FALSE); + } + *OldIrql = KeGetPcr()->Irql; + KeGetPcr()->Irql = Irql; + + return(TRUE); +} + + +VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) +/* + * FUNCTION: Finish a system interrupt and restore the specified irq level. + */ +{ + HalpLowerIrql(Irql); + HalpEndSystemInterrupt(Irql); +} + +BOOLEAN +STDCALL +HalDisableSystemInterrupt( + ULONG Vector, + KIRQL Irql) +{ + ULONG irq; + + if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) + return FALSE; + + irq = Vector - IRQ_BASE; + pic_mask.both |= (1 << irq); + if (irq < 8) + { + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.slave)); + } + else + { + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); + } + + return TRUE; +} + + +BOOLEAN +STDCALL +HalEnableSystemInterrupt( + ULONG Vector, + KIRQL Irql, + KINTERRUPT_MODE InterruptMode) +{ + ULONG irq; + + if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) + return FALSE; + + irq = Vector - IRQ_BASE; + pic_mask.both &= ~(1 << irq); + if (irq < 8) + { + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); + } + else + { + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); + } + + return TRUE; +} + + +VOID FASTCALL +HalRequestSoftwareInterrupt( + IN KIRQL Request) +{ + switch (Request) + { + case APC_LEVEL: + ((PKIPCR)KeGetPcr())->HalReserved[HAL_APC_REQUEST] = TRUE; + break; + + case DISPATCH_LEVEL: + ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = TRUE; + break; + + default: + KEBUGCHECK(0); + } +} + +/* EOF */ Added: trunk/reactos/ntoskrnl/deprecated/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irq.c?… ============================================================================== --- trunk/reactos/ntoskrnl/deprecated/irq.c (added) +++ trunk/reactos/ntoskrnl/deprecated/irq.c Fri Aug 25 18:50:01 2006 @@ -1,0 +1,780 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ke/i386/irq.c + * PURPOSE: IRQ handling + * + * PROGRAMMERS: David Welch (welch(a)mcmail.com) + */ + +/* + * NOTE: In general the PIC interrupt priority facilities are used to + * preserve the NT IRQL semantics, global interrupt disables are only used + * to keep the PIC in a consistent state + * + */ + +/* INCLUDES ****************************************************************/ + +#include <ntoskrnl.h> +#include <../hal/halx86/include/halirq.h> +#include <../hal/halx86/include/mps.h> + +#define NDEBUG +#include <internal/debug.h> + +extern KDPC KiExpireTimerDpc; +extern ULONG KiMaximumDpcQueueDepth; +extern ULONG KiMinimumDpcRate; +extern ULONG KiAdjustDpcThreshold; +extern ULONG KiIdealDpcRate; +extern LONG KiTickOffset; +extern ULONG KeMaximumIncrement; +extern ULONG KeMinimumIncrement; +extern ULONG KeTimeAdjustment; +extern BOOLEAN KiClockSetupComplete; + +/* GLOBALS *****************************************************************/ + +/* Interrupt handler list */ + +#ifdef CONFIG_SMP + +#define INT_NAME2(intnum) KiUnexpectedInterrupt##intnum + +#define BUILD_INTERRUPT_HANDLER(intnum) \ +VOID INT_NAME2(intnum)(VOID); + +#define D(x,y) \ + BUILD_INTERRUPT_HANDLER(x##y) + +#define D16(x) \ + D(x,0) D(x,1) D(x,2) D(x,3) \ + D(x,4) D(x,5) D(x,6) D(x,7) \ + D(x,8) D(x,9) D(x,A) D(x,B) \ + D(x,C) D(x,D) D(x,E) D(x,F) + +D16(3) D16(4) D16(5) D16(6) +D16(7) D16(8) D16(9) D16(A) +D16(B) D16(C) D16(D) D16(E) +D16(F) + +#define L(x,y) \ + (ULONG)& INT_NAME2(x##y) + +#define L16(x) \ + L(x,0), L(x,1), L(x,2), L(x,3), \ + L(x,4), L(x,5), L(x,6), L(x,7), \ + L(x,8), L(x,9), L(x,A), L(x,B), \ + L(x,C), L(x,D), L(x,E), L(x,F) + +static ULONG irq_handler[ROUND_UP(NR_IRQS, 16)] = { + L16(3), L16(4), L16(5), L16(6), + L16(7), L16(8), L16(9), L16(A), + L16(B), L16(C), L16(D), L16(E) +}; + +#undef L +#undef L16 +#undef D +#undef D16 + +#else /* CONFIG_SMP */ + +void irq_handler_0(void); +void irq_handler_1(void); +void irq_handler_2(void); +void irq_handler_3(void); +void irq_handler_4(void); +void irq_handler_5(void); +void irq_handler_6(void); +void irq_handler_7(void); +void irq_handler_8(void); +void irq_handler_9(void); +void irq_handler_10(void); +void irq_handler_11(void); +void irq_handler_12(void); +void irq_handler_13(void); +void irq_handler_14(void); +void irq_handler_15(void); + +static unsigned int irq_handler[NR_IRQS]= +{ + (int)&irq_handler_0, + (int)&irq_handler_1, + (int)&irq_handler_2, + (int)&irq_handler_3, + (int)&irq_handler_4, + (int)&irq_handler_5, + (int)&irq_handler_6, + (int)&irq_handler_7, + (int)&irq_handler_8, + (int)&irq_handler_9, + (int)&irq_handler_10, + (int)&irq_handler_11, + (int)&irq_handler_12, + (int)&irq_handler_13, + (int)&irq_handler_14, + (int)&irq_handler_15, +}; + +#endif /* CONFIG_SMP */ + +/* + * PURPOSE: Object describing each isr + * NOTE: The data in this table is only modified at passsive level but can + * be accessed at any irq level. + */ + +typedef struct +{ + LIST_ENTRY ListHead; + KSPIN_LOCK Lock; + ULONG Count; +} +ISR_TABLE, *PISR_TABLE; + +#ifdef CONFIG_SMP +static ISR_TABLE IsrTable[NR_IRQS][MAXIMUM_PROCESSORS]; +#else +static ISR_TABLE IsrTable[NR_IRQS][1]; +#endif + +#define TAG_ISR_LOCK TAG('I', 'S', 'R', 'L') +extern IDT_DESCRIPTOR KiIdt[256]; + +/* FUNCTIONS ****************************************************************/ + +#define PRESENT (0x8000) +#define I486_INTERRUPT_GATE (0xe00) + +VOID +INIT_FUNCTION +NTAPI +KeInitInterrupts (VOID) +{ + int i, j; + + + /* + * Setup the IDT entries to point to the interrupt handlers + */ + for (i=0;i<NR_IRQS;i++) + { + KiIdt[IRQ_BASE+i].a=(irq_handler[i]&0xffff)+(KGDT_R0_CODE<<16); + KiIdt[IRQ_BASE+i].b=(irq_handler[i]&0xffff0000)+PRESENT+ + I486_INTERRUPT_GATE; +#ifdef CONFIG_SMP + for (j = 0; j < MAXIMUM_PROCESSORS; j++) +#else + j = 0; +#endif + { + InitializeListHead(&IsrTable[i][j].ListHead); + KeInitializeSpinLock(&IsrTable[i][j].Lock); + IsrTable[i][j].Count = 0; + } + } +} + +STATIC VOID +KeIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame, + PKTRAP_FRAME TrapFrame) +{ + TrapFrame->SegGs = (USHORT)IrqTrapFrame->Gs; + TrapFrame->SegFs = (USHORT)IrqTrapFrame->Fs; + TrapFrame->SegEs = (USHORT)IrqTrapFrame->Es; + TrapFrame->SegDs = (USHORT)IrqTrapFrame->Ds; + TrapFrame->Eax = IrqTrapFrame->Eax; + TrapFrame->Ecx = IrqTrapFrame->Ecx; + TrapFrame->Edx = IrqTrapFrame->Edx; + TrapFrame->Ebx = IrqTrapFrame->Ebx; + TrapFrame->HardwareEsp = IrqTrapFrame->Esp; + TrapFrame->Ebp = IrqTrapFrame->Ebp; + TrapFrame->Esi = IrqTrapFrame->Esi; + TrapFrame->Edi = IrqTrapFrame->Edi; + TrapFrame->Eip = IrqTrapFrame->Eip; + TrapFrame->SegCs = IrqTrapFrame->Cs; + TrapFrame->EFlags = IrqTrapFrame->Eflags; +} + +STATIC VOID +KeTrapFrameToIRQTrapFrame(PKTRAP_FRAME TrapFrame, + PKIRQ_TRAPFRAME IrqTrapFrame) +{ + IrqTrapFrame->Gs = TrapFrame->SegGs; + IrqTrapFrame->Fs = TrapFrame->SegFs; + IrqTrapFrame->Es = TrapFrame->SegEs; + IrqTrapFrame->Ds = TrapFrame->SegDs; + IrqTrapFrame->Eax = TrapFrame->Eax; + IrqTrapFrame->Ecx = TrapFrame->Ecx; + IrqTrapFrame->Edx = TrapFrame->Edx; + IrqTrapFrame->Ebx = TrapFrame->Ebx; + IrqTrapFrame->Esp = TrapFrame->HardwareEsp; + IrqTrapFrame->Ebp = TrapFrame->Ebp; + IrqTrapFrame->Esi = TrapFrame->Esi; + IrqTrapFrame->Edi = TrapFrame->Edi; + IrqTrapFrame->Eip = TrapFrame->Eip; + IrqTrapFrame->Cs = TrapFrame->SegCs; + IrqTrapFrame->Eflags = TrapFrame->EFlags; +} + +/* + * NOTE: On Windows this function takes exactly one parameter and EBP is + * guaranteed to point to KTRAP_FRAME. The function is used only + * by HAL, so there's no point in keeping that prototype. + * + * @implemented + */ +VOID +STDCALL +KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, + IN KIRQL Irql) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + PKTHREAD CurrentThread; + PKPROCESS CurrentProcess; + + /* Make sure we don't go further if we're in early boot phase. */ + if (!(Prcb) || !(Prcb->CurrentThread)) return; + + /* Get the current thread and process */ + CurrentThread = Prcb->CurrentThread; + CurrentProcess = CurrentThread->ApcState.Process; + + /* Check if we came from user mode */ + if (TrapFrame->PreviousPreviousMode != KernelMode) + { + /* Update user times */ + CurrentThread->UserTime++; + InterlockedIncrement((PLONG)&CurrentProcess->UserTime); + Prcb->UserTime++; + } + else + { + /* Check IRQ */ + if (Irql > DISPATCH_LEVEL) + { + /* This was an interrupt */ + Prcb->InterruptTime++; + } + else if ((Irql < DISPATCH_LEVEL) || !(Prcb->DpcRoutineActive)) + { + /* This was normal kernel time */ + CurrentThread->KernelTime++; + InterlockedIncrement((PLONG)&CurrentProcess->KernelTime); + } + else if (Irql == DISPATCH_LEVEL) + { + /* This was DPC time */ + Prcb->DpcTime++; + } + + /* Update CPU kernel time in all cases */ + Prcb->KernelTime++; + } + + /* Set the last DPC Count and request rate */ + Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; + Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + + Prcb->DpcRequestRate) / 2; + + /* Check if we should request a DPC */ + if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) + { + /* Request one */ + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + + /* Update the depth if needed */ + if ((Prcb->DpcRequestRate < KiIdealDpcRate) && + (Prcb->MaximumDpcQueueDepth > 1)) + { + /* Decrease the maximum depth by one */ + Prcb->MaximumDpcQueueDepth--; + } + } + else + { + /* Decrease the adjustment threshold */ + if (!(--Prcb->AdjustDpcThreshold)) + { + /* We've hit 0, reset it */ + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + + /* Check if we've hit queue maximum */ + if (KiMaximumDpcQueueDepth != Prcb->MaximumDpcQueueDepth) + { + /* Increase maximum by one */ + Prcb->MaximumDpcQueueDepth++; + } + } + } + + /* + * If we're at end of quantum request software interrupt. The rest + * is handled in KiDispatchInterrupt. + * + * NOTE: If one stays at DISPATCH_LEVEL for a long time the DPC routine + * which checks for quantum end will not be executed and decrementing + * the quantum here can result in overflow. This is not a problem since + * we don't care about the quantum value anymore after the QuantumEnd + * flag is set. + */ + if ((CurrentThread->Quantum -= 3) <= 0) + { + Prcb->QuantumEnd = TRUE; + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + } +} + + +/* + * NOTE: On Windows this function takes exactly zero parameters and EBP is + * guaranteed to point to KTRAP_FRAME. Also [esp+0] contains an IRQL. + * The function is used only by HAL, so there's no point in keeping + * that prototype. + * + * @implemented + */ +VOID +STDCALL +KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, + IN KIRQL Irql, + IN ULONG Increment) +{ + LONG OldOffset; + LARGE_INTEGER Time; + ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL); + if (!KiClockSetupComplete) return; + + /* Update interrupt time */ + Time.LowPart = SharedUserData->InterruptTime.LowPart; + Time.HighPart = SharedUserData->InterruptTime.High1Time; + Time.QuadPart += Increment; + SharedUserData->InterruptTime.High2Time = Time.u.HighPart; + SharedUserData->InterruptTime.LowPart = Time.u.LowPart; + SharedUserData->InterruptTime.High1Time = Time.u.HighPart; + + /* Increase the tick offset */ + KiTickOffset -= Increment; + OldOffset = KiTickOffset; + + /* Check if this isn't a tick yet */ + if (KiTickOffset > 0) + { + /* Expire timers */ + KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); + } + else + { + /* Setup time structure for system time */ + Time.LowPart = SharedUserData->SystemTime.LowPart; + Time.HighPart = SharedUserData->SystemTime.High1Time; + Time.QuadPart += KeTimeAdjustment; + SharedUserData->SystemTime.High2Time = Time.HighPart; + SharedUserData->SystemTime.LowPart = Time.LowPart; + SharedUserData->SystemTime.High1Time = Time.HighPart; + + /* Setup time structure for tick time */ + Time.LowPart = KeTickCount.LowPart; + Time.HighPart = KeTickCount.High1Time; + Time.QuadPart += 1; + KeTickCount.High2Time = Time.HighPart; + KeTickCount.LowPart = Time.LowPart; + KeTickCount.High1Time = Time.HighPart; + SharedUserData->TickCount.High2Time = Time.HighPart; + SharedUserData->TickCount.LowPart = Time.LowPart; + SharedUserData->TickCount.High1Time = Time.HighPart; + + /* Update tick count in shared user data as well */ + SharedUserData->TickCountLowDeprecated++; + + /* Queue a DPC that will expire timers */ + KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); + } + + /* Update process and thread times */ + if (OldOffset <= 0) + { + /* This was a tick, calculate the next one */ + KiTickOffset += KeMaximumIncrement; + KeUpdateRunTime(TrapFrame, Irql); + } +} + +VOID STDCALL +KiInterruptDispatch2 (ULONG vector, KIRQL old_level) +/* + * FUNCTION: Calls all the interrupt handlers for a given irq. + * ARGUMENTS: + * vector - The number of the vector to call handlers for. + * old_level - The irql of the processor when the irq took place. + * NOTES: Must be called at DIRQL. + */ +{ + PKINTERRUPT isr; + PLIST_ENTRY current; + KIRQL oldlvl; + PISR_TABLE CurrentIsr; + + DPRINT("I(0x%.08x, 0x%.08x)\n", vector, old_level); + + /* + * Iterate the list until one of the isr tells us its device interrupted + */ + CurrentIsr = &IsrTable[vector - IRQ_BASE][(ULONG)KeGetCurrentProcessorNumber()]; + + KiAcquireSpinLock(&CurrentIsr->Lock); + + CurrentIsr->Count++; + current = CurrentIsr->ListHead.Flink; + + while (current != &CurrentIsr->ListHead) + { + isr = CONTAINING_RECORD(current,KINTERRUPT,InterruptListEntry); + oldlvl = KeAcquireInterruptSpinLock(isr); + if (isr->ServiceRoutine(isr, isr->ServiceContext)) + { + KeReleaseInterruptSpinLock(isr, oldlvl); + break; + } + KeReleaseInterruptSpinLock(isr, oldlvl); + current = current->Flink; + } + KiReleaseSpinLock(&CurrentIsr->Lock); +} + +VOID +KiInterruptDispatch3 (ULONG vector, PKIRQ_TRAPFRAME Trapframe) +/* + * FUNCTION: Calls the irq specific handler for an irq + * ARGUMENTS: + * irq = IRQ that has interrupted + */ +{ + KIRQL old_level; + KTRAP_FRAME KernelTrapFrame; + PKTHREAD CurrentThread; + PKTRAP_FRAME OldTrapFrame=NULL; + + /* + * At this point we have interrupts disabled, nothing has been done to + * the PIC. + */ + + KeGetCurrentPrcb()->InterruptCount++; + + /* + * Notify the rest of the kernel of the raised irq level. For the + * default HAL this will send an EOI to the PIC and alter the IRQL. + */ + if (!HalBeginSystemInterrupt (VECTOR2IRQL(vector), + vector, + &old_level)) + { + return; + } + + + /* + * Enable interrupts + * NOTE: Only higher priority interrupts will get through + */ + Ke386EnableInterrupts(); + +#ifndef CONFIG_SMP + if (VECTOR2IRQ(vector) == 0) + { + KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); + KeUpdateSystemTime(&KernelTrapFrame, old_level, 100000); + } + else +#endif + { + /* + * Actually call the ISR. + */ + KiInterruptDispatch2(vector, old_level); + } + + /* + * End the system interrupt. + */ + Ke386DisableInterrupts(); + + if (old_level==PASSIVE_LEVEL && Trapframe->Cs != KGDT_R0_CODE) + { + HalEndSystemInterrupt (APC_LEVEL, 0); + + CurrentThread = KeGetCurrentThread(); + if (CurrentThread!=NULL && CurrentThread->ApcState.UserApcPending) + { + DPRINT("PID: %d, TID: %d CS %04x/%04x\n", + ((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId, + ((PETHREAD)CurrentThread)->Cid.UniqueThread, + Trapframe->Cs, + CurrentThread->TrapFrame ? CurrentThread->TrapFrame->Cs : 0); + if (CurrentThread->TrapFrame == NULL) + { + OldTrapFrame = CurrentThread->TrapFrame; + KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); + CurrentThread->TrapFrame = &KernelTrapFrame; + } + + Ke386EnableInterrupts(); + KiDeliverApc(UserMode, NULL, NULL); + Ke386DisableInterrupts(); + + ASSERT(KeGetCurrentThread() == CurrentThread); + if (CurrentThread->TrapFrame == &KernelTrapFrame) + { + KeTrapFrameToIRQTrapFrame(&KernelTrapFrame, Trapframe); + CurrentThread->TrapFrame = OldTrapFrame; + } + } + KeLowerIrql(PASSIVE_LEVEL); + } + else + { + HalEndSystemInterrupt (old_level, 0); + } + +} + +static VOID +KeDumpIrqList(VOID) +{ + PKINTERRUPT current; + PLIST_ENTRY current_entry; + LONG i, j; + KIRQL oldlvl; + BOOLEAN printed; + + for (i=0;i<NR_IRQS;i++) + { + printed = FALSE; + KeRaiseIrql(VECTOR2IRQL(i + IRQ_BASE),&oldlvl); + + for (j=0; j < KeNumberProcessors; j++) + { + KiAcquireSpinLock(&IsrTable[i][j].Lock); + + current_entry = IsrTable[i][j].ListHead.Flink; + current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); + while (current_entry!=&(IsrTable[i][j].ListHead)) + { + if (printed == FALSE) + { + printed = TRUE; + DPRINT("For irq %x:\n",i); + } + DPRINT(" Isr %x\n",current); + current_entry = current_entry->Flink; + current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); + } + KiReleaseSpinLock(&IsrTable[i][j].Lock); + } + KeLowerIrql(oldlvl); + } +} + +/* + * @implemented + */ +BOOLEAN +STDCALL +KeConnectInterrupt(PKINTERRUPT InterruptObject) +{ + KIRQL oldlvl,synch_oldlvl; + PKINTERRUPT ListHead; + ULONG Vector; + PISR_TABLE CurrentIsr; + BOOLEAN Result; + + DPRINT("KeConnectInterrupt()\n"); + + Vector = InterruptObject->Vector; + + if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) + return FALSE; + + Vector -= IRQ_BASE; + + ASSERT (InterruptObject->Number < KeNumberProcessors); + + KeSetSystemAffinityThread(1 << InterruptObject->Number); + + CurrentIsr = &IsrTable[Vector][(ULONG)InterruptObject->Number]; + + KeRaiseIrql(VECTOR2IRQL(Vector + IRQ_BASE),&oldlvl); + KiAcquireSpinLock(&CurrentIsr->Lock); + + /* + * Check if the vector is already in use that we can share it + */ + if (!IsListEmpty(&CurrentIsr->ListHead)) + { + ListHead = CONTAINING_RECORD(CurrentIsr->ListHead.Flink,KINTERRUPT,InterruptListEntry); + if (InterruptObject->ShareVector == FALSE || ListHead->ShareVector==FALSE) + { + KiReleaseSpinLock(&CurrentIsr->Lock); + KeLowerIrql(oldlvl); + KeRevertToUserAffinityThread(); + return FALSE; + } + } + + synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); + + DPRINT("%x %x\n",CurrentIsr->ListHead.Flink, CurrentIsr->ListHead.Blink); + + Result = HalEnableSystemInterrupt(Vector + IRQ_BASE, InterruptObject->Irql, InterruptObject->Mode); + if (Result) + { + InsertTailList(&CurrentIsr->ListHead,&InterruptObject->InterruptListEntry); + DPRINT("%x %x\n",InterruptObject->InterruptListEntry.Flink, InterruptObject->InterruptListEntry.Blink); + } + + InterruptObject->Connected = TRUE; + KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); + + /* + * Release the table spinlock + */ + KiReleaseSpinLock(&CurrentIsr->Lock); + KeLowerIrql(oldlvl); + + KeDumpIrqList(); + + KeRevertToUserAffinityThread(); + + return Result; +} + +/* + * @implemented + * + * FUNCTION: Releases a drivers isr + * ARGUMENTS: + * InterruptObject = isr to release + */ +BOOLEAN +STDCALL +KeDisconnectInterrupt(PKINTERRUPT InterruptObject) +{ + KIRQL oldlvl,synch_oldlvl; + PISR_TABLE CurrentIsr; + BOOLEAN State; + + DPRINT1("KeDisconnectInterrupt\n"); + ASSERT (InterruptObject->Number < KeNumberProcessors); + + /* Set the affinity */ + KeSetSystemAffinityThread(1 << InterruptObject->Number); + + /* Get the ISR Tabe */ + CurrentIsr = &IsrTable[InterruptObject->Vector - IRQ_BASE] + [(ULONG)InterruptObject->Number]; + + /* Raise IRQL to required level and lock table */ + KeRaiseIrql(VECTOR2IRQL(InterruptObject->Vector),&oldlvl); + KiAcquireSpinLock(&CurrentIsr->Lock); + + /* Check if it's actually connected */ + if ((State = InterruptObject->Connected)) + { + /* Lock the Interrupt */ + synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); + + /* Remove this one, and check if all are gone */ + RemoveEntryList(&InterruptObject->InterruptListEntry); + if (IsListEmpty(&CurrentIsr->ListHead)) + { + /* Completely Disable the Interrupt */ + HalDisableSystemInterrupt(InterruptObject->Vector, InterruptObject->Irql); + } + + /* Disconnect it */ + InterruptObject->Connected = FALSE; + + /* Release the interrupt lock */ + KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); + } + /* Release the table spinlock */ + KiReleaseSpinLock(&CurrentIsr->Lock); + KeLowerIrql(oldlvl); + + /* Go back to default affinity */ + KeRevertToUserAffinityThread(); + + /* Return Old Interrupt State */ + return State; +} + +/* + * @implemented + */ +VOID +STDCALL +KeInitializeInterrupt(PKINTERRUPT Interrupt, + PKSERVICE_ROUTINE ServiceRoutine, + PVOID ServiceContext, + PKSPIN_LOCK SpinLock, + ULONG Vector, + KIRQL Irql, + KIRQL SynchronizeIrql, + KINTERRUPT_MODE InterruptMode, + BOOLEAN ShareVector, + CHAR ProcessorNumber, + BOOLEAN FloatingSave) +{ + /* Set the Interrupt Header */ + Interrupt->Type = InterruptObject; + Interrupt->Size = sizeof(KINTERRUPT); + + /* Check if we got a spinlock */ + if (SpinLock) + { + Interrupt->ActualLock = SpinLock; + } + else + { + /* This means we'll be usin the built-in one */ + KeInitializeSpinLock(&Interrupt->SpinLock); + Interrupt->ActualLock = &Interrupt->SpinLock; + } + + /* Set the other settings */ + Interrupt->ServiceRoutine = ServiceRoutine; + Interrupt->ServiceContext = ServiceContext; + Interrupt->Vector = Vector; + Interrupt->Irql = Irql; + Interrupt->SynchronizeIrql = SynchronizeIrql; + Interrupt->Mode = InterruptMode; + Interrupt->ShareVector = ShareVector; + Interrupt->Number = ProcessorNumber; + Interrupt->FloatingSave = FloatingSave; + + /* Disconnect it at first */ + Interrupt->Connected = FALSE; +} + +VOID KePrintInterruptStatistic(VOID) +{ + LONG i, j; + + for (j = 0; j < KeNumberProcessors; j++) + { + DPRINT1("CPU%d:\n", j); + for (i = 0; i < NR_IRQS; i++) + { + if (IsrTable[i][j].Count) + { + DPRINT1(" Irq %x(%d): %d\n", i, VECTOR2IRQ(i + IRQ_BASE), IsrTable[i][j].Count); + } + } + } +} + +/* EOF */ Added: trunk/reactos/ntoskrnl/deprecated/irqhand.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irqhan… ============================================================================== --- trunk/reactos/ntoskrnl/deprecated/irqhand.S (added) +++ trunk/reactos/ntoskrnl/deprecated/irqhand.S Fri Aug 25 18:50:01 2006 @@ -1,0 +1,89 @@ +#include <ndk/asm.h> +#include <../hal/halx86/include/halirq.h> + +_KiCommonInterrupt: + cld + pushl %ds + pushl %es + pushl %fs + pushl %gs + pushl $0xceafbeef + movl $KGDT_R0_DATA,%eax + movl %eax,%ds + movl %eax,%es + movl %eax,%gs + movl $KGDT_R0_PCR,%eax + movl %eax,%fs + pushl %esp + pushl %ebx + call _KiInterruptDispatch3 + addl $0xC, %esp + popl %gs + popl %fs + popl %es + popl %ds + popa + iret + + +#ifdef CONFIG_SMP + +#define BUILD_INTERRUPT_HANDLER(intnum) \ + .global _KiUnexpectedInterrupt##intnum; \ + _KiUnexpectedInterrupt##intnum:; \ + pusha; \ + movl $0x##intnum, %ebx; \ + jmp _KiCommonInterrupt; + +/* Interrupt handlers and declarations */ + +#define B(x,y) \ + BUILD_INTERRUPT_HANDLER(x##y) + +#define B16(x) \ + B(x,0) B(x,1) B(x,2) B(x,3) \ + B(x,4) B(x,5) B(x,6) B(x,7) \ + B(x,8) B(x,9) B(x,A) B(x,B) \ + B(x,C) B(x,D) B(x,E) B(x,F) + +B16(3) B16(4) B16(5) B16(6) +B16(7) B16(8) B16(9) B16(A) +B16(B) B16(C) B16(D) B16(E) +B16(F) + +#undef B +#undef B16 +#undef BUILD_INTERRUPT_HANDLER + +#else /* CONFIG_SMP */ + +#define BUILD_INTERRUPT_HANDLER(intnum) \ + .global _irq_handler_##intnum; \ + _irq_handler_##intnum:; \ + pusha; \ + movl $(##intnum + IRQ_BASE), %ebx; \ + jmp _KiCommonInterrupt; + +/* Interrupt handlers and declarations */ + +#define B(x) \ + BUILD_INTERRUPT_HANDLER(x) + +B(0) B(1) B(2) B(3) +B(4) B(5) B(6) B(7) +B(8) B(9) B(10) B(11) +B(12) B(13) B(14) B(15) + +#undef B +#undef BUILD_INTERRUPT_HANDLER + +#endif /* CONFIG_SMP */ + +.intel_syntax noprefix +.globl _KiUnexpectedInterrupt@0 +_KiUnexpectedInterrupt@0: + + /* Bugcheck with invalid interrupt code */ + push 0x12 + call _KeBugCheck@4 + Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Fri Aug 25 18:50:01 2006 @@ -94,6 +94,7 @@ SharedUserData->SystemTime.High2Time = SystemBootTime.u.HighPart; SharedUserData->SystemTime.LowPart = SystemBootTime.u.LowPart; SharedUserData->SystemTime.High1Time = SystemBootTime.u.HighPart; + KiClockSetupComplete = TRUE; } VOID Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Fri Aug 25 18:50:01 2006 @@ -380,6 +380,7 @@ InitializeListHead(&KPCR->PrcbData.WaitListHead); KeInitExceptions (); + KeInitInterrupts (); KeActiveProcessors |= 1 << 0; Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Fri Aug 25 18:50:01 2006 @@ -663,6 +663,7 @@ KiCheckForKernelApcDelivery@0 KiDeliverApc@12 KiDispatchInterrupt@0 +KiInterruptDispatch2@8 KiEnableTimerWatchdog KiIpiServiceRoutine@8 @KiReleaseSpinLock@4 Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Fri Aug 25 18:50:01 2006 @@ -33,7 +33,7 @@ <file>exp.c</file> <file>fpu.c</file> <file>gdt.c</file> - <file>irq.c</file> +  <file>kernel.c</file> <file>ldt.c</file> <file>thread.c</file> @@ -68,6 +68,10 @@ <file>usercall.c</file> <file>wait.c</file> </directory> + <directory name="deprecated"> + <file>irqhand.S</file> + <file>irq.c</file> + </directory> <directory name="cc"> <file>cacheman.c</file> <file>copy.c</file>

18 years, 4 months

[ion] 23706: - Fix some bugs

by ion＠svn.reactos.org

Author: ion Date: Fri Aug 25 18:15:11 2006 New Revision: 23706 URL: http://svn.reactos.org/svn/reactos?rev=23706&view=rev Log: - Fix some bugs Modified: trunk/reactos/hal/halx86/generic/irq.S Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Fri Aug 25 18:15:11 2006 @@ -392,7 +392,6 @@ /* There are pending software interrupts, call their handlers */ add esp, 12 jmp SoftIntHandlerTable2[eax*4] - ret 8 .endfunc .globl @KfLowerIrql@4 @@ -443,7 +442,6 @@ /* Get the IRQL and check if it's Software level only */ xor eax, eax mov al, [fs:KPCR_IRQL] - movzx ecx, cl cmp cl, DISPATCH_LEVEL jbe SetIrql @@ -508,7 +506,7 @@ cli /* Mask out interrupts */ - mov eax, KiI8259MaskTable + DISPATCH_LEVEL * 2 + mov eax, KiI8259MaskTable[DISPATCH_LEVEL*4] or eax, [fs:KPCR_IDR] out 0x21, al shr eax, 8

18 years, 4 months

[fireball] 23705: - Enable PIRQ when initializing UHCI, this solves the "no irq" problem on some UHC controllers (most popular type of such controller is the one emulated by VMWare) - Fix a mistake in the source code resulting in a bugcheck - Add _X86 to .rbuild (by Thomas)

by fireball＠svn.reactos.org

Author: fireball Date: Fri Aug 25 17:20:13 2006 New Revision: 23705 URL: http://svn.reactos.org/svn/reactos?rev=23705&view=rev Log: - Enable PIRQ when initializing UHCI, this solves the "no irq" problem on some UHC controllers (most popular type of such controller is the one emulated by VMWare) - Fix a mistake in the source code resulting in a bugcheck - Add _X86 to .rbuild (by Thomas) Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c Fri Aug 25 17:20:13 2006 @@ -405,7 +405,7 @@ purb = NULL; // set the dev state - status = usb_query_and_lock_dev(dev_mgr, purb->endp_handle, &pdev); + status = usb_query_and_lock_dev(dev_mgr, dev_handle, &pdev); if (status != STATUS_SUCCESS) { usb_unlock_dev(pdev); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h Fri Aug 25 17:20:13 2006 @@ -80,8 +80,11 @@ #define USBPORTSC_SUSP 0x1000 /* Suspend */ /* Legacy support register */ -#define USBLEGSUP 0xc0 -#define USBLEGSUP_DEFAULT 0x2000 /* only PIRQ enable set */ +#define USBLEGSUP 0xc0 +#define USBLEGSUP_DEFAULT 0x2000 /* only PIRQ enable set */ +#define USBLEGSUP_RWC 0x8f00 /* the R/WC bits */ +#define USBLEGSUP_RO 0x5040 /* R/O and reserved bits */ + #define UHCI_NULL_DATA_SIZE 0x7FF /* for UHCI controller TD */ Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Fri Aug 25 17:20:13 2006 @@ -908,12 +908,14 @@ } // send cmds to start the uhc -// shamelessly copied from linux's uhci.c +// shamelessly copied from linux's uhci.c (reset_hc(), configure_hc() routines) BOOLEAN uhci_start(PHCD hcd) { PUHCI_DEV uhci; PBYTE io_addr; + USHORT pirq; + PCI_SLOT_NUMBER SlotNum; int timeout = 10000; uhci = uhci_from_hcd(hcd); @@ -946,6 +948,18 @@ WRITE_PORT_USHORT((PUSHORT) (io_addr + USBCMD), USBCMD_RS | USBCMD_CF | USBCMD_MAXP); DbgPrint("uhci_start(): current uhci status=0x%x\n", uhci_status(uhci)); + + /* Enable PIRQ */ + pirq = USBLEGSUP_DEFAULT; + SlotNum.u.AsULONG = 0; + SlotNum.u.bits.DeviceNumber = ((uhci->pdev_ext->pci_addr & 0xff) >> 3); + SlotNum.u.bits.FunctionNumber = (uhci->pdev_ext->pci_addr & 0x07); + + DbgPrint("uhci_start(): set bus %d data at slot 0x%x\n", (uhci->pdev_ext->pci_addr >> 8), + SlotNum.u.AsULONG); + + HalSetBusDataByOffset(PCIConfiguration, (uhci->pdev_ext->pci_addr >> 8), SlotNum.u.AsULONG, + &pirq, USBLEGSUP, sizeof(pirq)); return TRUE; } Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild Fri Aug 25 17:20:13 2006 @@ -1,5 +1,6 @@ <module name="usbdriver" type="kernelmodedriver" installbase="system32/drivers" installname="usbdriver.sys"> <define name="INCLUDE_EHCI" /> + <define name="_X86" /> <include base="usbdriver">.</include> <library>ntoskrnl</library> <library>hal</library>

18 years, 4 months

[janderwald] 23704: * share common painting code * align static control in same way

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 25 16:19:42 2006 New Revision: 23704 URL: http://svn.reactos.org/svn/reactos?rev=23704&view=rev Log: * share common painting code * align static control in same way Modified: trunk/reactos/dll/win32/console/colors.c trunk/reactos/dll/win32/console/console.h trunk/reactos/dll/win32/console/en.rc trunk/reactos/dll/win32/console/font.c trunk/reactos/dll/win32/console/layout.c Modified: trunk/reactos/dll/win32/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/colors.c… ============================================================================== --- trunk/reactos/dll/win32/console/colors.c (original) +++ trunk/reactos/dll/win32/console/colors.c Fri Aug 25 16:19:42 2006 @@ -8,7 +8,6 @@ */ #include "console.h" - static COLORREF s_Colors[] = { @@ -30,7 +29,6 @@ RGB(255, 255, 255) }; -static TCHAR szText[1024]; static @@ -39,43 +37,6 @@ { HBRUSH hBrush; DWORD index; - - if (drawItem->CtlID < IDC_STATIC_COLOR1 || drawItem->CtlID > IDC_STATIC_COLOR16) - { - COLORREF pbkColor, ptColor; - COLORREF nbkColor, ntColor; - /* draw static controls */ - if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR) - { - nbkColor = pConInfo->ScreenBackground; - hBrush = CreateSolidBrush(nbkColor); - ntColor = pConInfo->ScreenText; - } - else - { - nbkColor = pConInfo->PopupBackground; - hBrush = CreateSolidBrush(nbkColor); - ntColor = pConInfo->PopupText; - } - - if (!hBrush) - { - return FALSE; - } - - FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); - DeleteObject((HGDIOBJ)hBrush); - ptColor = SetTextColor(drawItem->hDC, ntColor); - pbkColor = SetBkColor(drawItem->hDC, nbkColor); - if (ntColor != nbkColor) - { - /* hide text when it has same background color as text color */ - DrawText(drawItem->hDC, szText, _tcslen(szText), &drawItem->rcItem, 0); - } - SetTextColor(drawItem->hDC, ptColor); - SetBkColor(drawItem->hDC, pbkColor); - return TRUE; - } index = drawItem->CtlID - IDC_STATIC_COLOR1; hBrush = CreateSolidBrush(s_Colors[index]); @@ -101,6 +62,7 @@ PConsoleInfo pConInfo; LPNMUPDOWN lpnmud; LPPSHNOTIFY lppsn; + LPDRAWITEMSTRUCT drawItem; DWORD red = -1; DWORD green = -1; DWORD blue = -1; @@ -113,8 +75,6 @@ { pConInfo = (PConsoleInfo) ((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); - ZeroMemory(szText, sizeof(szText)); - LoadString(hApplet, IDS_SCREEN_TEXT, szText, sizeof(szText) / sizeof(TCHAR)); SendMessage(GetDlgItem(hwndDlg, IDC_RADIO_SCREEN_BACKGROUND), BM_SETCHECK, BST_CHECKED, 0); SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); @@ -124,7 +84,16 @@ } case WM_DRAWITEM: { - return PaintStaticControls(hwndDlg, pConInfo, (LPDRAWITEMSTRUCT) lParam); + drawItem = (LPDRAWITEMSTRUCT)lParam; + if (drawItem->CtlID >= IDC_STATIC_COLOR1 && drawItem->CtlID <= IDC_STATIC_COLOR16) + { + return PaintStaticControls(hwndDlg, pConInfo, drawItem); + } + else if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR || drawItem->CtlID == IDC_STATIC_POPUP_COLOR) + { + PaintText(drawItem, pConInfo); + return TRUE; + } } case WM_NOTIFY: { Modified: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (original) +++ trunk/reactos/dll/win32/console/console.h Fri Aug 25 16:19:42 2006 @@ -41,6 +41,8 @@ BOOL WriteConsoleOptions(PConsoleInfo pConInfo); void ApplyConsoleInfo(HWND hwndDlg, PConsoleInfo pConInfo); +void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo); +void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo); //globals Modified: trunk/reactos/dll/win32/console/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/en.rc?re… ============================================================================== --- trunk/reactos/dll/win32/console/en.rc (original) +++ trunk/reactos/dll/win32/console/en.rc Fri Aug 25 16:19:42 2006 @@ -45,13 +45,13 @@ BEGIN LTEXT "Window Preview", -1, 10, 7, 65, 10 LTEXT "Size", -1, 130, 10, 30, 10 -CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_BLACKRECT | SS_SUNKEN, 10, 20, 115, 70 +CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Font", -1, 10, 105, 35, 10 CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 -CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_BLACKRECT | SS_SUNKEN, 15, 165, 95, 35 +CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 LTEXT "Each character is:", -1, 130, 165, 75, 10 LTEXT "screen pixel wide\nscreen pixel high", -1, 140, 180, 65, 20 LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 @@ -63,30 +63,30 @@ CAPTION "Layout" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Window Preview", -1, 10, 10, 65, 10 -CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 100, 70 -GROUPBOX "Screen Buffer Size", -1, 115, 15, 115, 40 -LTEXT "&Width:", -1, 120, 30, 25, 10 -LTEXT "&Height:", -1, 120, 40, 25, 10 +LTEXT "Window Preview", -1, 10, 7, 65, 10 +CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 +GROUPBOX "Screen Buffer Size", -1, 130, 15, 115, 40 +LTEXT "&Width:", -1, 135, 30, 25, 10 +LTEXT "&Height:", -1, 135, 40, 25, 10 EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Window Size", -1, 115, 60, 115, 40 -LTEXT "&W&idth:", -1, 120, 70, 25, 10 -LTEXT "&H&eight:", -1, 120, 80, 25, 10 +GROUPBOX "Window Size", -1, 130, 60, 115, 40 +LTEXT "&W&idth:", -1, 135, 70, 25, 10 +LTEXT "&H&eight:", -1, 135, 80, 25, 10 EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Window Position", -1, 115, 105, 115, 55 -LTEXT "&Left:", -1, 120, 120, 25, 10 -LTEXT "&Top:", -1, 120, 130, 25, 10 +GROUPBOX "Window Position", -1, 130, 105, 115, 55 +LTEXT "&Left:", -1, 135, 120, 25, 10 +LTEXT "&Top:", -1, 135, 130, 25, 10 EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 -CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 120, 145, 100, 10 +CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 END IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220 Modified: trunk/reactos/dll/win32/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/console/font.c (original) +++ trunk/reactos/dll/win32/console/font.c Fri Aug 25 16:19:42 2006 @@ -19,6 +19,9 @@ LPARAM lParam ) { + LPDRAWITEMSTRUCT drawItem; + PConsoleInfo pConInfo = (PConsoleInfo)GetWindowLongPtr(hwndDlg, DWLP_USER); + UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(wParam); @@ -26,10 +29,28 @@ switch(uMsg) { case WM_INITDIALOG: + { + pConInfo = (PConsoleInfo) ((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); return TRUE; - + } + case WM_DRAWITEM: + { + drawItem = (LPDRAWITEMSTRUCT)lParam; + if (drawItem->CtlID == IDC_STATIC_FONT_WINDOW_PREVIEW) + { + PaintConsole(drawItem, pConInfo); + } + else if (drawItem->CtlID == IDC_STATIC_SELECT_FONT_PREVIEW) + { + PaintText(drawItem, pConInfo); + } + return TRUE; + } default: + { break; + } } return FALSE; Modified: trunk/reactos/dll/win32/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/layout.c… ============================================================================== --- trunk/reactos/dll/win32/console/layout.c (original) +++ trunk/reactos/dll/win32/console/layout.c Fri Aug 25 16:19:42 2006 @@ -8,6 +8,69 @@ */ #include "console.h" + + + +void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo) +{ + COLORREF bkColor; + HBRUSH hBrush; + + bkColor = GetSysColor(COLOR_BACKGROUND); + hBrush = CreateSolidBrush(bkColor); + + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + //TODO draw console image + //MoveToEx(drawItem->hDC, 0, 0, NULL); + //LineTo(drawItem->hDC, 10, 10); + //MoveToEx(drawItem->hDC, 30, 30, NULL); + //LineTo(drawItem->hDC, 40, 40); + + DeleteObject((HGDIOBJ)hBrush); +} + +void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo) +{ + COLORREF pbkColor, ptColor; + COLORREF nbkColor, ntColor; + HBRUSH hBrush; + TCHAR szText[1024]; + + ZeroMemory(szText, sizeof(szText)); + LoadString(hApplet, IDS_SCREEN_TEXT, szText, sizeof(szText) / sizeof(TCHAR)); + + if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR) + { + nbkColor = pConInfo->ScreenBackground; + hBrush = CreateSolidBrush(nbkColor); + ntColor = pConInfo->ScreenText; + } + else + { + nbkColor = pConInfo->PopupBackground; + hBrush = CreateSolidBrush(nbkColor); + ntColor = pConInfo->PopupText; + } + + if (!hBrush) + { + return; + } + + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + DeleteObject((HGDIOBJ)hBrush); + ptColor = SetTextColor(drawItem->hDC, ntColor); + pbkColor = SetBkColor(drawItem->hDC, nbkColor); + if (ntColor != nbkColor) + { + /* hide text when it has same background color as text color */ + DrawText(drawItem->hDC, szText, _tcslen(szText), &drawItem->rcItem, 0); + } + SetTextColor(drawItem->hDC, ptColor); + SetBkColor(drawItem->hDC, pbkColor); +} + + INT_PTR CALLBACK @@ -67,22 +130,7 @@ } case WM_DRAWITEM: { - COLORREF bkColor; - HBRUSH hBrush; - LPDRAWITEMSTRUCT drawItem; - - bkColor = GetSysColor(COLOR_BACKGROUND); - hBrush = CreateSolidBrush(bkColor); - drawItem = (LPDRAWITEMSTRUCT) lParam; - - FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); - //TODO draw console image -// MoveToEx(drawItem->hDC, 0, 0, NULL); -// LineTo(drawItem->hDC, 10, 10); -// MoveToEx(drawItem->hDC, 30, 30, NULL); -// LineTo(drawItem->hDC, 40, 40); - - DeleteObject((HGDIOBJ)hBrush); + PaintConsole((LPDRAWITEMSTRUCT)lParam, pConInfo); return TRUE; } case WM_COMMAND:

18 years, 4 months

[gedmurphy] 23703: delete old dir

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Aug 25 14:12:28 2006 New Revision: 23703 URL: http://svn.reactos.org/svn/reactos?rev=23703&view=rev Log: delete old dir Removed: trunk/reactos/base/applications/cmdutils/uptime/ Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cmdutils.rbuild (original) +++ trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Fri Aug 25 14:12:28 2006 @@ -5,7 +5,4 @@ <directory name="more"> <xi:include href="more/more.rbuild" /> </directory> -<directory name="uptime"> - <xi:include href="uptime/uptime.rbuild" /> -</directory> </group>

18 years, 4 months

[gedmurphy] 23702: move uptime to rosapps so Alex doesn't blow up into teeny weeny pieces ; )

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Aug 25 14:11:57 2006 New Revision: 23702 URL: http://svn.reactos.org/svn/reactos?rev=23702&view=rev Log: move uptime to rosapps so Alex doesn't blow up into teeny weeny pieces ;) Added: trunk/rosapps/cmdutils/uptime/ - copied from r23696, trunk/reactos/base/applications/cmdutils/uptime/

18 years, 4 months

[ion] 23701: - Add some debugging code to see why trap frames are screwed up.

by ion＠svn.reactos.org

Author: ion Date: Fri Aug 25 08:11:45 2006 New Revision: 23701 URL: http://svn.reactos.org/svn/reactos?rev=23701&view=rev Log: - Add some debugging code to see why trap frames are screwed up. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Fri Aug 25 08:11:45 2006 @@ -570,7 +570,7 @@ 5: #ifdef DBG sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - //jnz 0f // FIXME: ROS IS BROKEN + jnz 0f /* Assert FS */ mov bx, fs @@ -752,12 +752,26 @@ jmp 3b .endif +#if DBG 0: +#if 0 + /* Print a message */ + mov esi, [esp+KTRAP_FRAME_DEBUGARGMARK] + mov edi, [esp+KTRAP_FRAME_DEBUGARGMARK-4] + push edi + push esi + push offset Broken + call _DbgPrint + add esp, 12 +#endif + jmp 2b // ros hack + /* Fix up the mask */ add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 6: int 3 jmp 5b +#endif 2: /* Check if this was V86 mode */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Fri Aug 25 08:11:45 2006 @@ -84,6 +84,9 @@ _UnexpectedMsg: .asciz "\n\x7\x7!!! Unexpected Interrupt %02lx !!!\n" +Broken: + .asciz "\n\x7\x7!!! Broken TrapFrame. Magic: %08lx MagicB: %08lx!!!\n" + /* SOFTWARE INTERRUPT SERVICES ***********************************************/ _KiGetTickCount:

18 years, 4 months

[ion] 23700: - We do not speak about the v86 hack. - This should fix the V86 GPF error.

by ion＠svn.reactos.org

Author: ion Date: Fri Aug 25 06:23:47 2006 New Revision: 23700 URL: http://svn.reactos.org/svn/reactos?rev=23700&view=rev Log: - We do not speak about the v86 hack. - This should fix the V86 GPF error. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/thread.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Fri Aug 25 06:23:47 2006 @@ -44,6 +44,8 @@ #define FRAME_EDITED 0xFFF8 +#define WE_DO_NOT_SPEAK_ABOUT_THE_V86_HACK 1 + #ifndef __ASM__ extern ULONG Ke386CacheAlignment; Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Fri Aug 25 06:23:47 2006 @@ -299,6 +299,11 @@ /* Save the Exception list */ push [ebx+KPCR_EXCEPTION_LIST] +#if WE_DO_NOT_SPEAK_ABOUT_THE_V86_HACK // V86 HACK + mov ecx, [ebx+KPCR_TSS] + push [ecx+KTSS_ESP0] +#endif + /* DPC shouldn't be active */ cmp byte ptr [ebx+KPCR_PRCB_DPC_ROUTINE_ACTIVE], 0 jnz BugCheckDpc @@ -393,6 +398,11 @@ inc dword ptr [esi+KTHREAD_CONTEXT_SWITCHES] //inc dword ptr [esi+KPRC_PRCB_CONTEXT_SWITCHES] +#if WE_DO_NOT_SPEAK_ABOUT_THE_V86_HACK + mov ebp, [ebx+KPCR_TSS] + pop [ebp+KTSS_ESP0] +#endif + /* Restore exception list */ pop [ebx+KPCR_EXCEPTION_LIST] Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thread.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thread.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c Fri Aug 25 06:23:47 2006 @@ -14,6 +14,9 @@ typedef struct _KSHARED_CTXSWITCH_FRAME { +#if WE_DO_NOT_SPEAK_ABOUT_THE_V86_HACK // V86 HACK + ULONG_PTR Esp0; +#endif PVOID ExceptionList; KIRQL WaitIrql; PVOID RetEip; @@ -233,6 +236,11 @@ CtxSwitchFrame->RetEip = KiThreadStartup; CtxSwitchFrame->WaitIrql = APC_LEVEL; CtxSwitchFrame->ExceptionList = (PVOID)0xFFFFFFFF; +#if WE_DO_NOT_SPEAK_ABOUT_THE_V86_HACK // V86 HACK + CtxSwitchFrame->Esp0 = (ULONG_PTR)Thread->InitialStack - + sizeof(FX_SAVE_AREA) - + 0x10; +#endif /* Save back the new value of the kernel stack. */ DPRINT("Final Kernel Stack: %x \n", CtxSwitchFrame);

18 years, 4 months

[ion] 23699: - Get rid of some code.

by ion＠svn.reactos.org

Author: ion Date: Fri Aug 25 06:22:50 2006 New Revision: 23699 URL: http://svn.reactos.org/svn/reactos?rev=23699&view=rev Log: - Get rid of some code. Modified: trunk/reactos/ntoskrnl/ke/i386/v86m.c Modified: trunk/reactos/ntoskrnl/ke/i386/v86m.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86m.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86m.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86m.c Fri Aug 25 06:22:50 2006 @@ -50,6 +50,7 @@ while (!Exit) { + //DPRINT1("ip: %lx\n", ip[i]); switch (ip[i]) { /* 32-bit data prefix */ @@ -688,127 +689,26 @@ NTAPI KeV86Exception(ULONG ExceptionNr, PKTRAP_FRAME Tf, ULONG address) { - PUCHAR Ip; - PKV86M_TRAP_FRAME VTf; - - ASSERT (ExceptionNr != 14); - - VTf = (PKV86M_TRAP_FRAME)Tf; - - /* FIXME: This should use ->VdmObjects */ - if(KeGetCurrentProcess()->Unused) - { - VTf->regs->PStatus = (PNTSTATUS) ExceptionNr; - return 1; - } - - /* - * Check if we have reached the recovery instruction - */ - Ip = (PUCHAR)((Tf->SegCs & 0xFFFF) * 16 + (Tf->Eip & 0xFFFF)); - - DPRINT("ExceptionNr %d Ip[0] %x Ip[1] %x Ip[2] %x Ip[3] %x Tf->SegCs %x " - "Tf->Eip %x\n", ExceptionNr, Ip[0], Ip[1], Ip[2], Ip[3], Tf->SegCs, - Tf->Eip); - DPRINT("VTf %x VTf->regs %x\n", VTf, VTf->regs); - - if (ExceptionNr == 6 && - memcmp(Ip, VTf->regs->RecoveryInstruction, 4) == 0 && - (Tf->SegCs * 16 + Tf->Eip) == VTf->regs->RecoveryAddress) + PUCHAR Ip; + PKV86M_TRAP_FRAME VTf; + + VTf = (PKV86M_TRAP_FRAME)Tf; + + /* + * Check if we have reached the recovery instruction + */ + Ip = (PUCHAR)((Tf->SegCs & 0xFFFF) * 16 + (Tf->Eip & 0xFFFF)); + + if (ExceptionNr == 6 && + memcmp(Ip, VTf->regs->RecoveryInstruction, 4) == 0 && + (Tf->SegCs * 16 + Tf->Eip) == VTf->regs->RecoveryAddress) { - *VTf->regs->PStatus = STATUS_SUCCESS; - return(1); + *VTf->regs->PStatus = STATUS_SUCCESS; + return(1); } - /* - * Handle the exceptions - */ - switch (ExceptionNr) - { - /* Divide error */ - case 0: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Single step */ - case 1: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* NMI */ - case 2: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Breakpoint */ - case 3: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Overflow */ - case 4: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Array bounds check */ - case 5: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Invalid opcode */ - case 6: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Device not available */ - case 7: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Double fault */ - case 8: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Intel reserved */ - case 9: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Invalid TSS */ - case 10: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Segment not present */ - case 11: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Stack fault */ - case 12: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* General protection fault */ - case 13: - return(KeV86GPF(VTf, Tf)); - - /* Intel reserved */ - case 15: - case 16: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Alignment check */ - case 17: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - default: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - } + ASSERT(ExceptionNr == 13); + return(KeV86GPF(VTf, Tf)); } NTSTATUS STDCALL

18 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
45
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 August 2006