Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[tkreuzer] 46449: [RBUILD] instead of defining -fno-set-stack-executable and -fno-optimize-sibling-calls in gcc.mak file, do it in ReactOS-i386.rbuild
by tkreuzer＠svn.reactos.org 25 Mar '10

25 Mar '10

Author: tkreuzer Date: Thu Mar 25 20:55:28 2010 New Revision: 46449 URL: http://svn.reactos.org/svn/reactos?rev=46449&view=rev Log: [RBUILD] instead of defining -fno-set-stack-executable and -fno-optimize-sibling-calls in gcc.mak file, do it in ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-i386.rbuild trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=46… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Thu Mar 25 20:55:28 2010 @@ -28,6 +28,8 @@ <compilerflag>-mpreferred-stack-boundary=2</compilerflag> <compilerflag compiler="midl">-m32 --win32</compilerflag> <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> + <compilerflag compiler="cc,cxx">-fno-set-stack-executable</compilerflag> + <compilerflag compiler="cc,cxx">-fno-optimize-sibling-calls</compilerflag> <compilerflag compiler="as">-gstabs+</compilerflag> </group> Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Thu Mar 25 20:55:28 2010 @@ -9,14 +9,6 @@ # FIXME: disabled until RosBE stops sucking # BUILTIN_CPPFLAGS+= -nostdinc -BUILTIN_CFLAGS+= -fno-optimize-sibling-calls -BUILTIN_CXXFLAGS+= -fno-optimize-sibling-calls - -# Add -fno-set-stack-executable required for x86/MinGW -ifneq (,$(filter $(ARCH),amd64 i386)) - BUILTIN_CFLAGS+= -fno-set-stack-executable - BUILTIN_CXXFLAGS+= -fno-set-stack-executable -endif #(module, source, dependencies, cflags, output) define RBUILD_DEPENDS

1 0

[tkreuzer] 46448: fix build
by tkreuzer＠svn.reactos.org 25 Mar '10

25 Mar '10

Author: tkreuzer Date: Thu Mar 25 20:32:45 2010 New Revision: 46448 URL: http://svn.reactos.org/svn/reactos?rev=46448&view=rev Log: fix build Modified: trunk/reactos/hal/halx86/hal_generic.rbuild Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Thu Mar 25 20:32:45 2010 @@ -70,19 +70,23 @@ <file>display.c</file> <file>drive.c</file> <file>misc.c</file> - <file>pic.c</file> - <file>portio.c</file> - <file>processor.c</file> <file>profil.c</file> <file>reboot.c</file> <file>spinlock.c</file> <file>sysinfo.c</file> - <file>systimer.S</file> <file>timer.c</file> <file>usage.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>portio.c</file> + <file>systimer.S</file> + </directory> + </if> </directory> <directory name="up"> <file>halinit_up.c</file> + <file>pic.c</file> + <file>processor.c</file> </directory> </module> </group>

1 0

[tkreuzer] 46447: [HAL] - Move architecture specific files into appropriate folders - Move UP specific files into up folder
by tkreuzer＠svn.reactos.org 25 Mar '10

25 Mar '10

Author: tkreuzer Date: Thu Mar 25 20:23:09 2010 New Revision: 46447 URL: http://svn.reactos.org/svn/reactos?rev=46447&view=rev Log: [HAL] - Move architecture specific files into appropriate folders - Move UP specific files into up folder Added: trunk/reactos/hal/halx86/generic/amd64/ (with props) trunk/reactos/hal/halx86/generic/i386/ (with props) trunk/reactos/hal/halx86/generic/i386/portio.c - copied unchanged from r46439, trunk/reactos/hal/halx86/generic/portio.c trunk/reactos/hal/halx86/generic/i386/systimer.S - copied unchanged from r46439, trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/generic/i386/trap.S - copied unchanged from r46439, trunk/reactos/hal/halx86/generic/trap.S trunk/reactos/hal/halx86/mp/amd64/ (with props) trunk/reactos/hal/halx86/mp/i386/ (with props) trunk/reactos/hal/halx86/mp/i386/mps.S - copied unchanged from r46439, trunk/reactos/hal/halx86/mp/mps.S trunk/reactos/hal/halx86/mp/i386/mpsboot.asm - copied unchanged from r46439, trunk/reactos/hal/halx86/mp/mpsboot.asm trunk/reactos/hal/halx86/mp/i386/mpsirql.c - copied unchanged from r46446, trunk/reactos/hal/halx86/mp/mpsirql.c trunk/reactos/hal/halx86/up/pic.c - copied unchanged from r46439, trunk/reactos/hal/halx86/generic/pic.c trunk/reactos/hal/halx86/up/processor.c - copied unchanged from r46439, trunk/reactos/hal/halx86/generic/processor.c Removed: trunk/reactos/hal/halx86/generic/pic.c trunk/reactos/hal/halx86/generic/portio.c trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/generic/trap.S trunk/reactos/hal/halx86/mp/mps.S trunk/reactos/hal/halx86/mp/mpsboot.asm trunk/reactos/hal/halx86/mp/mpsirql.c Modified: trunk/reactos/hal/hal.rbuild trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/hal_generic_up.rbuild trunk/reactos/hal/halx86/halmps.rbuild Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=46447&r… ============================================================================== --- trunk/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal.rbuild [iso-8859-1] Thu Mar 25 20:23:09 2010 @@ -2,10 +2,16 @@ <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <if property="ARCH" value="i386"> - <directory name="halx86"> - <xi:include href="halx86/directory.rbuild" /> - </directory> + <if property="ARCH" value="i386"> + <directory name="halx86"> + <xi:include href="halx86/directory.rbuild" /> + </directory> + </if> + + <if property="ARCH" value="amd64"> + <directory name="halx86"> + <xi:include href="halx86/directory.rbuild" /> + </directory> </if> <if property="ARCH" value="powerpc"> Propchange: trunk/reactos/hal/halx86/generic/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Mar 25 20:23:09 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/hal/halx86/generic/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/hal/halx86/generic/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/hal/halx86/generic/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/hal/halx86/generic/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Mar 25 20:23:09 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/hal/halx86/generic/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/hal/halx86/generic/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/hal/halx86/generic/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Removed: trunk/reactos/hal/halx86/generic/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pic.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pic.c (removed) @@ -1,1363 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halx86/generic/pic.c - * PURPOSE: HAL PIC Management and Control Code - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ********************************************************************/ - -#ifndef _MINIHAL_ -/* - * This table basically keeps track of level vs edge triggered interrupts. - * Windows has 250+ entries, but it seems stupid to replicate that since the PIC - * can't actually have that many. - * - * When a level interrupt is registered, the respective pointer in this table is - * modified to point to a dimiss routine for level interrupts instead. - * - * The other thing this table does is special case IRQ7, IRQ13 and IRQ15: - * - * - If an IRQ line is deasserted before it is acknowledged due to a noise spike - * generated by an expansion device (since the IRQ line is low during the 1st - * acknowledge bus cycle), the i8259 will keep the line low for at least 100ns - * When the spike passes, a pull-up resistor will return the IRQ line to high. - * Since the PIC requires the input be high until the first acknowledge, the - * i8259 knows that this was a spurious interrupt, and on the second interrupt - * acknowledge cycle, it reports this to the CPU. Since no valid interrupt has - * actually happened Intel hardcoded the chip to report IRQ7 on the master PIC - * and IRQ15 on the slave PIC (IR7 either way). - * - * "ISA System Architecture", 3rd Edition, states that these cases should be - * handled by reading the respective Interrupt Service Request (ISR) bits from - * the affected PIC, and validate whether or not IR7 is set. If it isn't, then - * the interrupt is spurious and should be ignored. - * - * Note that for a spurious IRQ15, we DO have to send an EOI to the master for - * IRQ2 since the line was asserted by the slave when it received the spurious - * IRQ15! - * - * - When the 80287/80387 math co-processor generates an FPU/NPX trap, this is - * connected to IRQ13, so we have to clear the busy latch on the NPX port. - */ -PHAL_DISMISS_INTERRUPT HalpSpecialDismissTable[16] = -{ - HalpDismissIrqGeneric, - HalpDismissIrqGeneric, - HalpDismissIrqGeneric, - HalpDismissIrqGeneric, - HalpDismissIrqGeneric, - HalpDismissIrqGeneric, - HalpDismissIrqGeneric, - HalpDismissIrq07, - HalpDismissIrqGeneric, - HalpDismissIrqGeneric, - HalpDismissIrqGeneric, - HalpDismissIrqGeneric, - HalpDismissIrqGeneric, - HalpDismissIrq13, - HalpDismissIrqGeneric, - HalpDismissIrq15 -}; - -/* - * These are the level IRQ dismissal functions that get copied in the table - * above if the given IRQ is actually level triggered. - */ -PHAL_DISMISS_INTERRUPT HalpSpecialDismissLevelTable[16] = -{ - HalpDismissIrqLevel, - HalpDismissIrqLevel, - HalpDismissIrqLevel, - HalpDismissIrqLevel, - HalpDismissIrqLevel, - HalpDismissIrqLevel, - HalpDismissIrqLevel, - HalpDismissIrq07Level, - HalpDismissIrqLevel, - HalpDismissIrqLevel, - HalpDismissIrqLevel, - HalpDismissIrqLevel, - HalpDismissIrqLevel, - HalpDismissIrq13Level, - HalpDismissIrqLevel, - HalpDismissIrq15Level -}; - -/* This table contains the static x86 PIC mapping between IRQLs and IRQs */ -ULONG KiI8259MaskTable[32] = -{ -#ifdef __GNUC__ -#if __GNUC__ * 100 + __GNUC_MINOR__ >= 404 - /* - * It Device IRQLs only start at 4 or higher, so these are just software - * IRQLs that don't really change anything on the hardware - */ - 0b00000000000000000000000000000000, /* IRQL 0 */ - 0b00000000000000000000000000000000, /* IRQL 1 */ - 0b00000000000000000000000000000000, /* IRQL 2 */ - 0b00000000000000000000000000000000, /* IRQL 3 */ - - /* - * These next IRQLs are actually useless from the PIC perspective, because - * with only 2 PICs, the mask you can send them is only 8 bits each, for 16 - * bits total, so these IRQLs are masking off a phantom PIC. - */ - 0b11111111100000000000000000000000, /* IRQL 4 */ - 0b11111111110000000000000000000000, /* IRQL 5 */ - 0b11111111111000000000000000000000, /* IRQL 6 */ - 0b11111111111100000000000000000000, /* IRQL 7 */ - 0b11111111111110000000000000000000, /* IRQL 8 */ - 0b11111111111111000000000000000000, /* IRQL 9 */ - 0b11111111111111100000000000000000, /* IRQL 10 */ - 0b11111111111111110000000000000000, /* IRQL 11 */ - - /* - * Okay, now we're finally starting to mask off IRQs on the slave PIC, from - * IRQ15 to IRQ8. This means the higher-level IRQs get less priority in the - * IRQL sense. - */ - 0b11111111111111111000000000000000, /* IRQL 12 */ - 0b11111111111111111100000000000000, /* IRQL 13 */ - 0b11111111111111111110000000000000, /* IRQL 14 */ - 0b11111111111111111111000000000000, /* IRQL 15 */ - 0b11111111111111111111100000000000, /* IRQL 16 */ - 0b11111111111111111111110000000000, /* IRQL 17 */ - 0b11111111111111111111111000000000, /* IRQL 18 */ - 0b11111111111111111111111000000000, /* IRQL 19 */ - - /* - * Now we mask off the IRQs on the master. Notice the 0 "droplet"? You might - * have also seen that IRQL 18 and 19 are essentially equal as far as the - * PIC is concerned. That bit is actually IRQ8, which happens to be the RTC. - * The RTC will keep firing as long as we don't reach PROFILE_LEVEL which - * actually kills it. The RTC clock (unlike the system clock) is used by the - * profiling APIs in the HAL, so that explains the logic. - */ - 0b11111111111111111111111010000000, /* IRQL 20 */ - 0b11111111111111111111111011000000, /* IRQL 21 */ - 0b11111111111111111111111011100000, /* IRQL 22 */ - 0b11111111111111111111111011110000, /* IRQL 23 */ - 0b11111111111111111111111011111000, /* IRQL 24 */ - 0b11111111111111111111111011111000, /* IRQL 25 */ - 0b11111111111111111111111011111010, /* IRQL 26 */ - 0b11111111111111111111111111111010, /* IRQL 27 */ - - /* - * IRQL 24 and 25 are actually identical, so IRQL 28 is actually the last - * IRQL to modify a bit on the master PIC. It happens to modify the very - * last of the IRQs, IRQ0, which corresponds to the system clock interval - * timer that keeps track of time (the Windows heartbeat). We only want to - * turn this off at a high-enough IRQL, which is why IRQLs 24 and 25 are the - * same to give this guy a chance to come up higher. Note that IRQL 28 is - * called CLOCK2_LEVEL, which explains the usage we just explained. - */ - 0b11111111111111111111111111111011, /* IRQL 28 */ - - /* - * We have finished off with the PIC so there's nothing left to mask at the - * level of these IRQLs, making them only logical IRQLs on x86 machines. - * Note that we have another 0 "droplet" you might've caught since IRQL 26. - * In this case, it's the 2nd bit that never gets turned off, which is IRQ2, - * the cascade IRQ that we use to bridge the slave PIC with the master PIC. - * We never want to turn it off, so no matter the IRQL, it will be set to 0. - */ - 0b11111111111111111111111111111011, /* IRQL 29 */ - 0b11111111111111111111111111111011, /* IRQL 30 */ - 0b11111111111111111111111111111011 /* IRQL 31 */ -#else - 0, /* IRQL 0 */ - 0, /* IRQL 1 */ - 0, /* IRQL 2 */ - 0, /* IRQL 3 */ - 0xFF800000, /* IRQL 4 */ - 0xFFC00000, /* IRQL 5 */ - 0xFFE00000, /* IRQL 6 */ - 0xFFF00000, /* IRQL 7 */ - 0xFFF80000, /* IRQL 8 */ - 0xFFFC0000, /* IRQL 9 */ - 0xFFFE0000, /* IRQL 10 */ - 0xFFFF0000, /* IRQL 11 */ - 0xFFFF8000, /* IRQL 12 */ - 0xFFFFC000, /* IRQL 13 */ - 0xFFFFE000, /* IRQL 14 */ - 0xFFFFF000, /* IRQL 15 */ - 0xFFFFF800, /* IRQL 16 */ - 0xFFFFFC00, /* IRQL 17 */ - 0xFFFFFE00, /* IRQL 18 */ - 0xFFFFFE00, /* IRQL 19 */ - 0xFFFFFE80, /* IRQL 20 */ - 0xFFFFFEC0, /* IRQL 21 */ - 0xFFFFFEE0, /* IRQL 22 */ - 0xFFFFFEF0, /* IRQL 23 */ - 0xFFFFFEF8, /* IRQL 24 */ - 0xFFFFFEF8, /* IRQL 25 */ - 0xFFFFFEFA, /* IRQL 26 */ - 0xFFFFFFFA, /* IRQL 27 */ - 0xFFFFFFFB, /* IRQL 28 */ - 0xFFFFFFFB, /* IRQL 29 */ - 0xFFFFFFFB, /* IRQL 30 */ - 0xFFFFFFFB /* IRQL 31 */ -#endif -#endif -}; - -/* This table indicates which IRQs, if pending, can preempt a given IRQL level */ -ULONG FindHigherIrqlMask[32] = -{ -#ifdef __GNUC__ -#if __GNUC__ * 100 + __GNUC_MINOR__ >= 404 - /* - * Software IRQLs, at these levels all hardware interrupts can preempt. - * Each higher IRQL simply enables which software IRQL can preempt the - * current level. - */ - 0b11111111111111111111111111111110, /* IRQL 0 */ - 0b11111111111111111111111111111100, /* IRQL 1 */ - 0b11111111111111111111111111111000, /* IRQL 2 */ - - /* - * IRQL3 means only hardware IRQLs can now preempt. These last 4 zeros will - * then continue throughout the rest of the list, trickling down. - */ - 0b11111111111111111111111111110000, /* IRQL 3 */ - - /* - * Just like in the previous list, these masks don't really mean anything - * since we've only got two PICs with 16 possible IRQs total - */ - 0b00000111111111111111111111110000, /* IRQL 4 */ - 0b00000011111111111111111111110000, /* IRQL 5 */ - 0b00000001111111111111111111110000, /* IRQL 6 */ - 0b00000000111111111111111111110000, /* IRQL 7 */ - 0b00000000011111111111111111110000, /* IRQL 8 */ - 0b00000000001111111111111111110000, /* IRQL 9 */ - 0b00000000000111111111111111110000, /* IRQL 10 */ - - /* - * Now we start progressivly limiting which slave PIC interrupts have the - * right to preempt us at each level. - */ - 0b00000000000011111111111111110000, /* IRQL 11 */ - 0b00000000000001111111111111110000, /* IRQL 12 */ - 0b00000000000000111111111111110000, /* IRQL 13 */ - 0b00000000000000011111111111110000, /* IRQL 14 */ - 0b00000000000000001111111111110000, /* IRQL 15 */ - 0b00000000000000000111111111110000, /* IRQL 16 */ - 0b00000000000000000011111111110000, /* IRQL 17 */ - 0b00000000000000000001111111110000, /* IRQL 18 */ - 0b00000000000000000001111111110000, /* IRQL 19 */ - - /* - * Also recall from the earlier table that IRQL 18/19 are treated the same - * in order to spread the masks better thoughout the 32 IRQLs and to reflect - * the fact that some bits will always stay on until much higher IRQLs since - * they are system-critical. One such example is the 1 bit that you start to - * see trickling down here. This is IRQ8, the RTC timer used for profiling, - * so it will always preempt until we reach PROFILE_LEVEL. - */ - 0b00000000000000000001011111110000, /* IRQL 20 */ - 0b00000000000000000001001111110000, /* IRQL 20 */ - 0b00000000000000000001000111110000, /* IRQL 22 */ - 0b00000000000000000001000011110000, /* IRQL 23 */ - 0b00000000000000000001000001110000, /* IRQL 24 */ - 0b00000000000000000001000000110000, /* IRQL 25 */ - 0b00000000000000000001000000010000, /* IRQL 26 */ - - /* At this point, only the clock (IRQ0) can still preempt... */ - 0b00000000000000000000000000010000, /* IRQL 27 */ - - /* And any higher than that there's no relation with hardware PICs anymore */ - 0b00000000000000000000000000000000, /* IRQL 28 */ - 0b00000000000000000000000000000000, /* IRQL 29 */ - 0b00000000000000000000000000000000, /* IRQL 30 */ - 0b00000000000000000000000000000000, /* IRQL 31 */ -#else - 0xFFFFFFFE, /* IRQL 0 */ - 0xFFFFFFFC, /* IRQL 1 */ - 0xFFFFFFF8, /* IRQL 2 */ - 0xFFFFFFF0, /* IRQL 3 */ - 0x7FFFFF0, /* IRQL 4 */ - 0x3FFFFF0, /* IRQL 5 */ - 0x1FFFFF0, /* IRQL 6 */ - 0x0FFFFF0, /* IRQL 7 */ - 0x7FFFF0, /* IRQL 8 */ - 0x3FFFF0, /* IRQL 9 */ - 0x1FFFF0, /* IRQL 10 */ - 0x0FFFF0, /* IRQL 11 */ - 0x7FFF0, /* IRQL 12 */ - 0x3FFF0, /* IRQL 13 */ - 0x1FFF0, /* IRQL 14 */ - 0x0FFF0, /* IRQL 15 */ - 0x7FF0, /* IRQL 16 */ - 0x3FF0, /* IRQL 17 */ - 0x1FF0, /* IRQL 18 */ - 0x1FF0, /* IRQL 19 */ - 0x17F0, /* IRQL 20 */ - 0x13F0, /* IRQL 21 */ - 0x11F0, /* IRQL 22 */ - 0x10F0, /* IRQL 23 */ - 0x1070, /* IRQL 24 */ - 0x1030, /* IRQL 25 */ - 0x1010, /* IRQL 26 */ - 0x10, /* IRQL 27 */ - 0, /* IRQL 28 */ - 0, /* IRQL 29 */ - 0, /* IRQL 30 */ - 0 /* IRQL 31 */ -#endif -#endif -}; - -/* Denotes minimum required IRQL before we can process pending SW interrupts */ -KIRQL SWInterruptLookUpTable[8] = -{ - PASSIVE_LEVEL, /* IRR 0 */ - PASSIVE_LEVEL, /* IRR 1 */ - APC_LEVEL, /* IRR 2 */ - APC_LEVEL, /* IRR 3 */ - DISPATCH_LEVEL, /* IRR 4 */ - DISPATCH_LEVEL, /* IRR 5 */ - DISPATCH_LEVEL, /* IRR 6 */ - DISPATCH_LEVEL /* IRR 7 */ -}; - -#define HalpDelayedHardwareInterrupt(x) \ - VOID HalpHardwareInterrupt##x(VOID); \ - VOID \ - HalpHardwareInterrupt##x(VOID) \ - { \ - asm volatile ("int $%c0\n"::"i"(PRIMARY_VECTOR_BASE + x)); \ - } - -/* Pending/delayed hardware interrupt handlers */ -HalpDelayedHardwareInterrupt(0); -HalpDelayedHardwareInterrupt(1); -HalpDelayedHardwareInterrupt(2); -HalpDelayedHardwareInterrupt(3); -HalpDelayedHardwareInterrupt(4); -HalpDelayedHardwareInterrupt(5); -HalpDelayedHardwareInterrupt(6); -HalpDelayedHardwareInterrupt(7); -HalpDelayedHardwareInterrupt(8); -HalpDelayedHardwareInterrupt(9); -HalpDelayedHardwareInterrupt(10); -HalpDelayedHardwareInterrupt(11); -HalpDelayedHardwareInterrupt(12); -HalpDelayedHardwareInterrupt(13); -HalpDelayedHardwareInterrupt(14); -HalpDelayedHardwareInterrupt(15); - -/* Handlers for pending interrupts */ -PHAL_SW_INTERRUPT_HANDLER SWInterruptHandlerTable[20] = -{ - KiUnexpectedInterrupt, - HalpApcInterrupt, - HalpDispatchInterrupt2, - KiUnexpectedInterrupt, - HalpHardwareInterrupt0, - HalpHardwareInterrupt1, - HalpHardwareInterrupt2, - HalpHardwareInterrupt3, - HalpHardwareInterrupt4, - HalpHardwareInterrupt5, - HalpHardwareInterrupt6, - HalpHardwareInterrupt7, - HalpHardwareInterrupt8, - HalpHardwareInterrupt9, - HalpHardwareInterrupt10, - HalpHardwareInterrupt11, - HalpHardwareInterrupt12, - HalpHardwareInterrupt13, - HalpHardwareInterrupt14, - HalpHardwareInterrupt15 -}; - -/* Handlers for pending software interrupts when we already have a trap frame*/ -PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY SWInterruptHandlerTable2[3] = -{ - (PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY)KiUnexpectedInterrupt, - HalpApcInterrupt2ndEntry, - HalpDispatchInterrupt2ndEntry -}; - -LONG HalpEisaELCR; - -/* FUNCTIONS ******************************************************************/ - -VOID -NTAPI -HalpInitializePICs(IN BOOLEAN EnableInterrupts) -{ - ULONG EFlags; - I8259_ICW1 Icw1; - I8259_ICW2 Icw2; - I8259_ICW3 Icw3; - I8259_ICW4 Icw4; - EISA_ELCR Elcr; - ULONG i, j; - - /* Save EFlags and disable interrupts */ - EFlags = __readeflags(); - _disable(); - - /* Initialize ICW1 for master, interval 8, edge-triggered mode with ICW4 */ - Icw1.NeedIcw4 = TRUE; - Icw1.InterruptMode = EdgeTriggered; - Icw1.OperatingMode = Cascade; - Icw1.Interval = Interval8; - Icw1.Init = TRUE; - Icw1.InterruptVectorAddress = 0; /* This is only used in MCS80/85 mode */ - __outbyte(PIC1_CONTROL_PORT, Icw1.Bits); - - /* Set interrupt vector base */ - Icw2.Bits = PRIMARY_VECTOR_BASE; - __outbyte(PIC1_DATA_PORT, Icw2.Bits); - - /* Connect slave to IRQ 2 */ - Icw3.Bits = 0; - Icw3.SlaveIrq2 = TRUE; - __outbyte(PIC1_DATA_PORT, Icw3.Bits); - - /* Enable 8086 mode, non-automatic EOI, non-buffered mode, non special fully nested mode */ - Icw4.Reserved = 0; - Icw4.SystemMode = New8086Mode; - Icw4.EoiMode = NormalEoi; - Icw4.BufferedMode = NonBuffered; - Icw4.SpecialFullyNestedMode = FALSE; - __outbyte(PIC1_DATA_PORT, Icw4.Bits); - - /* Mask all interrupts */ - __outbyte(PIC1_DATA_PORT, 0xFF); - - /* Initialize ICW1 for master, interval 8, edge-triggered mode with ICW4 */ - Icw1.NeedIcw4 = TRUE; - Icw1.InterruptMode = EdgeTriggered; - Icw1.OperatingMode = Cascade; - Icw1.Interval = Interval8; - Icw1.Init = TRUE; - Icw1.InterruptVectorAddress = 0; /* This is only used in MCS80/85 mode */ - __outbyte(PIC2_CONTROL_PORT, Icw1.Bits); - - /* Set interrupt vector base */ - Icw2.Bits = PRIMARY_VECTOR_BASE + 8; - __outbyte(PIC2_DATA_PORT, Icw2.Bits); - - /* Slave ID */ - Icw3.Bits = 0; - Icw3.SlaveId = 2; - __outbyte(PIC2_DATA_PORT, Icw3.Bits); - - /* Enable 8086 mode, non-automatic EOI, non-buffered mode, non special fully nested mode */ - Icw4.Reserved = 0; - Icw4.SystemMode = New8086Mode; - Icw4.EoiMode = NormalEoi; - Icw4.BufferedMode = NonBuffered; - Icw4.SpecialFullyNestedMode = FALSE; - __outbyte(PIC2_DATA_PORT, Icw4.Bits); - - /* Mask all interrupts */ - __outbyte(PIC2_DATA_PORT, 0xFF); - - /* Read EISA Edge/Level Register for master and slave */ - Elcr.Bits = (__inbyte(EISA_ELCR_SLAVE) << 8) | __inbyte(EISA_ELCR_MASTER); - - /* IRQs 0, 1, 2, 8, and 13 are system-reserved and must be edge */ - if (!(Elcr.Master.Irq0Level) && !(Elcr.Master.Irq1Level) && !(Elcr.Master.Irq2Level) && - !(Elcr.Slave.Irq8Level) && !(Elcr.Slave.Irq13Level)) - { - /* ELCR is as it's supposed to be, save it */ - HalpEisaELCR = Elcr.Bits; - - /* Scan for level interrupts */ - for (i = 1, j = 0; j < 16; i <<= 1, j++) - { - if (HalpEisaELCR & i) - { - /* Switch handler to level */ - SWInterruptHandlerTable[j + 4] = HalpHardwareInterruptLevel; - - /* Switch dismiss to level */ - HalpSpecialDismissTable[j] = HalpSpecialDismissLevelTable[j]; - } - } - } - - /* Restore interrupt state */ - if (EnableInterrupts) EFlags |= EFLAGS_INTERRUPT_MASK; - __writeeflags(EFlags); -} - -/* IRQL MANAGEMENT ************************************************************/ - -/* - * @implemented - */ -KIRQL -NTAPI -KeGetCurrentIrql(VOID) -{ - /* Return the IRQL */ - return KeGetPcr()->Irql; -} - -/* - * @implemented - */ -KIRQL -NTAPI -KeRaiseIrqlToDpcLevel(VOID) -{ - PKPCR Pcr = KeGetPcr(); - KIRQL CurrentIrql; - - /* Save and update IRQL */ - CurrentIrql = Pcr->Irql; - Pcr->Irql = DISPATCH_LEVEL; - -#ifdef IRQL_DEBUG - /* Validate correct raise */ - if (CurrentIrql > DISPATCH_LEVEL) KeBugCheck(IRQL_NOT_GREATER_OR_EQUAL); -#endif - - /* Return the previous value */ - return CurrentIrql; -} - -/* - * @implemented - */ -KIRQL -NTAPI -KeRaiseIrqlToSynchLevel(VOID) -{ - PKPCR Pcr = KeGetPcr(); - KIRQL CurrentIrql; - - /* Save and update IRQL */ - CurrentIrql = Pcr->Irql; - Pcr->Irql = SYNCH_LEVEL; - -#ifdef IRQL_DEBUG - /* Validate correct raise */ - if (CurrentIrql > SYNCH_LEVEL) - { - /* Crash system */ - KeBugCheckEx(IRQL_NOT_GREATER_OR_EQUAL, - CurrentIrql, - SYNCH_LEVEL, - 0, - 1); - } -#endif - - /* Return the previous value */ - return CurrentIrql; -} - -/* - * @implemented - */ -KIRQL -FASTCALL -KfRaiseIrql(IN KIRQL NewIrql) -{ - PKPCR Pcr = KeGetPcr(); - KIRQL CurrentIrql; - - /* Read current IRQL */ - CurrentIrql = Pcr->Irql; - -#ifdef IRQL_DEBUG - /* Validate correct raise */ - if (CurrentIrql > NewIrql) - { - /* Crash system */ - Pcr->Irql = PASSIVE_LEVEL; - KeBugCheck(IRQL_NOT_GREATER_OR_EQUAL); - } -#endif - - /* Set new IRQL */ - Pcr->Irql = NewIrql; - - /* Return old IRQL */ - return CurrentIrql; -} - - -/* - * @implemented - */ -VOID -FASTCALL -KfLowerIrql(IN KIRQL OldIrql) -{ - ULONG EFlags; - ULONG PendingIrql, PendingIrqlMask; - PKPCR Pcr = KeGetPcr(); - PIC_MASK Mask; - -#ifdef IRQL_DEBUG - /* Validate correct lower */ - if (OldIrql > Pcr->Irql) - { - /* Crash system */ - Pcr->Irql = HIGH_LEVEL; - KeBugCheck(IRQL_NOT_LESS_OR_EQUAL); - } -#endif - - /* Save EFlags and disable interrupts */ - EFlags = __readeflags(); - _disable(); - - /* Set old IRQL */ - Pcr->Irql = OldIrql; - - /* Check for pending software interrupts and compare with current IRQL */ - PendingIrqlMask = Pcr->IRR & FindHigherIrqlMask[OldIrql]; - if (PendingIrqlMask) - { - /* Check if pending IRQL affects hardware state */ - BitScanReverse(&PendingIrql, PendingIrqlMask); - if (PendingIrql > DISPATCH_LEVEL) - { - /* Set new PIC mask */ - Mask.Both = Pcr->IDR; - __outbyte(PIC1_DATA_PORT, Mask.Master); - __outbyte(PIC2_DATA_PORT, Mask.Slave); - - /* Clear IRR bit */ - Pcr->IRR ^= (1 << PendingIrql); - } - - /* Now handle pending interrupt */ - SWInterruptHandlerTable[PendingIrql](); - } - - /* Restore interrupt state */ - __writeeflags(EFlags); -} - -/* SOFTWARE INTERRUPTS ********************************************************/ - -/* - * @implemented - */ -VOID -FASTCALL -HalRequestSoftwareInterrupt(IN KIRQL Irql) -{ - ULONG EFlags; - PKPCR Pcr = KeGetPcr(); - KIRQL PendingIrql; - - /* Save EFlags and disable interrupts */ - EFlags = __readeflags(); - _disable(); - - /* Mask out the requested bit */ - Pcr->IRR |= (1 << Irql); - - /* Check for pending software interrupts and compare with current IRQL */ - PendingIrql = SWInterruptLookUpTable[Pcr->IRR & 3]; - if (PendingIrql > Pcr->Irql) SWInterruptHandlerTable[PendingIrql](); - - /* Restore interrupt state */ - __writeeflags(EFlags); -} - -/* - * @implemented - */ -VOID -FASTCALL -HalClearSoftwareInterrupt(IN KIRQL Irql) -{ - /* Mask out the requested bit */ - KeGetPcr()->IRR &= ~(1 << Irql); -} - -VOID -NTAPI -HalpEndSoftwareInterrupt(IN KIRQL OldIrql, - IN PKTRAP_FRAME TrapFrame) -{ - ULONG PendingIrql, PendingIrqlMask, PendingIrqMask; - PKPCR Pcr = KeGetPcr(); - PIC_MASK Mask; - - /* Set old IRQL */ - Pcr->Irql = OldIrql; - - /* Loop checking for pending interrupts */ - while (TRUE) - { - /* Check for pending software interrupts and compare with current IRQL */ - PendingIrqlMask = Pcr->IRR & FindHigherIrqlMask[OldIrql]; - if (!PendingIrqlMask) return; - - /* Check for in-service delayed interrupt */ - if (Pcr->IrrActive & 0xFFFFFFF0) return; - - /* Check if pending IRQL affects hardware state */ - BitScanReverse(&PendingIrql, PendingIrqlMask); - if (PendingIrql > DISPATCH_LEVEL) - { - /* Set new PIC mask */ - Mask.Both = Pcr->IDR; - __outbyte(PIC1_DATA_PORT, Mask.Master); - __outbyte(PIC2_DATA_PORT, Mask.Slave); - - /* Set active bit otherwise, and clear it from IRR */ - PendingIrqMask = (1 << PendingIrql); - Pcr->IrrActive |= PendingIrqMask; - Pcr->IRR ^= PendingIrqMask; - - /* Handle delayed hardware interrupt */ - SWInterruptHandlerTable[PendingIrql](); - - /* Handling complete */ - Pcr->IrrActive ^= PendingIrqMask; - } - else - { - /* No need to loop checking for hardware interrupts */ - SWInterruptHandlerTable2[PendingIrql](TrapFrame); - } - } -} - -/* EDGE INTERRUPT DISMISSAL FUNCTIONS *****************************************/ - -BOOLEAN -FORCEINLINE -_HalpDismissIrqGeneric(IN KIRQL Irql, - IN ULONG Irq, - OUT PKIRQL OldIrql) -{ - PIC_MASK Mask; - KIRQL CurrentIrql; - I8259_OCW2 Ocw2; - PKPCR Pcr = KeGetPcr(); - - /* First save current IRQL and compare it to the requested one */ - CurrentIrql = Pcr->Irql; - - /* Check if this interrupt is really allowed to happen */ - if (Irql > CurrentIrql) - { - /* Set the new IRQL and return the current one */ - Pcr->Irql = Irql; - *OldIrql = CurrentIrql; - - /* Prepare OCW2 for EOI */ - Ocw2.Bits = 0; - Ocw2.EoiMode = SpecificEoi; - - /* Check which PIC needs the EOI */ - if (Irq > 8) - { - /* Send the EOI for the IRQ */ - __outbyte(PIC2_CONTROL_PORT, Ocw2.Bits | (Irq - 8)); - - /* Send the EOI for IRQ2 on the master because this was cascaded */ - __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | 2); - } - else - { - /* Send the EOI for the IRQ */ - __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | Irq); - } - - /* Enable interrupts and return success */ - _enable(); - return TRUE; - } - - /* Update the IRR so that we deliver this interrupt when the IRQL is proper */ - Pcr->IRR |= (1 << (Irq + 4)); - - /* Set new PIC mask to real IRQL level, since the optimization is lost now */ - Mask.Both = KiI8259MaskTable[CurrentIrql] | Pcr->IDR; - __outbyte(PIC1_DATA_PORT, Mask.Master); - __outbyte(PIC2_DATA_PORT, Mask.Slave); - - /* Now lie and say this was spurious */ - return FALSE; -} - -BOOLEAN -__attribute__((regparm(3))) -HalpDismissIrqGeneric(IN KIRQL Irql, - IN ULONG Irq, - OUT PKIRQL OldIrql) -{ - /* Run the inline code */ - return _HalpDismissIrqGeneric(Irql, Irq, OldIrql); -} - -BOOLEAN -__attribute__((regparm(3))) -HalpDismissIrq15(IN KIRQL Irql, - IN ULONG Irq, - OUT PKIRQL OldIrql) -{ - I8259_OCW3 Ocw3; - I8259_OCW2 Ocw2; - I8259_ISR Isr; - - /* Request the ISR */ - Ocw3.Bits = 0; - Ocw3.Sbo = 1; /* This encodes an OCW3 vs. an OCW2 */ - Ocw3.ReadRequest = ReadIsr; - __outbyte(PIC2_CONTROL_PORT, Ocw3.Bits); - - /* Read the ISR */ - Isr.Bits = __inbyte(PIC2_CONTROL_PORT); - - /* Is IRQ15 really active (this is IR7) */ - if (Isr.Irq7 == FALSE) - { - /* It isn't, so we have to EOI IRQ2 because this was cascaded */ - Ocw2.Bits = 0; - Ocw2.EoiMode = SpecificEoi; - __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | 2); - - /* And now fail since this was spurious */ - return FALSE; - } - - /* Do normal interrupt dismiss */ - return _HalpDismissIrqGeneric(Irql, Irq, OldIrql); -} - - -BOOLEAN -__attribute__((regparm(3))) -HalpDismissIrq13(IN KIRQL Irql, - IN ULONG Irq, - OUT PKIRQL OldIrql) -{ - /* Clear the FPU busy latch */ - __outbyte(0xF0, 0); - - /* Do normal interrupt dismiss */ - return _HalpDismissIrqGeneric(Irql, Irq, OldIrql); -} - -BOOLEAN -__attribute__((regparm(3))) -HalpDismissIrq07(IN KIRQL Irql, - IN ULONG Irq, - OUT PKIRQL OldIrql) -{ - I8259_OCW3 Ocw3; - I8259_ISR Isr; - - /* Request the ISR */ - Ocw3.Bits = 0; - Ocw3.Sbo = 1; - Ocw3.ReadRequest = ReadIsr; - __outbyte(PIC1_CONTROL_PORT, Ocw3.Bits); - - /* Read the ISR */ - Isr.Bits = __inbyte(PIC1_CONTROL_PORT); - - /* Is IRQ 7 really active? If it isn't, this is spurious so fail */ - if (Isr.Irq7 == FALSE) return FALSE; - - /* Do normal interrupt dismiss */ - return _HalpDismissIrqGeneric(Irql, Irq, OldIrql); -} - -/* LEVEL INTERRUPT DISMISSAL FUNCTIONS ****************************************/ - -BOOLEAN -FORCEINLINE -_HalpDismissIrqLevel(IN KIRQL Irql, - IN ULONG Irq, - OUT PKIRQL OldIrql) -{ - PIC_MASK Mask; - KIRQL CurrentIrql; - I8259_OCW2 Ocw2; - PKPCR Pcr = KeGetPcr(); - - /* Update the PIC */ - Mask.Both = KiI8259MaskTable[Irql] | Pcr->IDR; - __outbyte(PIC1_DATA_PORT, Mask.Master); - __outbyte(PIC2_DATA_PORT, Mask.Slave); - - /* Update the IRR so that we clear this interrupt when the IRQL is proper */ - Pcr->IRR |= (1 << (Irq + 4)); - - /* Save current IRQL */ - CurrentIrql = Pcr->Irql; - - /* Prepare OCW2 for EOI */ - Ocw2.Bits = 0; - Ocw2.EoiMode = SpecificEoi; - - /* Check which PIC needs the EOI */ - if (Irq > 8) - { - /* Send the EOI for the IRQ */ - __outbyte(PIC2_CONTROL_PORT, Ocw2.Bits | (Irq - 8)); - - /* Send the EOI for IRQ2 on the master because this was cascaded */ - __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | 2); - } - else - { - /* Send the EOI for the IRQ */ - __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | Irq); - } - - /* Check if this interrupt should be allowed to happen */ - if (Irql > CurrentIrql) - { - /* Set the new IRQL and return the current one */ - Pcr->Irql = Irql; - *OldIrql = CurrentIrql; - - /* Enable interrupts and return success */ - _enable(); - return TRUE; - } - - /* Now lie and say this was spurious */ - return FALSE; -} - -BOOLEAN -__attribute__((regparm(3))) -HalpDismissIrqLevel(IN KIRQL Irql, - IN ULONG Irq, - OUT PKIRQL OldIrql) -{ - /* Run the inline code */ - return _HalpDismissIrqLevel(Irql, Irq, OldIrql); -} - -BOOLEAN -__attribute__((regparm(3))) -HalpDismissIrq15Level(IN KIRQL Irql, - IN ULONG Irq, - OUT PKIRQL OldIrql) -{ - I8259_OCW3 Ocw3; - I8259_OCW2 Ocw2; - I8259_ISR Isr; - - /* Request the ISR */ - Ocw3.Bits = 0; - Ocw3.Sbo = 1; /* This encodes an OCW3 vs. an OCW2 */ - Ocw3.ReadRequest = ReadIsr; - __outbyte(PIC2_CONTROL_PORT, Ocw3.Bits); - - /* Read the ISR */ - Isr.Bits = __inbyte(PIC2_CONTROL_PORT); - - /* Is IRQ15 really active (this is IR7) */ - if (Isr.Irq7 == FALSE) - { - /* It isn't, so we have to EOI IRQ2 because this was cascaded */ - Ocw2.Bits = 0; - Ocw2.EoiMode = SpecificEoi; - __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | 2); - - /* And now fail since this was spurious */ - return FALSE; - } - - /* Do normal interrupt dismiss */ - return _HalpDismissIrqLevel(Irql, Irq, OldIrql); -} - -BOOLEAN -__attribute__((regparm(3))) -HalpDismissIrq13Level(IN KIRQL Irql, - IN ULONG Irq, - OUT PKIRQL OldIrql) -{ - /* Clear the FPU busy latch */ - __outbyte(0xF0, 0); - - /* Do normal interrupt dismiss */ - return _HalpDismissIrqLevel(Irql, Irq, OldIrql); -} - -BOOLEAN -__attribute__((regparm(3))) -HalpDismissIrq07Level(IN KIRQL Irql, - IN ULONG Irq, - OUT PKIRQL OldIrql) -{ - I8259_OCW3 Ocw3; - I8259_ISR Isr; - - /* Request the ISR */ - Ocw3.Bits = 0; - Ocw3.Sbo = 1; - Ocw3.ReadRequest = ReadIsr; - __outbyte(PIC1_CONTROL_PORT, Ocw3.Bits); - - /* Read the ISR */ - Isr.Bits = __inbyte(PIC1_CONTROL_PORT); - - /* Is IRQ 7 really active? If it isn't, this is spurious so fail */ - if (Isr.Irq7 == FALSE) return FALSE; - - /* Do normal interrupt dismiss */ - return _HalpDismissIrqLevel(Irql, Irq, OldIrql); -} - -VOID -HalpHardwareInterruptLevel(VOID) -{ - PKPCR Pcr = KeGetPcr(); - ULONG PendingIrqlMask, PendingIrql; - - /* Check for pending software interrupts and compare with current IRQL */ - PendingIrqlMask = Pcr->IRR & FindHigherIrqlMask[Pcr->Irql]; - if (PendingIrqlMask) - { - /* Check for in-service delayed interrupt */ - if (Pcr->IrrActive & 0xFFFFFFF0) return; - - /* Check if pending IRQL affects hardware state */ - BitScanReverse(&PendingIrql, PendingIrqlMask); - - /* Clear IRR bit */ - Pcr->IRR ^= (1 << PendingIrql); - - /* Now handle pending interrupt */ - SWInterruptHandlerTable[PendingIrql](); - } -} - -/* SYSTEM INTERRUPTS **********************************************************/ - -/* - * @implemented - */ -BOOLEAN -NTAPI -HalEnableSystemInterrupt(IN UCHAR Vector, - IN KIRQL Irql, - IN KINTERRUPT_MODE InterruptMode) -{ - ULONG Irq; - PKPCR Pcr = KeGetPcr(); - PIC_MASK PicMask; - - /* Validate the IRQ */ - Irq = Vector - PRIMARY_VECTOR_BASE; - if (Irq >= CLOCK2_LEVEL) return FALSE; - - /* Check for level interrupt */ - if (InterruptMode == LevelSensitive) - { - /* Switch handler to level */ - SWInterruptHandlerTable[Irq + 4] = HalpHardwareInterruptLevel; - - /* Switch dismiss to level */ - HalpSpecialDismissTable[Irq] = HalpSpecialDismissLevelTable[Irq]; - } - - /* Disable interrupts */ - _disable(); - - /* Update software IDR */ - Pcr->IDR &= ~(1 << Irq); - - /* Set new PIC mask */ - PicMask.Both = KiI8259MaskTable[Pcr->Irql] | Pcr->IDR; - __outbyte(PIC1_DATA_PORT, PicMask.Master); - __outbyte(PIC2_DATA_PORT, PicMask.Slave); - - /* Enable interrupts and exit */ - _enable(); - return TRUE; -} - -/* - * @implemented - */ -VOID -NTAPI -HalDisableSystemInterrupt(IN UCHAR Vector, - IN KIRQL Irql) -{ - ULONG IrqMask; - PIC_MASK PicMask; - - /* Compute new combined IRQ mask */ - IrqMask = 1 << (Vector - PRIMARY_VECTOR_BASE); - - /* Disable interrupts */ - _disable(); - - /* Update software IDR */ - KeGetPcr()->IDR |= IrqMask; - - /* Read current interrupt mask */ - PicMask.Master = __inbyte(PIC1_DATA_PORT); - PicMask.Slave = __inbyte(PIC2_DATA_PORT); - - /* Add the new disabled interrupt */ - PicMask.Both |= IrqMask; - - /* Write new interrupt mask */ - __outbyte(PIC1_DATA_PORT, PicMask.Master); - __outbyte(PIC2_DATA_PORT, PicMask.Slave); - - /* Bring interrupts back */ - _enable(); -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -HalBeginSystemInterrupt(IN KIRQL Irql, - IN UCHAR Vector, - OUT PKIRQL OldIrql) -{ - ULONG Irq; - - /* Get the IRQ and call the proper routine to handle it */ - Irq = Vector - PRIMARY_VECTOR_BASE; - return HalpSpecialDismissTable[Irq](Irql, Irq, OldIrql); -} - -/* - * @implemented - */ -VOID -NTAPI -HalEndSystemInterrupt(IN KIRQL OldIrql, - IN PKTRAP_FRAME TrapFrame) -{ - ULONG PendingIrql, PendingIrqlMask, PendingIrqMask; - PKPCR Pcr = KeGetPcr(); - PIC_MASK Mask; - - /* Set old IRQL */ - Pcr->Irql = OldIrql; - - /* Check for pending software interrupts and compare with current IRQL */ - PendingIrqlMask = Pcr->IRR & FindHigherIrqlMask[OldIrql]; - if (PendingIrqlMask) - { - /* Check for in-service delayed interrupt */ - if (Pcr->IrrActive & 0xFFFFFFF0) return; - - /* Loop checking for pending interrupts */ - while (TRUE) - { - /* Check if pending IRQL affects hardware state */ - BitScanReverse(&PendingIrql, PendingIrqlMask); - if (PendingIrql > DISPATCH_LEVEL) - { - /* Set new PIC mask */ - Mask.Both = Pcr->IDR; - __outbyte(PIC1_DATA_PORT, Mask.Master); - __outbyte(PIC2_DATA_PORT, Mask.Slave); - - /* Now check if this specific interrupt is already in-service */ - PendingIrqMask = (1 << PendingIrql); - if (Pcr->IrrActive & PendingIrqMask) return; - - /* Set active bit otherwise, and clear it from IRR */ - Pcr->IrrActive |= PendingIrqMask; - Pcr->IRR ^= PendingIrqMask; - - /* Handle delayed hardware interrupt */ - SWInterruptHandlerTable[PendingIrql](); - - /* Handling complete */ - Pcr->IrrActive ^= PendingIrqMask; - - /* Check if there's still interrupts pending */ - PendingIrqlMask = Pcr->IRR & FindHigherIrqlMask[Pcr->Irql]; - if (!PendingIrqlMask) break; - } - else - { - /* Now handle pending software interrupt */ - SWInterruptHandlerTable2[PendingIrql](TrapFrame); - } - } - } -} - -/* SOFTWARE INTERRUPT TRAPS ***************************************************/ - -VOID -FORCEINLINE -DECLSPEC_NORETURN -_HalpApcInterruptHandler(IN PKTRAP_FRAME TrapFrame) -{ - KIRQL CurrentIrql; - PKPCR Pcr = KeGetPcr(); - - /* Save the current IRQL and update it */ - CurrentIrql = Pcr->Irql; - Pcr->Irql = APC_LEVEL; - - /* Remove DPC from IRR */ - Pcr->IRR &= ~(1 << APC_LEVEL); - - /* Enable interrupts and call the kernel's APC interrupt handler */ - _enable(); - KiDeliverApc(((KiUserTrap(TrapFrame)) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) ? - UserMode : KernelMode, - NULL, - TrapFrame); - - /* Disable interrupts and end the interrupt */ - _disable(); - HalpEndSoftwareInterrupt(CurrentIrql, TrapFrame); - - /* Exit the interrupt */ - KiEoiHelper(TrapFrame); -} - -VOID -FASTCALL -DECLSPEC_NORETURN -HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame) -{ - /* Do the work */ - _HalpApcInterruptHandler(TrapFrame); -} - -VOID -FASTCALL -DECLSPEC_NORETURN -HalpApcInterruptHandler(IN PKTRAP_FRAME TrapFrame) -{ - /* Set up a fake INT Stack */ - TrapFrame->EFlags = __readeflags(); - TrapFrame->SegCs = KGDT_R0_CODE; - TrapFrame->Eip = TrapFrame->Eax; - - /* Build the trap frame */ - KiEnterInterruptTrap(TrapFrame); - - /* Do the work */ - _HalpApcInterruptHandler(TrapFrame); -} - -KIRQL -FORCEINLINE -_HalpDispatchInterruptHandler(VOID) -{ - KIRQL CurrentIrql; - PKPCR Pcr = KeGetPcr(); - - /* Save the current IRQL and update it */ - CurrentIrql = Pcr->Irql; - Pcr->Irql = DISPATCH_LEVEL; - - /* Remove DPC from IRR */ - Pcr->IRR &= ~(1 << DISPATCH_LEVEL); - - /* Enable interrupts and call the kernel's DPC interrupt handler */ - _enable(); - KiDispatchInterrupt(); - _disable(); - - /* Return IRQL */ - return CurrentIrql; -} - -VOID -FASTCALL -DECLSPEC_NORETURN -HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame) -{ - KIRQL CurrentIrql; - - /* Do the work */ - CurrentIrql = _HalpDispatchInterruptHandler(); - - /* End the interrupt */ - HalpEndSoftwareInterrupt(CurrentIrql, TrapFrame); - - /* Exit the interrupt */ - KiEoiHelper(TrapFrame); -} - -VOID -HalpDispatchInterrupt2(VOID) -{ - ULONG PendingIrqlMask, PendingIrql; - KIRQL OldIrql; - PIC_MASK Mask; - PKPCR Pcr = KeGetPcr(); - - /* Do the work */ - OldIrql = _HalpDispatchInterruptHandler(); - - /* Restore IRQL */ - Pcr->Irql = OldIrql; - - /* Check for pending software interrupts and compare with current IRQL */ - PendingIrqlMask = Pcr->IRR & FindHigherIrqlMask[OldIrql]; - if (PendingIrqlMask) - { - /* Check if pending IRQL affects hardware state */ - BitScanReverse(&PendingIrql, PendingIrqlMask); - if (PendingIrql > DISPATCH_LEVEL) - { - /* Set new PIC mask */ - Mask.Both = Pcr->IDR; - __outbyte(PIC1_DATA_PORT, Mask.Master); - __outbyte(PIC2_DATA_PORT, Mask.Slave); - - /* Clear IRR bit */ - Pcr->IRR ^= (1 << PendingIrql); - } - - /* Now handle pending interrupt */ - SWInterruptHandlerTable[PendingIrql](); - } -} - -#else - -KIRQL -NTAPI -KeGetCurrentIrql(VOID) -{ - return PASSIVE_LEVEL; -} - -VOID -FASTCALL -KfLowerIrql( - IN KIRQL OldIrql) -{ -} - -KIRQL -FASTCALL -KfRaiseIrql( - IN KIRQL NewIrql) -{ - return NewIrql; -} - -#endif Removed: trunk/reactos/hal/halx86/generic/portio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/portio.… ============================================================================== --- trunk/reactos/hal/halx86/generic/portio.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/portio.c (removed) @@ -1,121 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/portio.c - * PURPOSE: I/O Functions for access to ports - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -// -// HAL Port to Inlined Port -// -#define H2I(Port) PtrToUshort(Port) - -/* FUNCTIONS *****************************************************************/ - -VOID -NTAPI -READ_PORT_BUFFER_UCHAR(IN PUCHAR Port, - OUT PUCHAR Buffer, - IN ULONG Count) -{ - __inbytestring(H2I(Port), Buffer, Count); -} - -VOID -NTAPI -READ_PORT_BUFFER_USHORT(IN PUSHORT Port, - OUT PUSHORT Buffer, - IN ULONG Count) -{ - __inwordstring(H2I(Port), Buffer, Count); -} - -VOID -NTAPI -READ_PORT_BUFFER_ULONG(IN PULONG Port, - OUT PULONG Buffer, - IN ULONG Count) -{ - __indwordstring(H2I(Port), Buffer, Count); -} - -UCHAR -NTAPI -READ_PORT_UCHAR(IN PUCHAR Port) -{ - return __inbyte(H2I(Port)); -} - -USHORT -NTAPI -READ_PORT_USHORT(IN PUSHORT Port) -{ - return __inword(H2I(Port)); -} - -ULONG -NTAPI -READ_PORT_ULONG(IN PULONG Port) -{ - return __indword(H2I(Port)); -} - -VOID -NTAPI -WRITE_PORT_BUFFER_UCHAR(IN PUCHAR Port, - IN PUCHAR Buffer, - IN ULONG Count) -{ - __outbytestring(H2I(Port), Buffer, Count); -} - -VOID -NTAPI -WRITE_PORT_BUFFER_USHORT(IN PUSHORT Port, - IN PUSHORT Buffer, - IN ULONG Count) -{ - __outwordstring(H2I(Port), Buffer, Count); -} - -VOID -NTAPI -WRITE_PORT_BUFFER_ULONG(IN PULONG Port, - IN PULONG Buffer, - IN ULONG Count) -{ - __outdwordstring(H2I(Port), Buffer, Count); -} - -VOID -NTAPI -WRITE_PORT_UCHAR(IN PUCHAR Port, - IN UCHAR Value) -{ - __outbyte(H2I(Port), Value); -} - -VOID -NTAPI -WRITE_PORT_USHORT(IN PUSHORT Port, - IN USHORT Value) -{ - __outword(H2I(Port), Value); -} - -VOID -NTAPI -WRITE_PORT_ULONG(IN PULONG Port, - IN ULONG Value) -{ - __outdword(H2I(Port), Value); -} - -/* EOF */ Removed: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/processor.c (removed) @@ -1,98 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/up/processor.c - * PURPOSE: HAL Processor Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -LONG HalpActiveProcessors; -KAFFINITY HalpDefaultInterruptAffinity; - -/* PRIVATE FUNCTIONS *********************************************************/ - -VOID -NTAPI -HaliHaltSystem(VOID) -{ - /* Disable interrupts and halt the CPU */ - _disable(); - __halt(); -} - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -VOID -NTAPI -HalInitializeProcessor(IN ULONG ProcessorNumber, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - /* Set default IDR and stall count */ - KeGetPcr()->IDR = 0xFFFFFFFB; - KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; - - /* Update the interrupt affinity and processor mask */ - InterlockedBitTestAndSet(&HalpActiveProcessors, ProcessorNumber); - InterlockedBitTestAndSet((PLONG)&HalpDefaultInterruptAffinity, - ProcessorNumber); - - /* Register routines for KDCOM */ - HalpRegisterKdSupportFunctions(); -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -HalAllProcessorsStarted(VOID) -{ - /* Do nothing */ - return TRUE; -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -HalStartNextProcessor(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PKPROCESSOR_STATE ProcessorState) -{ - /* Ready to start */ - return FALSE; -} - -/* - * @implemented - */ -VOID -NTAPI -HalProcessorIdle(VOID) -{ - /* Enable interrupts and halt the processor */ - _enable(); - __halt(); -} - -/* - * @implemented - */ -VOID -NTAPI -HalRequestIpi(KAFFINITY TargetProcessors) -{ - /* Not implemented on UP */ - __debugbreak(); -} - -/* EOF */ Removed: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/systimer.S (removed) @@ -1,523 +1,0 @@ -/* - * FILE: hal/halx86/generic/timer.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: System Timer Interrupt and Management - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -.intel_syntax noprefix - -/* GLOBALS *******************************************************************/ - -.globl _HalpPerfCounter -_HalpLastPerfCounterLow: .long 0 -_HalpLastPerfCounterHigh: .long 0 -_HalpPerfCounter: -_HalpPerfCounterLow: .long 0 -_HalpPerfCounterHigh: .long 0 -_HalpSystemHardwareFlags: .long 0 - -_UnhandledMsg: - .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" - -/* FUNCTIONS *****************************************************************/ - -.global _HalpCalibrateStallExecution@0 -.func HalpCalibrateStallExecution@0 -_HalpCalibrateStallExecution@0: - - /* Setup the stack frame */ - push ebp - mov ebp, esp - sub esp, 12 - - /* Save EFLAGS and kill interrupts */ - pushf - cli - - /* Get the current interrupt mask on the PICs */ - xor eax, eax - in al, 0xA1 - shl eax, 8 - in al, 0x21 - - /* Save it */ - push eax - - /* Now mask everything except the RTC and PIC 2 chain-interrupt */ - mov eax, ~((1 << 2) | (1 << 8)) - - /* Program the PICs */ - out 0x21, al - shr eax, 8 - out 0xA1, al - - /* Now get the IDT */ - sidt [ebp-8] - mov ecx, [ebp-6] - - /* Get the IDT entry for the RTC */ - mov eax, 0x38 - 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 - mov word ptr [ecx+2], KGDT_R0_CODE - mov word ptr [ecx+4], 0x8E00 - shr eax, 16 - mov [ecx+6], ax - - /* Reset our counter */ - mov dword ptr [ebp-12], 0 - - /* Acquire CMOS lock */ - call _HalpAcquireSystemHardwareSpinLock@0 - - /* Now initialize register A on the CMOS */ - mov ax, (0x2D << 8) | 0xA - out 0x70, al - jmp $+2 - mov al, ah - out 0x71, al - jmp $+2 - - /* Read register B */ - mov ax, 0xB - out 0x70, al - jmp $+2 - in al, 0x71 - jmp $+2 - - /* Don't touch the LastKnownGoodConfig hack */ - and al, 1 - mov ah, al - - /* Enable the interrupt */ - or ah, 0x42 - - /* Now write the register B */ - mov al, 0xB - out 0x70, al - jmp $+2 - mov al, ah - out 0x71, al - jmp $+2 - - /* Read register C */ - mov al, 0xC - out 0x70, al - jmp $+2 - in al, 0x71 - jmp $+2 - - /* Read register D */ - mov al, 0xD - out 0x70, al - jmp $+2 - in al, 0x71 - 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 **************************/ - - /* Increment the interrupt count and check if this is the first one */ - 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, (0x2D << 8) | 0xA - out 0x70, al - jmp $+2 - mov al, ah - out 0x71, al - jmp $+2 - - /* Read register B */ - mov ax, 0xB - out 0x70, al - jmp $+2 - in al, 0x71 - jmp $+2 - - /* Don't touch the LastKnownGoodConfig hack */ - and al, 1 - mov ah, al - - /* Enable the interrupt */ - or ah, 0x42 - - /* Now write the register B */ - mov al, 0xB - out 0x70, al - jmp $+2 - mov al, ah - out 0x71, al - jmp $+2 - - /* Read register C */ - mov al, 0xC - out 0x70, al - jmp $+2 - in al, 0x71 - jmp $+2 - - /* Read register D */ - mov al, 0xD - out 0x70, al - jmp $+2 - in al, 0x71 - jmp $+2 - - /* Release CMOS lock */ - call _HalpReleaseCmosSpinLock@0 - - /* Dismiss the interrupt */ - mov al, 0x20 - out 0xA0, al - mov al, 0x62 - out 0x20, al - - /* Reset the counter and return back to the looper */ - xor eax, eax - iretd - - /******************* THIS IS THE 2ND RTC HANDLER **************************/ -ComputeStall: - - /* Do the calculation */ - neg eax - 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, 0x13 - - /* Acquire CMOS lock */ - call _HalpAcquireSystemHardwareSpinLock@0 - - /* Now initialize register A on the CMOS */ - mov ax, (0x2D << 8) | 0xA - out 0x70, al - jmp $+2 - mov al, ah - out 0x71, al - jmp $+2 - - /* Read register B */ - mov ax, 0xB - out 0x70, al - jmp $+2 - in al, 0x71 - jmp $+2 - - /* Don't touch the LastKnownGoodConfig hack */ - and al, 1 - mov ah, al - - /* Disable the interrupt */ - or ah, 0x2 - - /* Now write the register B */ - mov al, 0xB - out 0x70, al - jmp $+2 - mov al, ah - out 0x71, al - jmp $+2 - - /* Read register C */ - mov al, 0xC - out 0x70, al - jmp $+2 - in al, 0x71 - jmp $+2 - - /* Release CMOS lock */ - call _HalpReleaseCmosSpinLock@0 - - /* Dismiss the interrupt */ - mov al, 0x20 - out 0xA0, al - mov al, 0x62 - out 0x20, al - - /* Disable interrupts on return */ - and word ptr [esp+8], ~EFLAGS_INTERRUPT_MASK - iretd - - /************************* WE ARE BACK FROM RTC ***************************/ -AndItsNotYou: - - /* Restore the IDT */ - pop ecx - pop [ecx+4] - pop [ecx] - - /* Restore the mask */ - pop eax - out 0x21, al - shr eax, 8 - out 0xA1, al - - /* Restore EFLAGS */ - popf - - /* Restore stack and return */ - mov esp, ebp - pop ebp - ret -.endfunc - -#ifndef _MINIHAL_ -.globl _KeStallExecutionProcessor@4 -.func KeStallExecutionProcessor@4 -_KeStallExecutionProcessor@4: - - /* Get the number of microseconds required */ - mov ecx, [esp+4] - jecxz Done - - /* Multiply by the stall factor */ - mov eax, fs:[KPCR_STALL_SCALE_FACTOR] - mul ecx - - /* Align to 16 bytes */ - .align 16 - - /* Jump to subtraction loop */ - jmp SubtractLoop - - /* Align to 16 bytes */ - .align 16 - - /* Subtract one count */ -SubtractLoop: - sub eax, 1 - jnz SubtractLoop - -Done: - /* Return */ - ret 4 -.endfunc -#endif - -.global _KeQueryPerformanceCounter@4 -.func 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, _HalpPerfCounterLow - mov esi, _HalpPerfCounterHigh - - /* Read 8254 timer */ - mov al, 0 - out 0x43, al - jmp $+2 - in al, 0x40 - jmp $+2 - movzx ecx, al - in al, 0x40 - 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, _HalpPerfCounterLow - mov edx, _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, _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, _HalpLastPerfCounterHigh - jb short BelowHigh - jnz short BelowLow - - /* Check if we're above or below the last low value */ - cmp eax, _HalpLastPerfCounterLow - jb BelowHigh - -BelowLow: - - /* Update the last value and bring back interrupts */ - mov _HalpLastPerfCounterLow, eax - mov _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, _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, _HalpLastPerfCounterLow - mov esi, _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, _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 _HalpLastPerfCounterLow, eax - mov _HalpLastPerfCounterHigh, eax - jmp LoopPreInt -.endfunc Removed: trunk/reactos/hal/halx86/generic/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/trap.S?… ============================================================================== --- trunk/reactos/hal/halx86/generic/trap.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/trap.S (removed) @@ -1,45 +1,0 @@ -/* - * FILE: ntoskrnl/ke/i386/trap.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: System Traps, Entrypoints and Exitpoints - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * NOTE: See asmmacro.S for the shared entry/exit code. - */ - -/* INCLUDES ******************************************************************/ - -#include <reactos/asm.h> -#include <ndk/i386/asm.h> -#include <internal/i386/asmmacro.S> - -.code32 -.text - -TRAP_ENTRY HalpTrap0D, 0 -TRAP_ENTRY HalpApcInterrupt, KI_SOFTWARE_TRAP -TRAP_ENTRY HalpClockInterrupt, KI_PUSH_FAKE_ERROR_CODE -TRAP_ENTRY HalpProfileInterrupt, KI_PUSH_FAKE_ERROR_CODE - -PUBLIC @HalpExitToV86@4 -@HalpExitToV86@4: - /* Point esp to the iret frame and return */ - lea esp, [ecx + KTRAP_FRAME_EIP] - iret - -/* Here starts the real mode code */ -.code16 -PUBLIC _HalpRealModeStart -_HalpRealModeStart: - /* INT 0x10: AH = 0 (Set video Mode), AL = 0x12 (Mode 12) */ - mov eax, HEX(12) - int HEX(10) - - /* BOP */ - .byte HEX(C4), HEX(C4) - -/* The real mode stack */ -.align 4 -.space 2048 -_HalpRealModeEnd: -PUBLIC _HalpRealModeEnd - Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Thu Mar 25 20:23:09 2010 @@ -18,24 +18,35 @@ <file>beep.c</file> <file>bios.c</file> <file>cmos.c</file> + <file>display.c</file> <file>dma.c</file> <file>drive.c</file> - <file>display.c</file> <file>halinit.c</file> <file>misc.c</file> - <file>portio.c</file> <file>profil.c</file> <file>reboot.c</file> <file>sysinfo.c</file> - <file>systimer.S</file> <file>timer.c</file> - <file>trap.S</file> <file>usage.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>portio.c</file> + <file>systimer.S</file> + <file>trap.S</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>x86bios.c</file> + <file>systimer.S</file> + </directory> + </if> </directory> <directory name="include"> <pch>hal.h</pch> </directory> </module> + <module name="mini_hal" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> Modified: trunk/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_up.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Thu Mar 25 20:23:09 2010 @@ -9,7 +9,7 @@ <directory name="generic"> <file>spinlock.c</file> </directory> - <directory name="generic"> + <directory name="up"> <file>pic.c</file> <file>processor.c</file> </directory> Modified: trunk/reactos/hal/halx86/halmps.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?r… ============================================================================== --- trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Thu Mar 25 20:23:09 2010 @@ -14,10 +14,13 @@ <library>ntoskrnl</library> <library>libcntpr</library> <directory name="mp"> - <file>mps.S</file> - <file>mpsboot.asm</file> - <file>mpsirql.c</file> - + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>mps.S</file> + <file>mpsboot.asm</file> + <file>mpsirql.c</file> + </directory> + </if> </directory> </module> </group> Propchange: trunk/reactos/hal/halx86/mp/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Mar 25 20:23:09 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/hal/halx86/mp/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/hal/halx86/mp/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/hal/halx86/mp/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/hal/halx86/mp/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Mar 25 20:23:09 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/hal/halx86/mp/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/hal/halx86/mp/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/hal/halx86/mp/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Removed: trunk/reactos/hal/halx86/mp/mps.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mps.S?rev=46… ============================================================================== --- trunk/reactos/hal/halx86/mp/mps.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/mps.S (removed) @@ -1,109 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/mp/mps.S - * PURPOSE: Intel MultiProcessor specification support - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * Created 12/04/2001 - */ - -/* INCLUDES ******************************************************************/ - -#include <ndk/asm.h> - -/* FUNCTIONS *****************************************************************/ - -#define BEFORE \ - cld; \ - pusha; \ - pushl %ds; \ - pushl %es; \ - pushl %fs; \ - pushl %gs; \ - movl $(KGDT_R0_DATA), %eax; \ - movl %eax, %ds; \ - movl %eax, %es; \ - movl %eax, %gs; \ - movl $(KGDT_R0_PCR), %eax; \ - movl %eax, %fs; - -#define AFTER \ - popl %gs; \ - popl %fs; \ - popl %es; \ - popl %ds; \ - popa; - -.global _MpsIpiInterrupt -_MpsIpiInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call _MpsIpiHandler - - /* Return to the caller */ - AFTER - iret - - -.globl _MpsErrorInterrupt -_MpsErrorInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call _MpsErrorHandler - - /* Return to the caller */ - AFTER - iret - - -.globl _MpsSpuriousInterrupt -_MpsSpuriousInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call _MpsSpuriousHandler - - /* Return to the caller */ - AFTER - iret - -.global _MpsTimerInterrupt -_MpsTimerInterrupt: - cld - pusha - movl $0xef,%ebx - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - 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 _MpsTimerHandler - popl %eax - popl %eax - popl %eax - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - - - -/* EOF */ Removed: trunk/reactos/hal/halx86/mp/mpsboot.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpsboot.asm?… ============================================================================== --- trunk/reactos/hal/halx86/mp/mpsboot.asm [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/mpsboot.asm (removed) @@ -1,118 +1,0 @@ -; -; COPYRIGHT: See COPYING in the top level directory -; PROJECT: ReactOS kernel -; FILE: hal/halx86/mp/mpsboot.c -; PURPOSE: Bootstrap code for application processors -; PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) -; UPDATE HISTORY: -; Created 12/04/2001 -; - -; -; Memory map at this stage is: -; 0x2000 Location of our stack -; 0x3000 Startup code for the APs (this code) -; - -; -; Magic value to be put in EAX when multiboot.S is called as part of the -; application processor initialization process -; -AP_MAGIC equ 12481020h - - -X86_CR4_PAE equ 00000020h - -; -; Segment selectors -; -%define KERNEL_CS (0x8) -%define KERNEL_DS (0x10) - -section .text - -global _APstart -global _APend - -; 16 bit code -BITS 16 - -_APstart: - cli ; Just in case - - xor ax, ax - mov ds, ax - mov ss, ax - - mov eax, 3000h + APgdt - _APstart - lgdt [eax] - - mov eax, [2004h] ; Set the page directory - mov cr3, eax - - mov eax, [200ch] - cmp eax,0 - je NoPae - - mov eax,cr4 - or eax,X86_CR4_PAE - mov cr4,eax - -NoPae: - - mov eax, cr0 - or eax, 80010001h ; Turn on protected mode, paging and write protection - mov cr0, eax - - db 0eah - dw 3000h + flush - _APstart, KERNEL_CS - -; 32 bit code -BITS 32 - -flush: - mov ax, KERNEL_DS - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - ; Setup a stack for the AP - mov eax, 2000h - mov eax, [eax] - mov esp, eax - - ; Jump to start of the kernel with AP magic in ecx - mov ecx, AP_MAGIC - mov eax,[2008h] - jmp eax - - ; Never get here - - -; Temporary GDT descriptor for the APs - -APgdt: -; Limit - dw (3*8)-1 -; Base - dd 3000h + gdt - _APstart - -gdt: - dw 0x0 ; Null descriptor - dw 0x0 - dw 0x0 - dw 0x0 - - dw 0xffff ; Kernel code descriptor - dw 0x0000 - dw 0x9a00 - dw 0x00cf - - dw 0xffff ; Kernel data descriptor - dw 0x0000 - dw 0x9200 - dw 0x00cf - -_APend: Removed: trunk/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpsirql.c?re… ============================================================================== --- trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/mpsirql.c (removed) @@ -1,358 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/mp/mpsirql.c - * PURPOSE: Implements IRQLs for multiprocessor systems - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * 12/04/2001 CSH Created - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ******************************************************************/ - - -/* FUNCTIONS ****************************************************************/ - -#undef KeGetCurrentIrql -KIRQL NTAPI KeGetCurrentIrql (VOID) -/* - * PURPOSE: Returns the current irq level - * RETURNS: The current irq level - */ -{ - KIRQL irql; - ULONG Flags; - - Flags = __readeflags(); - _disable(); - - irql = __readfsbyte(FIELD_OFFSET(KPCR, Irql)); - if (irql > HIGH_LEVEL) - { - DPRINT1 ("CurrentIrql %x\n", irql); - ASSERT(FALSE); - } - if (Flags & EFLAGS_INTERRUPT_MASK) - { - _enable(); - } - return irql; -} - - -#undef KeSetCurrentIrql -VOID KeSetCurrentIrql (KIRQL NewIrql) -/* - * PURPOSE: Sets the current irq level without taking any action - */ -{ - ULONG Flags; - if (NewIrql > HIGH_LEVEL) - { - DPRINT1 ("NewIrql %x\n", NewIrql); - ASSERT(FALSE); - } - Flags = __readeflags(); - _disable(); - __writefsbyte(FIELD_OFFSET(KPCR, Irql), NewIrql); - if (Flags & EFLAGS_INTERRUPT_MASK) - { - _enable(); - } -} - -VOID -HalpLowerIrql(KIRQL NewIrql, BOOLEAN FromHalEndSystemInterrupt) -{ - ULONG Flags; - UCHAR DpcRequested; - if (NewIrql >= DISPATCH_LEVEL) - { - KeSetCurrentIrql (NewIrql); - APICWrite(APIC_TPR, IRQL2TPR (NewIrql) & APIC_TPR_PRI); - return; - } - Flags = __readeflags(); - if (KeGetCurrentIrql() > APC_LEVEL) - { - KeSetCurrentIrql (DISPATCH_LEVEL); - APICWrite(APIC_TPR, IRQL2TPR (DISPATCH_LEVEL) & APIC_TPR_PRI); - DpcRequested = __readfsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST])); - if (FromHalEndSystemInterrupt || DpcRequested) - { - __writefsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 0); - _enable(); - KiDispatchInterrupt(); - if (!(Flags & EFLAGS_INTERRUPT_MASK)) - { - _disable(); - } - } - KeSetCurrentIrql (APC_LEVEL); - } - if (NewIrql == APC_LEVEL) - { - return; - } - if (KeGetCurrentThread () != NULL && - KeGetCurrentThread ()->ApcState.KernelApcPending) - { - _enable(); - KiDeliverApc(KernelMode, NULL, NULL); - if (!(Flags & EFLAGS_INTERRUPT_MASK)) - { - _disable(); - } - } - KeSetCurrentIrql (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) -{ - KIRQL oldIrql = KeGetCurrentIrql(); - if (NewIrql > oldIrql) - { - DPRINT1 ("NewIrql %x CurrentIrql %x\n", NewIrql, oldIrql); - ASSERT(FALSE); - } - HalpLowerIrql (NewIrql, FALSE); -} - - -/********************************************************************** - * 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; - ULONG Flags; - - Flags = __readeflags(); - _disable(); - - OldIrql = KeGetCurrentIrql (); - - if (NewIrql < OldIrql) - { - DPRINT1 ("CurrentIrql %x NewIrql %x\n", KeGetCurrentIrql (), NewIrql); - ASSERT(FALSE); - } - - - if (NewIrql > DISPATCH_LEVEL) - { - APICWrite (APIC_TPR, IRQL2TPR(NewIrql) & APIC_TPR_PRI); - } - KeSetCurrentIrql (NewIrql); - if (Flags & EFLAGS_INTERRUPT_MASK) - { - _enable(); - } - - 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 NTAPI -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 NTAPI -KeRaiseIrqlToSynchLevel (VOID) -{ - return KfRaiseIrql (CLOCK2_LEVEL); -} - - -BOOLEAN NTAPI -HalBeginSystemInterrupt (KIRQL Irql, - UCHAR Vector, - PKIRQL OldIrql) -{ - ULONG Flags; - DPRINT("Vector (0x%X) Irql (0x%X)\n", Vector, Irql); - - if (KeGetCurrentIrql () >= Irql) - { - DPRINT1("current irql %d, new irql %d\n", KeGetCurrentIrql(), Irql); - ASSERT(FALSE); - } - - Flags = __readeflags(); - if (Flags & EFLAGS_INTERRUPT_MASK) - { - DPRINT1("HalBeginSystemInterrupt was called with interrupt's enabled\n"); - ASSERT(FALSE); - } - APICWrite (APIC_TPR, IRQL2TPR (Irql) & APIC_TPR_PRI); - *OldIrql = KeGetCurrentIrql (); - KeSetCurrentIrql (Irql); - return(TRUE); -} - - -VOID NTAPI -HalEndSystemInterrupt (KIRQL Irql, - IN PKTRAP_FRAME TrapFrame) -/* - * FUNCTION: Finish a system interrupt and restore the specified irq level. - */ -{ - ULONG Flags; - Flags = __readeflags(); - - if (Flags & EFLAGS_INTERRUPT_MASK) - { - DPRINT1("HalEndSystemInterrupt was called with interrupt's enabled\n"); - ASSERT(FALSE); - } - APICSendEOI(); - HalpLowerIrql (Irql, TRUE); -} - -VOID -NTAPI -HalDisableSystemInterrupt(UCHAR Vector, - KIRQL Irql) -{ - ULONG irq; - - DPRINT ("Vector (0x%X)\n", Vector); - - if (Vector < FIRST_DEVICE_VECTOR || - Vector >= FIRST_DEVICE_VECTOR + NUMBER_DEVICE_VECTORS) - { - DPRINT1("Not a device interrupt, vector=%x\n", Vector); - ASSERT(FALSE); - return; - } - - irq = VECTOR2IRQ (Vector); - IOAPICMaskIrq (irq); - - return; -} - - -BOOLEAN NTAPI -HalEnableSystemInterrupt (UCHAR Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode) -{ - ULONG irq; - - if (Vector < FIRST_DEVICE_VECTOR || - Vector >= FIRST_DEVICE_VECTOR + NUMBER_DEVICE_VECTORS) - { - DPRINT("Not a device interrupt\n"); - return FALSE; - } - - /* FIXME: We must check if the requested and the assigned interrupt mode is the same */ - - irq = VECTOR2IRQ (Vector); - IOAPICUnmaskIrq (irq); - - return TRUE; -} - -VOID FASTCALL -HalRequestSoftwareInterrupt(IN KIRQL Request) -{ - switch (Request) - { - case APC_LEVEL: - __writefsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_APC_REQUEST]), 1); - break; - - case DISPATCH_LEVEL: - __writefsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 1); - break; - - default: - ASSERT(FALSE); - } -} - -VOID FASTCALL -HalClearSoftwareInterrupt( - IN KIRQL Request) -{ - UNIMPLEMENTED; -}

1 0

[tkreuzer] 46446: [HAL] UP/MP cleanup: - remove KxAcquireSpinLock from halp.h, use the one from ntoskrnl instead - Use generic/spinlock.c in hal_generic_up and hal_generic_mp - Delete mp/spinlock.c - Move cmos spinlock functions to spinlock.c to make sure they are compiled for both up and mp - Move wrappers around fastcall functions to misc.c, as they are identical on up/mp.
by tkreuzer＠svn.reactos.org 25 Mar '10

25 Mar '10

Author: tkreuzer Date: Thu Mar 25 19:37:59 2010 New Revision: 46446 URL: http://svn.reactos.org/svn/reactos?rev=46446&view=rev Log: [HAL] UP/MP cleanup: - remove KxAcquireSpinLock from halp.h, use the one from ntoskrnl instead - Use generic/spinlock.c in hal_generic_up and hal_generic_mp - Delete mp/spinlock.c - Move cmos spinlock functions to spinlock.c to make sure they are compiled for both up and mp - Move wrappers around fastcall functions to misc.c, as they are identical on up/mp. Removed: trunk/reactos/hal/halx86/mp/spinlock.c Modified: trunk/reactos/hal/halx86/generic/cmos.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/generic/spinlock.c trunk/reactos/hal/halx86/hal_generic_mp.rbuild trunk/reactos/hal/halx86/hal_generic_up.rbuild trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/mp/mpsirql.c Modified: trunk/reactos/hal/halx86/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/cmos.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] Thu Mar 25 19:37:59 2010 @@ -15,44 +15,9 @@ /* GLOBALS *******************************************************************/ -KSPIN_LOCK HalpSystemHardwareLock; UCHAR HalpCmosCenturyOffset; -ULONG HalpSystemHardwareFlags; - -/* PRIVATE FUNCTIONS **********************************************************/ - -VOID -NTAPI -HalpAcquireSystemHardwareSpinLock(VOID) -{ - ULONG Flags; - - /* Get flags and disable interrupts */ - Flags = __readeflags(); - _disable(); - - /* Acquire the lock */ - KxAcquireSpinLock(&HalpSystemHardwareLock); - - /* We have the lock, save the flags now */ - HalpSystemHardwareFlags = Flags; -} - -VOID -NTAPI -HalpReleaseCmosSpinLock(VOID) -{ - ULONG Flags; - - /* Get the flags */ - Flags = HalpSystemHardwareFlags; - - /* Release the lock */ - KxReleaseSpinLock(&HalpSystemHardwareLock); - - /* Restore the flags */ - __writeeflags(Flags); -} + +/* PRIVATE FUNCTIONS *********************************************************/ FORCEINLINE UCHAR Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Thu Mar 25 19:37:59 2010 @@ -245,3 +245,60 @@ // return; } + +#ifdef _M_IX86 +/* x86 fastcall wrappers */ + +#undef KeRaiseIrql +/* + * @implemented + */ +VOID +NTAPI +KeRaiseIrql(KIRQL NewIrql, + PKIRQL OldIrql) +{ + /* Call the fastcall function */ + *OldIrql = KfRaiseIrql(NewIrql); +} + +#undef KeLowerIrql +/* + * @implemented + */ +VOID +NTAPI +KeLowerIrql(KIRQL NewIrql) +{ + /* Call the fastcall function */ + KfLowerIrql(NewIrql); +} + +#undef KeAcquireSpinLock +/* + * @implemented + */ +VOID +NTAPI +KeAcquireSpinLock(PKSPIN_LOCK SpinLock, + PKIRQL OldIrql) +{ + /* Call the fastcall function */ + *OldIrql = KfAcquireSpinLock(SpinLock); +} + +#undef KeReleaseSpinLock +/* + * @implemented + */ +VOID +NTAPI +KeReleaseSpinLock(PKSPIN_LOCK SpinLock, + KIRQL NewIrql) +{ + /* Call the fastcall function */ + KfReleaseSpinLock(SpinLock, NewIrql); +} + +#endif + Modified: trunk/reactos/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinloc… ============================================================================== --- trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] Thu Mar 25 19:37:59 2010 @@ -8,29 +8,25 @@ /* INCLUDES ******************************************************************/ -/* Enable this (and the define in irq.S) to make UP HAL work for MP Kernel */ -/* #define CONFIG_SMP */ +/* This file is compiled twice. Once for UP and once for MP */ #include <hal.h> #define NDEBUG #include <debug.h> +#include <internal/spinlock.h> + #undef KeAcquireSpinLock #undef KeReleaseSpinLock +/* GLOBALS *******************************************************************/ + +ULONG HalpSystemHardwareFlags; +KSPIN_LOCK HalpSystemHardwareLock; + /* FUNCTIONS *****************************************************************/ -/* - * @implemented - */ -VOID -NTAPI -KeAcquireSpinLock(PKSPIN_LOCK SpinLock, - PKIRQL OldIrql) -{ - /* Call the fastcall function */ - *OldIrql = KfAcquireSpinLock(SpinLock); -} +#ifdef _M_IX86 /* * @implemented @@ -47,18 +43,6 @@ /* Acquire the lock and return */ KxAcquireSpinLock(SpinLock); return OldIrql; -} - -/* - * @implemented - */ -VOID -NTAPI -KeReleaseSpinLock(PKSPIN_LOCK SpinLock, - KIRQL NewIrql) -{ - /* Call the fastcall function */ - KfReleaseSpinLock(SpinLock, NewIrql); } /* @@ -228,27 +212,38 @@ return TRUE; } -#undef KeRaiseIrql -/* - * @implemented - */ +#endif + VOID NTAPI -KeRaiseIrql(KIRQL NewIrql, - PKIRQL OldIrql) -{ - /* Call the fastcall function */ - *OldIrql = KfRaiseIrql(NewIrql); -} - -#undef KeLowerIrql -/* - * @implemented - */ +HalpAcquireSystemHardwareSpinLock(VOID) +{ + ULONG Flags; + + /* Get flags and disable interrupts */ + Flags = __readeflags(); + _disable(); + + /* Acquire the lock */ + KxAcquireSpinLock(&HalpSystemHardwareLock); + + /* We have the lock, save the flags now */ + HalpSystemHardwareFlags = Flags; +} + VOID NTAPI -KeLowerIrql(KIRQL NewIrql) -{ - /* Call the fastcall function */ - KfLowerIrql(NewIrql); -} +HalpReleaseCmosSpinLock(VOID) +{ + ULONG Flags; + + /* Get the flags */ + Flags = HalpSystemHardwareFlags; + + /* Release the lock */ + KxReleaseSpinLock(&HalpSystemHardwareLock); + + /* Restore the flags */ + __writeeflags(Flags); +} + Modified: trunk/reactos/hal/halx86/hal_generic_mp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_mp.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_mp.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_mp.rbuild [iso-8859-1] Thu Mar 25 19:37:59 2010 @@ -7,6 +7,9 @@ <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <define name="CONFIG_SMP" /> + <directory name="generic"> + <file>spinlock.c</file> + </directory> <directory name="mp"> <file>apic.c</file> <file>halinit_mp.c</file> @@ -14,7 +17,6 @@ <file>ipi_mp.c</file> <file>mpconfig.c</file> <file>processor_mp.c</file> - <file>spinlock.c</file> <file>halmp.rc</file> </directory> </module> Modified: trunk/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_up.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Thu Mar 25 19:37:59 2010 @@ -7,9 +7,11 @@ <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <directory name="generic"> + <file>spinlock.c</file> + </directory> + <directory name="generic"> <file>pic.c</file> <file>processor.c</file> - <file>spinlock.c</file> </directory> </module> </group> Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Thu Mar 25 19:37:59 2010 @@ -681,100 +681,7 @@ VOID ); -// -// This is duplicated from ke_x.h -// -#ifdef CONFIG_SMP -// -// Spinlock Acquisition at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) -{ - /* Make sure that we don't own the lock already */ - if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock) - { - /* We do, bugcheck! */ - KeBugCheckEx(SPIN_LOCK_ALREADY_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); - } - - for (;;) - { - /* Try to acquire it */ - if (InterlockedBitTestAndSet((PLONG)SpinLock, 0)) - { - /* Value changed... wait until it's locked */ - while (*(volatile KSPIN_LOCK *)SpinLock == 1) - { -#ifdef DBG - /* On debug builds, we use a much slower but useful routine */ - //Kii386SpinOnSpinLock(SpinLock, 5); - - /* FIXME: Do normal yield for now */ - YieldProcessor(); -#else - /* Otherwise, just yield and keep looping */ - YieldProcessor(); -#endif - } - } - else - { -#ifdef DBG - /* On debug builds, we OR in the KTHREAD */ - *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1; -#endif - /* All is well, break out */ - break; - } - } -} - -// -// Spinlock Release at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock) -{ -#ifdef DBG - /* Make sure that the threads match */ - if (((KSPIN_LOCK)KeGetCurrentThread() | 1) != *SpinLock) - { - /* They don't, bugcheck */ - KeBugCheckEx(SPIN_LOCK_NOT_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); - } -#endif - /* Clear the lock */ - InterlockedAnd((PLONG)SpinLock, 0); -} - -#else - -// -// Spinlock Acquire at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) -{ - /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ - UNREFERENCED_PARAMETER(SpinLock); -} - -// -// Spinlock Release at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock) -{ - /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ - UNREFERENCED_PARAMETER(SpinLock); -} - -#endif + VOID FASTCALL Modified: trunk/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpsirql.c?re… ============================================================================== --- trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] Thu Mar 25 19:37:59 2010 @@ -146,29 +146,6 @@ /********************************************************************** * NAME EXPORTED - * KeLowerIrql - * - * DESCRIPTION - * Restores the irq level on the current processor - * - * ARGUMENTS - * NewIrql = Irql to lower to - * - * RETURN VALUE - * None - * - * NOTES - */ -#undef KeLowerIrql -VOID NTAPI -KeLowerIrql (KIRQL NewIrql) -{ - KfLowerIrql (NewIrql); -} - - -/********************************************************************** - * NAME EXPORTED * KfRaiseIrql * * DESCRIPTION @@ -214,33 +191,6 @@ return OldIrql; } - - -/********************************************************************** - * NAME EXPORTED - * KeRaiseIrql - * - * DESCRIPTION - * Raises the hardware priority (irql) - * - * ARGUMENTS - * NewIrql = Irql to raise to - * OldIrql (OUT) = Caller supplied storage for the previous irql - * - * RETURN VALUE - * None - * - * NOTES - * Calls KfRaiseIrql - */ -#undef KeRaiseIrql -VOID NTAPI -KeRaiseIrql (KIRQL NewIrql, - PKIRQL OldIrql) -{ - *OldIrql = KfRaiseIrql (NewIrql); -} - /********************************************************************** * NAME EXPORTED Removed: trunk/reactos/hal/halx86/mp/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/spinlock.c?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/spinlock.c (removed) @@ -1,201 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/mp/spinlock.c - * PURPOSE: Implements spinlocks - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * Eric Kohl - * UPDATE HISTORY: - * 09/06/2000 Created - */ - -/* - * NOTE: On a uniprocessor machine spinlocks are implemented by raising - * the irq level - */ - -/* INCLUDES ****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* Hmm, needed for KDBG := 1. Why? */ -#undef KeGetCurrentIrql - -/* FUNCTIONS ***************************************************************/ - -#undef KeAcquireSpinLock -VOID NTAPI -KeAcquireSpinLock ( - PKSPIN_LOCK SpinLock, - PKIRQL OldIrql - ) -/* - * FUNCTION: Acquires a spinlock - * ARGUMENTS: - * SpinLock = Spinlock to acquire - * OldIrql (OUT) = Caller supplied storage for the previous irql - */ -{ - *OldIrql = KfAcquireSpinLock(SpinLock); -} - -KIRQL FASTCALL -KeAcquireSpinLockRaiseToSynch ( - PKSPIN_LOCK SpinLock - ) -{ - KIRQL OldIrql; - - OldIrql = KfRaiseIrql(CLOCK2_LEVEL); - KiAcquireSpinLock(SpinLock); - - return OldIrql; -} - -#undef KeReleaseSpinLock -VOID NTAPI -KeReleaseSpinLock ( - PKSPIN_LOCK SpinLock, - KIRQL NewIrql - ) -/* - * FUNCTION: Releases a spinlock - * ARGUMENTS: - * SpinLock = Spinlock to release - * NewIrql = Irql level before acquiring the spinlock - */ -{ - KfReleaseSpinLock(SpinLock, NewIrql); -} - -LOGICAL -FASTCALL -KeTryToAcquireQueuedSpinLock( - KSPIN_LOCK_QUEUE_NUMBER LockNumber, - PKIRQL OldIrql) -{ - UNIMPLEMENTED; - - return FALSE; -} - - -BOOLEAN -FASTCALL -KeTryToAcquireQueuedSpinLockRaiseToSynch( - KSPIN_LOCK_QUEUE_NUMBER LockNumber, - PKIRQL OldIrql) -{ - UNIMPLEMENTED; - - return FALSE; -} - -KIRQL FASTCALL -KfAcquireSpinLock ( - PKSPIN_LOCK SpinLock - ) -{ - KIRQL OldIrql; - - ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); - - OldIrql = KfRaiseIrql(DISPATCH_LEVEL); - KiAcquireSpinLock(SpinLock); - - return OldIrql; -} - -VOID FASTCALL -KfReleaseSpinLock ( - PKSPIN_LOCK SpinLock, - KIRQL NewIrql - ) -/* - * FUNCTION: Releases a spinlock - * ARGUMENTS: - * SpinLock = Spinlock to release - * NewIrql = Irql level before acquiring the spinlock - */ -{ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL || KeGetCurrentIrql() == SYNCH_LEVEL); - KiReleaseSpinLock(SpinLock); - KfLowerIrql(NewIrql); -} - - -/* - * @unimplemented - */ -VOID -FASTCALL -KeAcquireInStackQueuedSpinLock( - IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle - ) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -VOID -FASTCALL -KeAcquireInStackQueuedSpinLockRaiseToSynch( - IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle - ) -{ - UNIMPLEMENTED; -} - - -/* - * @unimplemented - */ -VOID -FASTCALL -KeReleaseInStackQueuedSpinLock( - IN PKLOCK_QUEUE_HANDLE LockHandle - ) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -KIRQL -FASTCALL -KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER Number) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -KIRQL -FASTCALL -KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -VOID -FASTCALL -KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER Number, - IN KIRQL OldIrql) -{ - UNIMPLEMENTED; -} - -/* EOF */

1 0

[akhaldi] 46445: The usual mandatory leftover from the sync.
by akhaldi＠svn.reactos.org 25 Mar '10

25 Mar '10

Author: akhaldi Date: Thu Mar 25 19:07:52 2010 New Revision: 46445 URL: http://svn.reactos.org/svn/reactos?rev=46445&view=rev Log: The usual mandatory leftover from the sync. Modified: branches/header-work/ (props changed) Propchange: branches/header-work/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 25 19:07:52 2010 @@ -1,2 +1,3 @@ -/branches/ros-amd64-bringup/reactos:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos:45691-46261 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/trunk/reactos:45691-46443

1 0

[akhaldi] 46444: Sync with trunk head.
by akhaldi＠svn.reactos.org 25 Mar '10

25 Mar '10

Author: akhaldi Date: Thu Mar 25 19:04:58 2010 New Revision: 46444 URL: http://svn.reactos.org/svn/reactos?rev=46444&view=rev Log: Sync with trunk head. Added: branches/header-work/base/applications/paint/paint.exe.amd64.manifest - copied unchanged from r46443, trunk/reactos/base/applications/paint/paint.exe.amd64.manifest branches/header-work/dll/directx/ksproxy/allocator.cpp - copied unchanged from r46443, trunk/reactos/dll/directx/ksproxy/allocator.cpp branches/header-work/dll/directx/ksproxy/mediasample.cpp - copied unchanged from r46443, trunk/reactos/dll/directx/ksproxy/mediasample.cpp branches/header-work/dll/nls/idndl/idndl.spec - copied unchanged from r46443, trunk/reactos/dll/nls/idndl/idndl.spec branches/header-work/dll/win32/batt/ (props changed) - copied from r46443, trunk/reactos/dll/win32/batt/ branches/header-work/dll/win32/dbghelp/image_private.h - copied unchanged from r46443, trunk/reactos/dll/win32/dbghelp/image_private.h branches/header-work/dll/win32/rsaenh/sha2.c - copied unchanged from r46443, trunk/reactos/dll/win32/rsaenh/sha2.c branches/header-work/dll/win32/rsaenh/sha2.h - copied unchanged from r46443, trunk/reactos/dll/win32/rsaenh/sha2.h branches/header-work/drivers/bus/acpi/compbatt/ - copied from r46443, trunk/reactos/drivers/bus/acpi/compbatt/ branches/header-work/drivers/bus/acpi/eval.c - copied unchanged from r46443, trunk/reactos/drivers/bus/acpi/eval.c branches/header-work/drivers/bus/acpi/interface.c - copied unchanged from r46443, trunk/reactos/drivers/bus/acpi/interface.c branches/header-work/drivers/storage/scsiport/scsiport.pspec - copied unchanged from r46443, trunk/reactos/drivers/storage/scsiport/scsiport.pspec branches/header-work/drivers/storage/scsiport/stubs.c - copied, changed from r46443, trunk/reactos/drivers/storage/scsiport/stubs.c branches/header-work/include/ndk/peb_teb.h - copied, changed from r46443, trunk/reactos/include/ndk/peb_teb.h Removed: branches/header-work/dll/nls/idndl/idndl.def branches/header-work/dll/win32/ole32/ifs.h branches/header-work/dll/win32/ole32/ole16.c branches/header-work/dll/win32/version/version_ros.diff branches/header-work/drivers/storage/scsiport/scsiport.spec Modified: branches/header-work/base/applications/paint/rsrc.rc branches/header-work/base/applications/rapps/rapps/firefox3.txt branches/header-work/base/applications/rapps/rapps/mirandaim.txt branches/header-work/base/applications/rapps/rapps/openttd.txt branches/header-work/base/applications/rapps/rapps/opera.txt branches/header-work/base/applications/rapps/rapps/sambatng.txt branches/header-work/base/applications/rapps/rapps/seamonkey.txt branches/header-work/base/applications/rapps/rapps/smplayer.txt branches/header-work/base/applications/rapps/rapps/thunderbird.txt branches/header-work/base/applications/sndrec32/audio_wavein.hpp branches/header-work/base/applications/sndrec32/audio_waveout.hpp branches/header-work/base/setup/usetup/partlist.c branches/header-work/base/shell/cmd/cmd.c branches/header-work/baseaddress.rbuild branches/header-work/boot/bootdata/bootcd/bootcd.rbuild branches/header-work/boot/bootdata/livecd/livecd.rbuild branches/header-work/boot/bootdata/packages/reactos.dff branches/header-work/boot/freeldr/freeldr/debug.c branches/header-work/dll/directx/bdaplgin/classfactory.cpp (props changed) branches/header-work/dll/directx/bdaplgin/controlnode.cpp branches/header-work/dll/directx/bdaplgin/devicecontrol.cpp branches/header-work/dll/directx/bdaplgin/digitaldemo.cpp branches/header-work/dll/directx/bdaplgin/frequencyfilter.cpp branches/header-work/dll/directx/bdaplgin/lnbinfo.cpp branches/header-work/dll/directx/bdaplgin/pincontrol.cpp branches/header-work/dll/directx/bdaplgin/precomp.h branches/header-work/dll/directx/bdaplgin/signalstatistics.cpp branches/header-work/dll/directx/d3d8/d3d8.spec (props changed) branches/header-work/dll/directx/dsound_new/classfactory.c (props changed) branches/header-work/dll/directx/dsound_new/dsound.spec (props changed) branches/header-work/dll/directx/dsound_new/dsound_convert.c (props changed) branches/header-work/dll/directx/dsound_new/regsvr.c (props changed) branches/header-work/dll/directx/ksproxy/basicaudio.cpp branches/header-work/dll/directx/ksproxy/clockforward.cpp branches/header-work/dll/directx/ksproxy/cvpconfig.cpp branches/header-work/dll/directx/ksproxy/cvpvbiconfig.cpp branches/header-work/dll/directx/ksproxy/datatype.cpp branches/header-work/dll/directx/ksproxy/enum_mediatypes.cpp branches/header-work/dll/directx/ksproxy/enumpins.cpp branches/header-work/dll/directx/ksproxy/input_pin.cpp branches/header-work/dll/directx/ksproxy/interface.cpp branches/header-work/dll/directx/ksproxy/ksproxy.cpp branches/header-work/dll/directx/ksproxy/ksproxy.rbuild branches/header-work/dll/directx/ksproxy/node.cpp branches/header-work/dll/directx/ksproxy/output_pin.cpp branches/header-work/dll/directx/ksproxy/precomp.h branches/header-work/dll/directx/ksproxy/proxy.cpp branches/header-work/dll/directx/ksproxy/qualityforward.cpp branches/header-work/dll/directx/qedit/samplegrabber.c branches/header-work/dll/directx/quartz/filtermapper.c branches/header-work/dll/nls/idndl/idndl.rbuild branches/header-work/dll/ntdll/dbg/dbgui.c branches/header-work/dll/ntdll/dispatch/dispatch.c branches/header-work/dll/ntdll/ldr/startup.c branches/header-work/dll/ntdll/ldr/utils.c branches/header-work/dll/ntdll/rtl/libsupp.c branches/header-work/dll/shellext/devcpux/devcpux.spec (props changed) branches/header-work/dll/shellext/slayer/slayer.spec (props changed) branches/header-work/dll/win32/acledit/acledit.c branches/header-work/dll/win32/acledit/stubs.c branches/header-work/dll/win32/advapi32/reg/reg.c branches/header-work/dll/win32/advapi32/sec/misc.c branches/header-work/dll/win32/avicap32/avicap32.c branches/header-work/dll/win32/avifil32/api.c branches/header-work/dll/win32/batt/resources/ (props changed) branches/header-work/dll/win32/beepmidi/beepmidi.c branches/header-work/dll/win32/crypt32/chain.c branches/header-work/dll/win32/crypt32/main.c branches/header-work/dll/win32/crypt32/oid.c branches/header-work/dll/win32/dbghelp/dbghelp_private.h branches/header-work/dll/win32/dbghelp/dwarf.c branches/header-work/dll/win32/dbghelp/elf_module.c branches/header-work/dll/win32/dbghelp/macho_module.c branches/header-work/dll/win32/dbghelp/module.c branches/header-work/dll/win32/dbghelp/pe_module.c branches/header-work/dll/win32/dbghelp/symbol.c branches/header-work/dll/win32/fusion/fusion.c branches/header-work/dll/win32/fusion/fusion.spec branches/header-work/dll/win32/gdiplus/brush.c branches/header-work/dll/win32/gdiplus/image.c branches/header-work/dll/win32/hlink/browse_ctx.c branches/header-work/dll/win32/hlink/hlink_main.c branches/header-work/dll/win32/hlink/link.c branches/header-work/dll/win32/iphlpapi/iphlpapi_private.h branches/header-work/dll/win32/iphlpapi/resinfo_reactos.c branches/header-work/dll/win32/kernel32/misc/dllmain.c branches/header-work/dll/win32/kernel32/misc/toolhelp.c branches/header-work/dll/win32/kernel32/synch/critical.c branches/header-work/dll/win32/kernel32/thread/fiber.c branches/header-work/dll/win32/mshtml/De.rc branches/header-work/dll/win32/mshtml/Fr.rc branches/header-work/dll/win32/mshtml/It.rc branches/header-work/dll/win32/mshtml/Ja.rc branches/header-work/dll/win32/mshtml/Lt.rc branches/header-work/dll/win32/mshtml/No.rc branches/header-work/dll/win32/mshtml/Si.rc branches/header-work/dll/win32/mshtml/htmldoc.c branches/header-work/dll/win32/mshtml/htmldoc3.c branches/header-work/dll/win32/mshtml/htmlelem2.c branches/header-work/dll/win32/mshtml/htmlevent.c branches/header-work/dll/win32/mshtml/htmlevent.h branches/header-work/dll/win32/mshtml/htmlimg.c branches/header-work/dll/win32/mshtml/htmlwindow.c branches/header-work/dll/win32/mshtml/mshtml_private.h branches/header-work/dll/win32/mshtml/mutation.c branches/header-work/dll/win32/mshtml/navigate.c branches/header-work/dll/win32/mshtml/nsevents.c branches/header-work/dll/win32/mshtml/nsio.c branches/header-work/dll/win32/mshtml/omnavigator.c branches/header-work/dll/win32/mshtml/persist.c branches/header-work/dll/win32/msi/database.c branches/header-work/dll/win32/msi/msi_De.rc branches/header-work/dll/win32/msi/msi_Fr.rc branches/header-work/dll/win32/msi/msi_It.rc branches/header-work/dll/win32/msi/msi_Lt.rc branches/header-work/dll/win32/msi/msi_Ro.rc branches/header-work/dll/win32/msi/msi_Ru.rc branches/header-work/dll/win32/msi/msi_Si.rc branches/header-work/dll/win32/msi/msiquery.c branches/header-work/dll/win32/msi/msiserver.idl branches/header-work/dll/win32/msvcrt/msvcrt.def branches/header-work/dll/win32/msxml3/domdoc.c branches/header-work/dll/win32/ole32/compobj.c branches/header-work/dll/win32/ole32/stg_bigblockfile.c branches/header-work/dll/win32/ole32/stg_prop.c branches/header-work/dll/win32/ole32/storage32.c branches/header-work/dll/win32/ole32/storage32.h branches/header-work/dll/win32/oleaut32/typelib.c branches/header-work/dll/win32/oleaut32/typelib2.c branches/header-work/dll/win32/oledlg/oledlg_De.rc branches/header-work/dll/win32/oledlg/oledlg_Fr.rc branches/header-work/dll/win32/oledlg/oledlg_Ja.rc branches/header-work/dll/win32/oledlg/oledlg_Lt.rc branches/header-work/dll/win32/oledlg/oledlg_Si.rc branches/header-work/dll/win32/riched20/caret.c branches/header-work/dll/win32/riched20/clipboard.c branches/header-work/dll/win32/riched20/editor.c branches/header-work/dll/win32/riched20/editor.h branches/header-work/dll/win32/riched20/editstr.h branches/header-work/dll/win32/riched20/list.c branches/header-work/dll/win32/riched20/paint.c branches/header-work/dll/win32/riched20/para.c branches/header-work/dll/win32/riched20/reader.c branches/header-work/dll/win32/riched20/richole.c branches/header-work/dll/win32/riched20/rtf.h branches/header-work/dll/win32/riched20/run.c branches/header-work/dll/win32/riched20/style.c branches/header-work/dll/win32/riched20/table.c branches/header-work/dll/win32/riched20/txthost.c branches/header-work/dll/win32/riched20/txtsrv.c branches/header-work/dll/win32/riched20/undo.c branches/header-work/dll/win32/riched20/wrap.c branches/header-work/dll/win32/riched20/writer.c branches/header-work/dll/win32/rpcrt4/cproxy.c branches/header-work/dll/win32/rpcrt4/cpsf.c branches/header-work/dll/win32/rpcrt4/cpsf.h branches/header-work/dll/win32/rpcrt4/cstub.c branches/header-work/dll/win32/rpcrt4/ndr_contexthandle.c branches/header-work/dll/win32/rpcrt4/ndr_fullpointer.c branches/header-work/dll/win32/rpcrt4/ndr_marshall.c branches/header-work/dll/win32/rpcrt4/ndr_misc.h branches/header-work/dll/win32/rpcrt4/ndr_ole.c branches/header-work/dll/win32/rpcrt4/rpc_transport.c branches/header-work/dll/win32/rsaenh/implglue.c branches/header-work/dll/win32/rsaenh/implglue.h branches/header-work/dll/win32/rsaenh/rsaenh.c branches/header-work/dll/win32/rsaenh/rsaenh.rbuild branches/header-work/dll/win32/shdocvw/dochost.c branches/header-work/dll/win32/shdocvw/iexplore.c branches/header-work/dll/win32/shdocvw/navigate.c branches/header-work/dll/win32/shdocvw/oleobject.c branches/header-work/dll/win32/shdocvw/shdocvw.h branches/header-work/dll/win32/shdocvw/webbrowser.c branches/header-work/dll/win32/shell32/autocomplete.c branches/header-work/dll/win32/shlwapi/ordinal.c branches/header-work/dll/win32/shlwapi/shlwapi.spec branches/header-work/dll/win32/shlwapi/string.c branches/header-work/dll/win32/shlwapi/url.c branches/header-work/dll/win32/syssetup/install.c branches/header-work/dll/win32/urlmon/internet.c branches/header-work/dll/win32/urlmon/sec_mgr.c branches/header-work/dll/win32/urlmon/uri.c branches/header-work/dll/win32/urlmon/urlmon.spec branches/header-work/dll/win32/user32/include/dde_private.h branches/header-work/dll/win32/user32/include/user32.h branches/header-work/dll/win32/user32/misc/dllmain.c branches/header-work/dll/win32/user32/windows/defwnd.c branches/header-work/dll/win32/user32/windows/draw.c branches/header-work/dll/win32/user32/windows/menu.c branches/header-work/dll/win32/user32/windows/message.c branches/header-work/dll/win32/usp10/usp10.c branches/header-work/dll/win32/version/info.c branches/header-work/dll/win32/version/resource.c branches/header-work/dll/win32/win32.rbuild branches/header-work/dll/win32/windowscodecs/info.c branches/header-work/dll/win32/windowscodecs/jpegformat.c branches/header-work/dll/win32/windowscodecs/pngformat.c branches/header-work/dll/win32/wininet/http.c branches/header-work/dll/win32/wininet/internet.c branches/header-work/dll/win32/wininet/internet.h branches/header-work/dll/win32/ws2_32/misc/stubs.c branches/header-work/drivers/base/bootvid/bootvid.rbuild branches/header-work/drivers/base/bootvid/i386/bootvid.c branches/header-work/drivers/base/bootvid/i386/vga.c branches/header-work/drivers/battery/battc/battc.c branches/header-work/drivers/bus/acpi/acpi.rbuild branches/header-work/drivers/bus/acpi/busmgr/bus.c branches/header-work/drivers/bus/acpi/busmgr/button.c branches/header-work/drivers/bus/acpi/buspdo.c branches/header-work/drivers/bus/acpi/cmbatt/cmbatt.c branches/header-work/drivers/bus/acpi/cmbatt/cmbatt.h branches/header-work/drivers/bus/acpi/cmbatt/cmbatt.rbuild branches/header-work/drivers/bus/acpi/cmbatt/cmbpnp.c branches/header-work/drivers/bus/acpi/cmbatt/cmbwmi.c branches/header-work/drivers/bus/acpi/cmbatt/cmexec.c branches/header-work/drivers/bus/acpi/include/acpi_bus.h branches/header-work/drivers/bus/acpi/include/acpisys.h branches/header-work/drivers/bus/acpi/main.c branches/header-work/drivers/bus/acpi/osl.c branches/header-work/drivers/bus/isapnp/isapnp.c branches/header-work/drivers/directx/dxapi/dxapi_driver.h branches/header-work/drivers/directx/dxg/ddhmg.c branches/header-work/drivers/directx/dxg/dxg_int.h branches/header-work/drivers/filesystems/ntfs/attrib.c branches/header-work/drivers/input/i8042prt/keyboard.c branches/header-work/drivers/network/dd/ne2000/include/ne2000.h branches/header-work/drivers/network/dd/ne2000/ne2000/8390.c branches/header-work/drivers/network/ndis/include/ndissys.h branches/header-work/drivers/network/ndis/ndis/io.c branches/header-work/drivers/network/ndis/ndis/miniport.c branches/header-work/drivers/network/ndis/ndis/misc.c branches/header-work/drivers/network/tcpip/datalink/lan.c branches/header-work/drivers/network/tcpip/tcpip/dispatch.c branches/header-work/drivers/serial/serenum/detect.c branches/header-work/drivers/serial/serial/devctrl.c branches/header-work/drivers/storage/class/class2/class2.c branches/header-work/drivers/storage/floppy/floppy.c branches/header-work/drivers/storage/ide/atapi/atapi.c branches/header-work/drivers/storage/scsiport/scsiport.c branches/header-work/drivers/storage/scsiport/scsiport.rbuild branches/header-work/drivers/video/displays/framebuf_new/framebuf_new.rbuild branches/header-work/drivers/video/displays/vga/main/enable.c branches/header-work/drivers/video/font/bmfd/font.c branches/header-work/drivers/video/font/bmfd/glyph.c branches/header-work/drivers/video/videoprt/agp.c branches/header-work/drivers/video/videoprt/int10.c branches/header-work/drivers/video/videoprt/interrupt.c branches/header-work/drivers/video/videoprt/resource.c branches/header-work/drivers/video/videoprt/services.c branches/header-work/drivers/video/videoprt/videoprt.c branches/header-work/drivers/wdm/audio/legacy/wdmaud/interface.h branches/header-work/include/ddk/ntddk.h branches/header-work/include/ddk/wdm.h branches/header-work/include/ndk/amd64/ (props changed) branches/header-work/include/ndk/amd64/asmmacro.S (props changed) branches/header-work/include/ndk/pstypes.h branches/header-work/include/ndk/rtlfuncs.h branches/header-work/include/ndk/rtltypes.h branches/header-work/include/ndk/umtypes.h branches/header-work/include/psdk/cfgmgr32.h branches/header-work/include/psdk/urlmon.idl branches/header-work/include/psdk/wincodec.idl branches/header-work/include/psdk/wincrypt.h branches/header-work/include/reactos/win32k/ntuser.h branches/header-work/include/reactos/wine/config.h branches/header-work/include/reactos/wine/port.h branches/header-work/lib/sdk/crt/math/i386/pow_asm.s branches/header-work/lib/sdk/crt/time/ (props changed) branches/header-work/media/doc/README.WINE branches/header-work/media/inf/battery.inf branches/header-work/media/inf/cpu.inf branches/header-work/media/inf/inf.rbuild branches/header-work/ntoskrnl/dbgk/dbgkutil.c branches/header-work/ntoskrnl/include/internal/i386/ke.h branches/header-work/ntoskrnl/include/internal/ke.h branches/header-work/ntoskrnl/include/internal/trap_x.h branches/header-work/ntoskrnl/io/iomgr/drvrlist.c branches/header-work/ntoskrnl/io/pnpmgr/pnpmgr.c branches/header-work/ntoskrnl/kdbg/ (props changed) branches/header-work/ntoskrnl/ke/i386/usercall.c branches/header-work/ntoskrnl/mm/ARM3/procsup.c branches/header-work/ntoskrnl/mm/mminit.c branches/header-work/ntoskrnl/po/power.c branches/header-work/ntoskrnl/rtl/libsupp.c branches/header-work/ntoskrnl/se/semgr.c branches/header-work/ntoskrnl/se/token.c branches/header-work/subsystems/win32/win32k/eng/surface.c branches/header-work/subsystems/win32/win32k/include/engobjects.h (props changed) branches/header-work/subsystems/win32/win32k/include/menu.h branches/header-work/subsystems/win32/win32k/include/msgqueue.h branches/header-work/subsystems/win32/win32k/ntuser/keyboard.c branches/header-work/subsystems/win32/win32k/ntuser/menu.c branches/header-work/subsystems/win32/win32k/ntuser/message.c branches/header-work/subsystems/win32/win32k/objects/gdibatch.c branches/header-work/subsystems/win32/win32k/pch.h branches/header-work/tools/nci/ncitool.c branches/header-work/tools/rsym/rsym.c (props changed) branches/header-work/tools/rsym/rsym.h (props changed) branches/header-work/tools/rsym/rsym.mak (props changed) branches/header-work/tools/rsym/rsym64.h branches/header-work/tools/rsym/rsym_common.c (props changed) branches/header-work/tools/widl/client.c branches/header-work/tools/widl/parser.tab.c branches/header-work/tools/widl/parser.y branches/header-work/tools/widl/typegen.c branches/header-work/tools/widl/typegen.h branches/header-work/tools/widl/widltypes.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/base/applications/paint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/p… Modified: branches/header-work/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/applications/sndrec32/audio_wavein.hpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/s… Modified: branches/header-work/base/applications/sndrec32/audio_waveout.hpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/s… Modified: branches/header-work/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/setup/usetup/p… Modified: branches/header-work/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/shell/cmd/cmd.… Modified: branches/header-work/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/baseaddress.rbuild?… Modified: branches/header-work/boot/bootdata/bootcd/bootcd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/bootdata/bootc… Modified: branches/header-work/boot/bootdata/livecd/livecd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/bootdata/livec… Modified: branches/header-work/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/bootdata/packa… Modified: branches/header-work/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeld… Modified: branches/header-work/dll/directx/bdaplgin/controlnode.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/bdaplgi… Modified: branches/header-work/dll/directx/bdaplgin/devicecontrol.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/bdaplgi… Modified: branches/header-work/dll/directx/bdaplgin/digitaldemo.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/bdaplgi… Modified: branches/header-work/dll/directx/bdaplgin/frequencyfilter.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/bdaplgi… Modified: branches/header-work/dll/directx/bdaplgin/lnbinfo.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/bdaplgi… Modified: branches/header-work/dll/directx/bdaplgin/pincontrol.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/bdaplgi… Modified: branches/header-work/dll/directx/bdaplgin/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/bdaplgi… Modified: branches/header-work/dll/directx/bdaplgin/signalstatistics.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/bdaplgi… Modified: branches/header-work/dll/directx/ksproxy/basicaudio.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/clockforward.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/cvpconfig.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/cvpvbiconfig.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/datatype.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/enum_mediatypes.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/enumpins.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/input_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/interface.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/ksproxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/ksproxy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/node.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/output_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/proxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/qualityforward.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/qedit/samplegrabber.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/qedit/s… Modified: branches/header-work/dll/directx/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/quartz/… Removed: branches/header-work/dll/nls/idndl/idndl.def URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/nls/idndl/idndl… Modified: branches/header-work/dll/nls/idndl/idndl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/nls/idndl/idndl… Modified: branches/header-work/dll/ntdll/dbg/dbgui.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/ntdll/dbg/dbgui… Modified: branches/header-work/dll/ntdll/dispatch/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/ntdll/dispatch/… Modified: branches/header-work/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/ntdll/ldr/start… Modified: branches/header-work/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/ntdll/ldr/utils… Modified: branches/header-work/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/ntdll/rtl/libsu… Modified: branches/header-work/dll/win32/acledit/acledit.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/acledit/a… Modified: branches/header-work/dll/win32/acledit/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/acledit/s… Modified: branches/header-work/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/advapi32/… Modified: branches/header-work/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/advapi32/… Modified: branches/header-work/dll/win32/avicap32/avicap32.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/avicap32/… Modified: branches/header-work/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/avifil32/… Modified: branches/header-work/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/beepmidi/… Modified: branches/header-work/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/crypt32/c… Modified: branches/header-work/dll/win32/crypt32/main.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/crypt32/m… Modified: branches/header-work/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/crypt32/o… Modified: branches/header-work/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/d… Modified: branches/header-work/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/d… Modified: branches/header-work/dll/win32/dbghelp/elf_module.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/e… Modified: branches/header-work/dll/win32/dbghelp/macho_module.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/m… Modified: branches/header-work/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/m… Modified: branches/header-work/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/p… Modified: branches/header-work/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/s… Modified: branches/header-work/dll/win32/fusion/fusion.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/fusion/fu… Modified: branches/header-work/dll/win32/fusion/fusion.spec URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/fusion/fu… Modified: branches/header-work/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/gdiplus/b… Modified: branches/header-work/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/gdiplus/i… Modified: branches/header-work/dll/win32/hlink/browse_ctx.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/hlink/bro… Modified: branches/header-work/dll/win32/hlink/hlink_main.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/hlink/hli… Modified: branches/header-work/dll/win32/hlink/link.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/hlink/lin… Modified: branches/header-work/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/iphlpapi/… Modified: branches/header-work/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/iphlpapi/… Modified: branches/header-work/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/kernel32/… Modified: branches/header-work/dll/win32/kernel32/misc/toolhelp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/kernel32/… Modified: branches/header-work/dll/win32/kernel32/synch/critical.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/kernel32/… Modified: branches/header-work/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/kernel32/… Modified: branches/header-work/dll/win32/mshtml/De.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/De… Modified: branches/header-work/dll/win32/mshtml/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/Fr… Modified: branches/header-work/dll/win32/mshtml/It.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/It… Modified: branches/header-work/dll/win32/mshtml/Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/Ja… Modified: branches/header-work/dll/win32/mshtml/Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/Lt… Modified: branches/header-work/dll/win32/mshtml/No.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/No… Modified: branches/header-work/dll/win32/mshtml/Si.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/Si… Modified: branches/header-work/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/ht… Modified: branches/header-work/dll/win32/mshtml/htmldoc3.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/ht… Modified: branches/header-work/dll/win32/mshtml/htmlelem2.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/ht… Modified: branches/header-work/dll/win32/mshtml/htmlevent.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/ht… Modified: branches/header-work/dll/win32/mshtml/htmlevent.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/ht… Modified: branches/header-work/dll/win32/mshtml/htmlimg.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/ht… Modified: branches/header-work/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/ht… Modified: branches/header-work/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/ms… Modified: branches/header-work/dll/win32/mshtml/mutation.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/mu… Modified: branches/header-work/dll/win32/mshtml/navigate.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/na… Modified: branches/header-work/dll/win32/mshtml/nsevents.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/ns… Modified: branches/header-work/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/ns… Modified: branches/header-work/dll/win32/mshtml/omnavigator.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/om… Modified: branches/header-work/dll/win32/mshtml/persist.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/mshtml/pe… Modified: branches/header-work/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msi/datab… Modified: branches/header-work/dll/win32/msi/msi_De.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msi/msi_D… Modified: branches/header-work/dll/win32/msi/msi_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msi/msi_F… Modified: branches/header-work/dll/win32/msi/msi_It.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msi/msi_I… Modified: branches/header-work/dll/win32/msi/msi_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msi/msi_L… Modified: branches/header-work/dll/win32/msi/msi_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msi/msi_R… Modified: branches/header-work/dll/win32/msi/msi_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msi/msi_R… Modified: branches/header-work/dll/win32/msi/msi_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msi/msi_S… Modified: branches/header-work/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msi/msiqu… Modified: branches/header-work/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msi/msise… Modified: branches/header-work/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msvcrt/ms… Modified: branches/header-work/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/msxml3/do… Modified: branches/header-work/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ole32/com… Removed: branches/header-work/dll/win32/ole32/ifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ole32/ifs… Removed: branches/header-work/dll/win32/ole32/ole16.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ole32/ole… Modified: branches/header-work/dll/win32/ole32/stg_bigblockfile.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ole32/stg… Modified: branches/header-work/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ole32/stg… Modified: branches/header-work/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ole32/sto… Modified: branches/header-work/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ole32/sto… Modified: branches/header-work/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/oleaut32/… Modified: branches/header-work/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/oleaut32/… Modified: branches/header-work/dll/win32/oledlg/oledlg_De.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/oledlg/ol… Modified: branches/header-work/dll/win32/oledlg/oledlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/oledlg/ol… Modified: branches/header-work/dll/win32/oledlg/oledlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/oledlg/ol… Modified: branches/header-work/dll/win32/oledlg/oledlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/oledlg/ol… Modified: branches/header-work/dll/win32/oledlg/oledlg_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/oledlg/ol… Modified: branches/header-work/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/list.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/style.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/table.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/txthost.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/riched20/… Modified: branches/header-work/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rpcrt4/cp… Modified: branches/header-work/dll/win32/rpcrt4/cpsf.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rpcrt4/cp… Modified: branches/header-work/dll/win32/rpcrt4/cpsf.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rpcrt4/cp… Modified: branches/header-work/dll/win32/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rpcrt4/cs… Modified: branches/header-work/dll/win32/rpcrt4/ndr_contexthandle.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rpcrt4/nd… Modified: branches/header-work/dll/win32/rpcrt4/ndr_fullpointer.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rpcrt4/nd… Modified: branches/header-work/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rpcrt4/nd… Modified: branches/header-work/dll/win32/rpcrt4/ndr_misc.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rpcrt4/nd… Modified: branches/header-work/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rpcrt4/nd… Modified: branches/header-work/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rpcrt4/rp… Modified: branches/header-work/dll/win32/rsaenh/implglue.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rsaenh/im… Modified: branches/header-work/dll/win32/rsaenh/implglue.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rsaenh/im… Modified: branches/header-work/dll/win32/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rsaenh/rs… Modified: branches/header-work/dll/win32/rsaenh/rsaenh.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rsaenh/rs… Modified: branches/header-work/dll/win32/shdocvw/dochost.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shdocvw/d… Modified: branches/header-work/dll/win32/shdocvw/iexplore.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shdocvw/i… Modified: branches/header-work/dll/win32/shdocvw/navigate.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shdocvw/n… Modified: branches/header-work/dll/win32/shdocvw/oleobject.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shdocvw/o… Modified: branches/header-work/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shdocvw/s… Modified: branches/header-work/dll/win32/shdocvw/webbrowser.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shdocvw/w… Modified: branches/header-work/dll/win32/shell32/autocomplete.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shell32/a… Modified: branches/header-work/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shlwapi/o… Modified: branches/header-work/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shlwapi/s… Modified: branches/header-work/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shlwapi/s… Modified: branches/header-work/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shlwapi/u… Modified: branches/header-work/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/syssetup/… Modified: branches/header-work/dll/win32/urlmon/internet.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/urlmon/in… Modified: branches/header-work/dll/win32/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/urlmon/se… Modified: branches/header-work/dll/win32/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/urlmon/ur… Modified: branches/header-work/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/urlmon/ur… Modified: branches/header-work/dll/win32/user32/include/dde_private.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/user32/in… Modified: branches/header-work/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/user32/in… Modified: branches/header-work/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/user32/mi… Modified: branches/header-work/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/user32/wi… Modified: branches/header-work/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/user32/wi… Modified: branches/header-work/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/user32/wi… Modified: branches/header-work/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/user32/wi… Modified: branches/header-work/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/usp10/usp… Modified: branches/header-work/dll/win32/version/info.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/version/i… Modified: branches/header-work/dll/win32/version/resource.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/version/r… Removed: branches/header-work/dll/win32/version/version_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/version/v… Modified: branches/header-work/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/win32.rbu… Modified: branches/header-work/dll/win32/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/windowsco… Modified: branches/header-work/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/windowsco… Modified: branches/header-work/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/windowsco… Modified: branches/header-work/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/h… Modified: branches/header-work/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/i… Modified: branches/header-work/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/i… Modified: branches/header-work/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ws2_32/mi… Modified: branches/header-work/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/base/bootvi… Modified: branches/header-work/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/base/bootvi… Modified: branches/header-work/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/base/bootvi… Modified: branches/header-work/drivers/battery/battc/battc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/battery/bat… Modified: branches/header-work/drivers/bus/acpi/acpi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/ac… Modified: branches/header-work/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/bu… Modified: branches/header-work/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/bu… Modified: branches/header-work/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/bu… Modified: branches/header-work/drivers/bus/acpi/cmbatt/cmbatt.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/cm… Modified: branches/header-work/drivers/bus/acpi/cmbatt/cmbatt.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/cm… Modified: branches/header-work/drivers/bus/acpi/cmbatt/cmbatt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/cm… Modified: branches/header-work/drivers/bus/acpi/cmbatt/cmbpnp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/cm… Modified: branches/header-work/drivers/bus/acpi/cmbatt/cmbwmi.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/cm… Modified: branches/header-work/drivers/bus/acpi/cmbatt/cmexec.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/cm… Modified: branches/header-work/drivers/bus/acpi/include/acpi_bus.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/in… Modified: branches/header-work/drivers/bus/acpi/include/acpisys.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/in… Modified: branches/header-work/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/ma… Modified: branches/header-work/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/os… Modified: branches/header-work/drivers/bus/isapnp/isapnp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/isapnp/… Modified: branches/header-work/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/directx/dxa… Modified: branches/header-work/drivers/directx/dxg/ddhmg.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/directx/dxg… Modified: branches/header-work/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/directx/dxg… Modified: branches/header-work/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/filesystems… Modified: branches/header-work/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/input/i8042… Modified: branches/header-work/drivers/network/dd/ne2000/include/ne2000.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/network/dd/… Modified: branches/header-work/drivers/network/dd/ne2000/ne2000/8390.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/network/dd/… Modified: branches/header-work/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/network/ndi… Modified: branches/header-work/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/network/ndi… Modified: branches/header-work/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/network/ndi… Modified: branches/header-work/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/network/ndi… Modified: branches/header-work/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/network/tcp… Modified: branches/header-work/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/network/tcp… Modified: branches/header-work/drivers/serial/serenum/detect.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/serial/sere… Modified: branches/header-work/drivers/serial/serial/devctrl.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/serial/seri… Modified: branches/header-work/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/storage/cla… Modified: branches/header-work/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/storage/flo… Modified: branches/header-work/drivers/storage/ide/atapi/atapi.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/storage/ide… Modified: branches/header-work/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/storage/scs… Modified: branches/header-work/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/storage/scs… Removed: branches/header-work/drivers/storage/scsiport/scsiport.spec URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/storage/scs… Copied: branches/header-work/drivers/storage/scsiport/stubs.c (from r46443, trunk/reactos/drivers/storage/scsiport/stubs.c) URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/storage/scs… Modified: branches/header-work/drivers/video/displays/framebuf_new/framebuf_new.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/video/displ… Modified: branches/header-work/drivers/video/displays/vga/main/enable.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/video/displ… Modified: branches/header-work/drivers/video/font/bmfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/video/font/… Modified: branches/header-work/drivers/video/font/bmfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/video/font/… Modified: branches/header-work/drivers/video/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/video/video… Modified: branches/header-work/drivers/video/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/video/video… Modified: branches/header-work/drivers/video/videoprt/interrupt.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/video/video… Modified: branches/header-work/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/video/video… Modified: branches/header-work/drivers/video/videoprt/services.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/video/video… Modified: branches/header-work/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/video/video… Modified: branches/header-work/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/wdm/audio/l… Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… Modified: branches/header-work/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r… Copied: branches/header-work/include/ndk/peb_teb.h (from r46443, trunk/reactos/include/ndk/peb_teb.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/peb_teb… Modified: branches/header-work/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/pstypes… Modified: branches/header-work/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/rtlfunc… Modified: branches/header-work/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/rtltype… Modified: branches/header-work/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/umtypes… Modified: branches/header-work/include/psdk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/cfgmgr… Modified: branches/header-work/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/urlmon… Modified: branches/header-work/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/wincod… Modified: branches/header-work/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/wincry… Modified: branches/header-work/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/win… Modified: branches/header-work/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/win… Modified: branches/header-work/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/win… Modified: branches/header-work/lib/sdk/crt/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/sdk/crt/math/i3… Modified: branches/header-work/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/header-work/media/doc/README.WI… Modified: branches/header-work/media/inf/battery.inf URL: http://svn.reactos.org/svn/reactos/branches/header-work/media/inf/battery.i… Modified: branches/header-work/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/branches/header-work/media/inf/cpu.inf?r… Modified: branches/header-work/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/media/inf/inf.rbuil… Modified: branches/header-work/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/dbgk/dbgku… Modified: branches/header-work/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… Modified: branches/header-work/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… Modified: branches/header-work/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… Modified: branches/header-work/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/io/iomgr/d… Modified: branches/header-work/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/io/pnpmgr/… Modified: branches/header-work/ntoskrnl/ke/i386/usercall.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/ke/i386/us… Modified: branches/header-work/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/mm/ARM3/pr… Modified: branches/header-work/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/mm/mminit.… Modified: branches/header-work/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/po/power.c… Modified: branches/header-work/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/rtl/libsup… Modified: branches/header-work/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/se/semgr.c… Modified: branches/header-work/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/se/token.c… Modified: branches/header-work/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… Modified: branches/header-work/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… Modified: branches/header-work/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… Modified: branches/header-work/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… Modified: branches/header-work/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… Modified: branches/header-work/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… Modified: branches/header-work/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… Modified: branches/header-work/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… Modified: branches/header-work/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/nci/ncitool.c… Modified: branches/header-work/tools/rsym/rsym64.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/rsym/rsym64.h… Modified: branches/header-work/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/widl/client.c… Modified: branches/header-work/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/widl/parser.t… Modified: branches/header-work/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/widl/parser.y… Modified: branches/header-work/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/widl/typegen.… Modified: branches/header-work/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/widl/typegen.… Modified: branches/header-work/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/widl/widltype…

1 0

[sir_richard] 46443: [COMPBATT]: Composite Battery Driver Stub Interface to keep Mr. Gutman happy.
by sir_richard＠svn.reactos.org 25 Mar '10

25 Mar '10

Author: sir_richard Date: Thu Mar 25 15:26:04 2010 New Revision: 46443 URL: http://svn.reactos.org/svn/reactos?rev=46443&view=rev Log: [COMPBATT]: Composite Battery Driver Stub Interface to keep Mr. Gutman happy. Added: trunk/reactos/drivers/bus/acpi/compbatt/ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c (with props) trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h (with props) trunk/reactos/drivers/bus/acpi/compbatt/compbatt.rbuild (with props) trunk/reactos/drivers/bus/acpi/compbatt/compbatt.rc (with props) trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c (with props) trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c (with props) Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpi.rbui… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] Thu Mar 25 15:26:04 2010 @@ -6,6 +6,9 @@ </directory> <directory name="cmbatt"> <xi:include href="cmbatt/cmbatt.rbuild" /> +</directory> +<directory name="compbatt"> + <xi:include href="compbatt/compbatt.rbuild" /> </directory> </group> Added: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c (added) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] Thu Mar 25 15:26:04 2010 @@ -1,0 +1,168 @@ +/* + * PROJECT: ReactOS Composite Battery Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/drivers/bus/acpi/compbatt/compbatt.c + * PURPOSE: Main Initialization Code and IRP Handling + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include "compbatt.h" + +/* GLOBALS ********************************************************************/ + +ULONG CompBattDebug; + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +CompBattOpenClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattSystemControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattMonitorIrpComplete(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PKEVENT Event) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattMonitorIrpCompleteWorker(IN PCOMPBATT_BATTERY_ENTRY BatteryData) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattRecalculateTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattIoctl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattQueryTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, + OUT PULONG Tag) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattDisableStatusNotify(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattSetStatusNotify(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, + IN ULONG BatteryTag, + IN PBATTERY_NOTIFY BatteryNotify) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattGetBatteryStatus(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, + IN ULONG Tag) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattQueryStatus(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, + IN ULONG Tag, + IN PBATTERY_STATUS BatteryStatus) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInformation, + IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, + IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattGetEstimatedTime(OUT PULONG Time, + IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION FdoExtension, + IN ULONG Tag, + IN BATTERY_QUERY_INFORMATION_LEVEL InfoLevel, + IN OPTIONAL LONG AtRate, + IN PVOID Buffer, + IN ULONG BufferLength, + OUT PULONG ReturnedLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h (added) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] Thu Mar 25 15:26:04 2010 @@ -1,0 +1,57 @@ +/* + * PROJECT: ReactOS Composite Battery Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/drivers/bus/acpi/compbatt/compbatt.h + * PURPOSE: Main Header File + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include <ntddk.h> +#include <initguid.h> +#include <batclass.h> +#include <debug.h> + +typedef struct _COMPBATT_BATTERY_ENTRY +{ + LIST_ENTRY BatteryLink; + IO_REMOVE_LOCK RemoveLock; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + WORK_QUEUE_ITEM WorkItem; + BOOLEAN WaitFlag; + BATTERY_WAIT_STATUS WaitStatus; + union + { + BATTERY_WAIT_STATUS WorkerWaitStatus; + BATTERY_STATUS WorkerStatus; + }; + ULONG Tag; + ULONG Flags; + BATTERY_INFORMATION BatteryInformation; + BATTERY_STATUS BatteryStatus; + ULONGLONG InterruptTime; + UNICODE_STRING BatteryName; +} COMPBATT_BATTERY_ENTRY, *PCOMPBATT_BATTERY_ENTRY; + +typedef struct _COMPBATT_DEVICE_EXTENSION +{ + PVOID ClassData; + ULONG NextTag; + LIST_ENTRY BatteryList; + FAST_MUTEX Lock; + ULONG Tag; + ULONG Flags; + BATTERY_INFORMATION BatteryInformation; + BATTERY_STATUS BatteryStatus; + ULONGLONG InterruptTime; + POWER_STATE PowerState; + ULONG LowCapacity; + ULONG HighCapacity; + PDEVICE_OBJECT AttachedDevice; + PDEVICE_OBJECT DeviceObject; + PVOID NotificationEntry; +} COMPBATT_DEVICE_EXTENSION, *PCOMPBATT_DEVICE_EXTENSION; + +extern ULONG CmBattDebug; + +/* EOF */ Propchange: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.rbuild (added) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.rbuild [iso-8859-1] Thu Mar 25 15:26:04 2010 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="compbatt" type="kernelmodedriver" installbase="system32/drivers" installname="compbatt.sys"> + <library>ntoskrnl</library> + <library>hal</library> + <library>battc</library> + <include base="compbatt">.</include> + <file>compbatt.c</file> + <file>compmisc.c</file> + <file>comppnp.c</file> + <file>compbatt.rc</file> + <pch>compbatt.h</pch> +</module> Propchange: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.rc (added) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.rc [iso-8859-1] Thu Mar 25 15:26:04 2010 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Composite Battery Driver\0" +#define REACTOS_STR_INTERNAL_NAME "compbatt\0" +#define REACTOS_STR_ORIGINAL_FILENAME "compbatt.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c (added) +++ trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c [iso-8859-1] Thu Mar 25 15:26:04 2010 @@ -1,0 +1,40 @@ +/* + * PROJECT: ReactOS Composite Battery Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/drivers/bus/acpi/compbatt/compmisc.c + * PURPOSE: Miscellaneous Support Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include "compbatt.h" + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +BatteryIoctl(IN ULONG IoControlCode, + IN PDEVICE_OBJECT DeviceObject, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + IN PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN BOOLEAN InternalDeviceIoControl) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattGetDeviceObjectPointer(IN PCUNICODE_STRING DeviceName, + IN ACCESS_MASK DesiredAccess, + OUT PFILE_OBJECT *FileObject, + OUT PDEVICE_OBJECT *DeviceObject) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c (added) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Thu Mar 25 15:26:04 2010 @@ -1,0 +1,95 @@ +/* + * PROJECT: ReactOS Composite Battery Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/drivers/bus/acpi/compbatt/comppnp.c + * PURPOSE: Plug-and-Play IOCTL/IRP Handling + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include "compbatt.h" + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +CompBattPowerDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +PCOMPBATT_BATTERY_ENTRY +NTAPI +RemoveBatteryFromList(IN PCUNICODE_STRING BatteryName, + IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOLEAN +NTAPI +IsBatteryAlreadyOnList(IN PCUNICODE_STRING BatteryName, + IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + return FALSE; +} + +NTSTATUS +NTAPI +CompBattAddNewBattery(IN PCUNICODE_STRING BatteryName, + IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattRemoveBattery(IN PCUNICODE_STRING BatteryName, + IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattGetBatteries(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattPnpEventHandler(IN PDEVICE_INTERFACE_CHANGE_NOTIFICATION Notification, + IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattAddDevice(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PdoDeviceObject) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +CompBattPnpDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 46442: [ACPI] - Add support for fixed power buttons - Cleanup some extra junk - Add a hack to prevent acquiring the mutex while in an ISR or DPC - Button events are received now and "acpi_bus_generate_event" will appear in the debug log when a power/sleep button is pressed - TODO: Implement IOCTL_GET_SYS_BUTTON_EVENT support so the power manager can recognize our button presses
by cgutman＠svn.reactos.org 25 Mar '10

25 Mar '10

Author: cgutman Date: Thu Mar 25 15:19:54 2010 New Revision: 46442 URL: http://svn.reactos.org/svn/reactos?rev=46442&view=rev Log: [ACPI] - Add support for fixed power buttons - Cleanup some extra junk - Add a hack to prevent acquiring the mutex while in an ISR or DPC - Button events are received now and "acpi_bus_generate_event" will appear in the debug log when a power/sleep button is pressed - TODO: Implement IOCTL_GET_SYS_BUTTON_EVENT support so the power manager can recognize our button presses Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/busmgr/button.c trunk/reactos/drivers/bus/acpi/include/acpi_bus.h trunk/reactos/drivers/bus/acpi/main.c trunk/reactos/drivers/bus/acpi/osl.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] Thu Mar 25 15:19:54 2010 @@ -1262,9 +1262,15 @@ hid = ACPI_THERMAL_HID; break; case ACPI_BUS_TYPE_POWER_BUTTON: + hid = ACPI_BUTTON_HID_POWER; + break; + case ACPI_BUS_TYPE_POWER_BUTTONF: hid = ACPI_BUTTON_HID_POWERF; break; case ACPI_BUS_TYPE_SLEEP_BUTTON: + hid = ACPI_BUTTON_HID_SLEEP; + break; + case ACPI_BUS_TYPE_SLEEP_BUTTONF: hid = ACPI_BUTTON_HID_SLEEPF; break; } @@ -1326,7 +1332,9 @@ */ switch (type) { case ACPI_BUS_TYPE_POWER_BUTTON: + case ACPI_BUS_TYPE_POWER_BUTTONF: case ACPI_BUS_TYPE_SLEEP_BUTTON: + case ACPI_BUS_TYPE_SLEEP_BUTTONF: break; default: status = AcpiAttachData(device->handle, @@ -1530,16 +1538,40 @@ if (!root) return_VALUE(AE_NOT_FOUND); - /* - * Enumerate all fixed-feature devices. + /* If ACPI_FADT_POWER_BUTTON is set, then a control + * method power button is present. Otherwise, a fixed + * power button is present. */ if (AcpiGbl_FADT.Flags & ACPI_FADT_POWER_BUTTON) result = acpi_bus_add(&device, acpi_root, NULL, ACPI_BUS_TYPE_POWER_BUTTON); - + else + { + /* Enable the fixed power button so we get notified if it is pressed */ + AcpiWriteBitRegister(ACPI_BITREG_POWER_BUTTON_ENABLE, 1); + + result = acpi_bus_add(&device, acpi_root, + NULL, ACPI_BUS_TYPE_POWER_BUTTONF); + } + + /* This one is a bit more complicated and we do it wrong + * right now. If ACPI_FADT_SLEEP_BUTTON is set but no + * device object is present then no sleep button is present, but + * if the flags is clear and there is no device object then it is + * a fixed sleep button. If the flag is set and there is a device object + * the we have a control method button just like above. + */ if (AcpiGbl_FADT.Flags & ACPI_FADT_SLEEP_BUTTON) result = acpi_bus_add(&device, acpi_root, NULL, ACPI_BUS_TYPE_SLEEP_BUTTON); + else + { + /* Enable the fixed sleep button so we get notified if it is pressed */ + AcpiWriteBitRegister(ACPI_BITREG_SLEEP_BUTTON_ENABLE, 1); + + result = acpi_bus_add(&device, acpi_root, + NULL, ACPI_BUS_TYPE_SLEEP_BUTTONF); + } return_VALUE(result); } @@ -1548,120 +1580,6 @@ /* -------------------------------------------------------------------------- Initialization/Cleanup -------------------------------------------------------------------------- */ - -static int -acpi_bus_init_irq (void) -{ - ACPI_STATUS status = AE_OK; - ACPI_OBJECT arg = {ACPI_TYPE_INTEGER}; - ACPI_OBJECT_LIST arg_list = {1, &arg}; - //char *message = NULL; - - DPRINT("acpi_bus_init_irq"); - - /* - * Let the system know what interrupt model we are using by - * evaluating the \_PIC object, if exists. - */ - - //switch (acpi_irq_model) { - //case ACPI_IRQ_MODEL_PIC: - // message = "PIC"; - // break; - //case ACPI_IRQ_MODEL_IOAPIC: - // message = "IOAPIC"; - // break; - //case ACPI_IRQ_MODEL_IOSAPIC: - // message = "IOSAPIC"; - // break; - //default: - // DPRINT1("Unknown interrupt routing model\n"); - // return_VALUE(AE_NOT_FOUND); - //} - - //DPRINT("Using %s for interrupt routing\n", message); - - //arg.Integer.Value = acpi_irq_model; - - //status = AcpiEvaluateObject(NULL, "\\_PIC", &arg_list, NULL); - //if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { - // ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PIC\n")); - // return_VALUE(AE_NOT_FOUND); - //} - - return_VALUE(0); -} - - -//void -//acpi_early_init (void) -//{ -// ACPI_STATUS status = AE_OK; -// -// DPRINT("acpi_early_init"); -// -// if (acpi_disabled) -// return_VOID; -// - /* enable workarounds, unless strict ACPI spec. compliance */ -// if (!acpi_strict) -// acpi_gbl_enable_interpreter_slack = TRUE; -// -// status = acpi_reallocate_root_table(); -// if (ACPI_FAILURE(status)) { -// printk(KERN_ERR PREFIX -// "Unable to reallocate ACPI tables\n"); -// goto error0; -// } -// -// status = acpi_initialize_subsystem(); -// if (ACPI_FAILURE(status)) { -// printk(KERN_ERR PREFIX -// "Unable to initialize the ACPI Interpreter\n"); -// goto error0; -// } -// -// status = acpi_load_tables(); -// if (ACPI_FAILURE(status)) { -// printk(KERN_ERR PREFIX -// "Unable to load the System Description Tables\n"); -// goto error0; -// } -// -//#ifdef CONFIG_X86 -// if (!acpi_ioapic) { -// /* compatible (0) means level (3) */ -// if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { -// acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; -// acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL; -// } -// /* Set PIC-mode SCI trigger type */ -// acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, -// (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); -// } else { -// /* -// * now that acpi_gbl_FADT is initialized, -// * update it with result from INT_SRC_OVR parsing -// */ -// acpi_gbl_FADT.sci_interrupt = acpi_sci_override_gsi; -// } -//#endif -// -// status = -// acpi_enable_subsystem(~ -// (ACPI_NO_HARDWARE_INIT | -// ACPI_NO_ACPI_ENABLE)); -// if (ACPI_FAILURE(status)) { -// printk(KERN_ERR PREFIX "Unable to enable ACPI\n"); -// goto error0; -// } -// -// return; -// -// error0: -// disable_acpi(); -// return; -//} int acpi_bus_init (void) @@ -1700,13 +1618,6 @@ /* Initialize sleep structures */ //acpi_sleep_init(); - - /* - * Get the system interrupt model and evaluate \_PIC. - */ - result = acpi_bus_init_irq(); - if (result) - goto error1; /* * Register the for all standard device notifications. @@ -1725,6 +1636,7 @@ ACPI_BUS_TYPE_SYSTEM); if (result) goto error2; + /* * Enumerate devices in the ACPI namespace. @@ -1736,7 +1648,6 @@ if (result) DPRINT1("acpi_bus_scan failed\n"); - //acpi_motherboard_init(); return_VALUE(0); /* Mimic structured exception handling */ Modified: trunk/reactos/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] Thu Mar 25 15:19:54 2010 @@ -57,6 +57,11 @@ UINT8 type; unsigned long pushed; }; + +struct acpi_device *power_button; +struct acpi_device *sleep_button; +struct acpi_device *lid_button; + /* -------------------------------------------------------------------------- Driver Interface -------------------------------------------------------------------------- */ @@ -112,10 +117,6 @@ int result = 0; ACPI_STATUS status = AE_OK; struct acpi_button *button = NULL; - - static struct acpi_device *power_button; - static struct acpi_device *sleep_button; - static struct acpi_device *lid_button; ACPI_FUNCTION_TRACE("acpi_button_add"); Modified: trunk/reactos/drivers/bus/acpi/include/acpi_bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/a… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/acpi_bus.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/acpi_bus.h [iso-8859-1] Thu Mar 25 15:19:54 2010 @@ -73,6 +73,8 @@ ACPI_BUS_TYPE_SYSTEM, ACPI_BUS_TYPE_POWER_BUTTON, ACPI_BUS_TYPE_SLEEP_BUTTON, + ACPI_BUS_TYPE_POWER_BUTTONF, + ACPI_BUS_TYPE_SLEEP_BUTTONF, ACPI_BUS_DEVICE_TYPE_COUNT }; Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Thu Mar 25 15:19:54 2010 @@ -17,6 +17,9 @@ #pragma alloc_text (PAGE, Bus_AddDevice) #endif + +extern struct acpi_device *sleep_button; +extern struct acpi_device *power_button; NTSTATUS NTAPI @@ -215,22 +218,37 @@ break; } - if (wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"PNP0C0C") || - wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"ACPI_FPB")) - { - DPRINT1("Power button reported to power manager\n"); - Caps |= SYS_BUTTON_POWER; - } - else if (wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"PNP0C0E") || - wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"ACPI_FSB")) - { - DPRINT1("Sleep button reported to power manager\n"); - Caps |= SYS_BUTTON_SLEEP; - } - else if (wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"PNP0C0D")) + if (wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"PNP0C0D")) { DPRINT1("Lid button reported to power manager\n"); Caps |= SYS_BUTTON_LID; + } + else if (((PPDO_DEVICE_DATA)commonData)->AcpiHandle == NULL) + { + /* We have to return both at the same time because since we + * have a NULL handle we are the fixed feature DO and we will + * only be called once (not once per device) + */ + if (power_button) + { + DPRINT1("Fixed power button reported to power manager\n"); + Caps |= SYS_BUTTON_POWER; + } + if (sleep_button) + { + DPRINT1("Fixed sleep button reported to power manager\n"); + Caps |= SYS_BUTTON_SLEEP; + } + } + if (wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"PNP0C0C")) + { + DPRINT1("Control method power button reported to power manager\n"); + Caps |= SYS_BUTTON_POWER; + } + else if (wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"PNP0C0E")) + { + DPRINT1("Control method sleep reported to power manager\n"); + Caps |= SYS_BUTTON_SLEEP; } else { Modified: trunk/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Thu Mar 25 15:19:54 2010 @@ -576,7 +576,12 @@ DPRINT("Waiting for semaphore %p\n", Handle); ASSERT(Mutex); - ExAcquireFastMutex(Mutex); + /* HACK: We enter here at a high IRQL sometimes + * because we get called from DPCs and ISRs and + * we can't use a fast mutex at that IRQL */ + if (KeGetCurrentIrql() <= APC_LEVEL) + ExAcquireFastMutex(Mutex); + return AE_OK; } @@ -590,7 +595,12 @@ DPRINT("AcpiOsSignalSemaphore %p\n",Handle); ASSERT(Mutex); - ExReleaseFastMutex(Mutex); + /* HACK: We enter here at a high IRQL sometimes + * because we get called from DPCs and ISRs and + * we can't use a fast mutex at that IRQL */ + if (KeGetCurrentIrql() <= APC_LEVEL) + ExReleaseFastMutex(Mutex); + return AE_OK; }

1 0

[sir_richard] 46441: [CMBATT]: Use PCH.
by sir_richard＠svn.reactos.org 25 Mar '10

25 Mar '10

Author: sir_richard Date: Thu Mar 25 15:05:03 2010 New Revision: 46441 URL: http://svn.reactos.org/svn/reactos?rev=46441&view=rev Log: [CMBATT]: Use PCH. Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.rbuild Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.rbuild [iso-8859-1] Thu Mar 25 15:05:03 2010 @@ -11,4 +11,5 @@ <file>cmbpnp.c</file> <file>cmbwmi.c</file> <file>cmbatt.rc</file> + <pch>cmbatt.h</pch> </module>

1 0

[tkreuzer] 46440: [BOOTCD/LIVECD] Add -$(ARCH) to non-x86 bootcd and livecd image names.
by tkreuzer＠svn.reactos.org 25 Mar '10

25 Mar '10

Author: tkreuzer Date: Thu Mar 25 14:55:00 2010 New Revision: 46440 URL: http://svn.reactos.org/svn/reactos?rev=46440&view=rev Log: [BOOTCD/LIVECD] Add -$(ARCH) to non-x86 bootcd and livecd image names. Modified: trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild trunk/reactos/boot/bootdata/livecd/livecd.rbuild Modified: trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/bootc… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] Thu Mar 25 14:55:00 2010 @@ -1,5 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="bootcd" type="iso" output="ReactOS.iso"> - <bootsector>isoboot</bootsector> -</module> +<if property="ARCH" value="i386> + <module name="bootcd" type="iso" output="ReactOS.iso"> + <bootsector>isoboot</bootsector> + </module> +</if> +<ifnot property="ARCH" value="i386> + <module name="bootcd" type="iso" output="ReactOS-$(ARCH).iso"> + <bootsector>isoboot</bootsector> + </module> +</ifnot> Modified: trunk/reactos/boot/bootdata/livecd/livecd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd/livec… ============================================================================== --- trunk/reactos/boot/bootdata/livecd/livecd.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd/livecd.rbuild [iso-8859-1] Thu Mar 25 14:55:00 2010 @@ -1,5 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="livecd" type="liveiso" output="ReactOS-LiveCD.iso"> - <bootsector>isoboot</bootsector> -</module> +<if property="ARCH" value="i386> + <module name="livecd" type="liveiso" output="ReactOS-LiveCD.iso"> + <bootsector>isoboot</bootsector> + </module> +</if> +<ifnot property="ARCH" value="i386> + <module name="livecd" type="liveiso" output="ReactOS-LiveCD-$(ARCH).iso"> + <bootsector>isoboot</bootsector> + </module> +</ifnot>

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
90
Older →

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 March 2010