Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 24776: - Change movw $0x0000, %ax to xorw %ax, %ax (because of probable bug in binutils, which compiles the first instruction into something weird) - Add segment registers save+restore in Int386() in FreeLdr (thanks to tamlin too)
by greatlrd＠svn.reactos.org 19 Nov '06

19 Nov '06

Author: greatlrd Date: Sun Nov 19 20:01:23 2006 New Revision: 24776 URL: http://svn.reactos.org/svn/reactos?rev=24776&view=rev Log: - Change movw $0x0000,%ax to xorw %ax,%ax (because of probable bug in binutils, which compiles the first instruction into something weird) - Add segment registers save+restore in Int386() in FreeLdr (thanks to tamlin too) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S Sun Nov 19 20:01:23 2006 @@ -84,7 +84,7 @@ /* Of course CS has to already be valid. */ /* We are currently in real-mode so we */ /* need real-mode segment values. */ - movw $0x0000,%ax + xorw %ax,%ax movw %ax,%ds movw %ax,%es movw %ax,%fs Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S Sun Nov 19 20:01:23 2006 @@ -74,7 +74,12 @@ movl 0x0c(%esp),%eax movl %eax,Int386_regsout + /* Save all registers + segment registers */ pushal + pushw %ds + pushw %es + pushw %fs + pushw %gs /* Copy the input regs to our variables */ movl $Int386_REGS,%edi @@ -147,6 +152,11 @@ rep movsb + /* Restore segment and all other registers */ + popw %gs + popw %fs + popw %es + popw %ds popal /* Get return value */

1 0

[ion] 24775: - Add kdcom driver. It contains the exact same functions as in HAL/kdbg.c (not yet used). - Fix halxbox compile.
by ion＠svn.reactos.org 17 Nov '06

17 Nov '06

Author: ion Date: Fri Nov 17 09:14:31 2006 New Revision: 24775 URL: http://svn.reactos.org/svn/reactos?rev=24775&view=rev Log: - Add kdcom driver. It contains the exact same functions as in HAL/kdbg.c (not yet used). - Fix halxbox compile. Added: trunk/reactos/drivers/base/kdcom/ trunk/reactos/drivers/base/kdcom/kdbg.c trunk/reactos/drivers/base/kdcom/kdcom.def trunk/reactos/drivers/base/kdcom/kdcom.rbuild trunk/reactos/drivers/base/kdcom/kdcom.rc Modified: trunk/reactos/drivers/base/directory.rbuild trunk/reactos/hal/halx86/generic/irql.c trunk/reactos/hal/halx86/xbox/display_xbox.c Modified: trunk/reactos/drivers/base/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/directory.rbu… ============================================================================== --- trunk/reactos/drivers/base/directory.rbuild (original) +++ trunk/reactos/drivers/base/directory.rbuild Fri Nov 17 09:14:31 2006 @@ -9,6 +9,9 @@ </directory> <directory name="bootvid"> <xi:include href="bootvid/bootvid.rbuild" /> +</directory> +<directory name="kdcom"> + <xi:include href="kdcom/kdcom.rbuild" /> </directory> <directory name="debugout"> <xi:include href="debugout/debugout.rbuild" /> Added: trunk/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdbg.c?… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdbg.c (added) +++ trunk/reactos/drivers/base/kdcom/kdbg.c Fri Nov 17 09:14:31 2006 @@ -1,0 +1,556 @@ +/* $Id: kdbg.c 23670 2006-08-23 17:28:39Z ion $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/hal/x86/kdbg.c + * PURPOSE: Serial i/o functions for the kernel debugger. + * PROGRAMMER: Emanuele Aliberti + * Eric Kohl + * UPDATE HISTORY: + * Created 05/09/99 + */ + +/* INCLUDES *****************************************************************/ + +#include <ntddk.h> +#define NDEBUG +#include <halfuncs.h> +#include <stdio.h> +#include <debug.h> + +typedef struct _KD_PORT_INFORMATION +{ + ULONG ComPort; + ULONG BaudRate; + ULONG BaseAddress; +} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; + +#define DEFAULT_BAUD_RATE 19200 + + +/* MACROS *******************************************************************/ + +#define SER_RBR(x) ((x)+0) +#define SER_THR(x) ((x)+0) +#define SER_DLL(x) ((x)+0) +#define SER_IER(x) ((x)+1) +#define SR_IER_ERDA 0x01 +#define SR_IER_ETHRE 0x02 +#define SR_IER_ERLSI 0x04 +#define SR_IER_EMS 0x08 +#define SR_IER_ALL 0x0F +#define SER_DLM(x) ((x)+1) +#define SER_IIR(x) ((x)+2) +#define SER_FCR(x) ((x)+2) +#define SR_FCR_ENABLE_FIFO 0x01 +#define SR_FCR_CLEAR_RCVR 0x02 +#define SR_FCR_CLEAR_XMIT 0x04 +#define SER_LCR(x) ((x)+3) +#define SR_LCR_CS5 0x00 +#define SR_LCR_CS6 0x01 +#define SR_LCR_CS7 0x02 +#define SR_LCR_CS8 0x03 +#define SR_LCR_ST1 0x00 +#define SR_LCR_ST2 0x04 +#define SR_LCR_PNO 0x00 +#define SR_LCR_POD 0x08 +#define SR_LCR_PEV 0x18 +#define SR_LCR_PMK 0x28 +#define SR_LCR_PSP 0x38 +#define SR_LCR_BRK 0x40 +#define SR_LCR_DLAB 0x80 +#define SER_MCR(x) ((x)+4) +#define SR_MCR_DTR 0x01 +#define SR_MCR_RTS 0x02 +#define SR_MCR_OUT1 0x04 +#define SR_MCR_OUT2 0x08 +#define SR_MCR_LOOP 0x10 +#define SER_LSR(x) ((x)+5) +#define SR_LSR_DR 0x01 +#define SR_LSR_TBE 0x20 +#define SER_MSR(x) ((x)+6) +#define SR_MSR_CTS 0x10 +#define SR_MSR_DSR 0x20 +#define SER_SCR(x) ((x)+7) + + +/* GLOBAL VARIABLES *********************************************************/ +#define KdComPortInUse _KdComPortInUse + +ULONG KdComPortInUse = 0; + + +/* STATIC VARIABLES *********************************************************/ + +static ULONG ComPort = 0; +static ULONG BaudRate = 0; +static PUCHAR PortBase = (PUCHAR)0; + +/* The com port must only be initialized once! */ +static BOOLEAN PortInitialized = FALSE; + + +/* STATIC FUNCTIONS *********************************************************/ + +static BOOLEAN +KdpDoesComPortExist (PUCHAR BaseAddress) +{ + BOOLEAN found; + UCHAR mcr; + UCHAR msr; + + found = FALSE; + + /* save Modem Control Register (MCR) */ + mcr = READ_PORT_UCHAR (SER_MCR(BaseAddress)); + + /* enable loop mode (set Bit 4 of the MCR) */ + WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x10); + + /* clear all modem output bits */ + WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x10); + + /* read the Modem Status Register */ + msr = READ_PORT_UCHAR (SER_MSR(BaseAddress)); + + /* + * the upper nibble of the MSR (modem output bits) must be + * equal to the lower nibble of the MCR (modem input bits) + */ + if ((msr & 0xF0) == 0x00) + { + /* set all modem output bits */ + WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x1F); + + /* read the Modem Status Register */ + msr = READ_PORT_UCHAR (SER_MSR(BaseAddress)); + + /* + * the upper nibble of the MSR (modem output bits) must be + * equal to the lower nibble of the MCR (modem input bits) + */ + if ((msr & 0xF0) == 0xF0) + { + /* + * setup a resonable state for the port: + * enable fifo and clear recieve/transmit buffers + */ + WRITE_PORT_UCHAR (SER_FCR(BaseAddress), + (SR_FCR_ENABLE_FIFO | SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT)); + WRITE_PORT_UCHAR (SER_FCR(BaseAddress), 0); + READ_PORT_UCHAR (SER_RBR(BaseAddress)); + WRITE_PORT_UCHAR (SER_IER(BaseAddress), 0); + found = TRUE; + } + } + + /* restore MCR */ + WRITE_PORT_UCHAR (SER_MCR(BaseAddress), mcr); + + return (found); +} + + +/* FUNCTIONS ****************************************************************/ + +/* HAL.KdPortInitialize */ +BOOLEAN +STDCALL +KdPortInitialize ( + PKD_PORT_INFORMATION PortInformation, + ULONG Unknown1, + ULONG Unknown2 + ) +{ + ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; + char buffer[80]; + ULONG divisor; + UCHAR lcr; + + if (PortInitialized == FALSE) + { + if (PortInformation->BaudRate != 0) + { + BaudRate = PortInformation->BaudRate; + } + else + { + BaudRate = DEFAULT_BAUD_RATE; + } + + if (PortInformation->ComPort == 0) + { + if (KdpDoesComPortExist ((PUCHAR)BaseArray[2])) + { + PortBase = (PUCHAR)BaseArray[2]; + ComPort = 2; + PortInformation->BaseAddress = (ULONG)PortBase; + PortInformation->ComPort = ComPort; +#ifndef NDEBUG + sprintf (buffer, + "\nSerial port COM%ld found at 0x%lx\n", + ComPort, + (ULONG)PortBase); + HalDisplayString (buffer); +#endif /* NDEBUG */ + } + else if (KdpDoesComPortExist ((PUCHAR)BaseArray[1])) + { + PortBase = (PUCHAR)BaseArray[1]; + ComPort = 1; + PortInformation->BaseAddress = (ULONG)PortBase; + PortInformation->ComPort = ComPort; +#ifndef NDEBUG + sprintf (buffer, + "\nSerial port COM%ld found at 0x%lx\n", + ComPort, + (ULONG)PortBase); + HalDisplayString (buffer); +#endif /* NDEBUG */ + } + else + { + sprintf (buffer, + "\nKernel Debugger: No COM port found!!!\n\n"); + HalDisplayString (buffer); + return FALSE; + } + } + else + { + if (KdpDoesComPortExist ((PUCHAR)BaseArray[PortInformation->ComPort])) + { + PortBase = (PUCHAR)BaseArray[PortInformation->ComPort]; + ComPort = PortInformation->ComPort; + PortInformation->BaseAddress = (ULONG)PortBase; +#ifndef NDEBUG + sprintf (buffer, + "\nSerial port COM%ld found at 0x%lx\n", + ComPort, + (ULONG)PortBase); + HalDisplayString (buffer); +#endif /* NDEBUG */ + } + else + { + sprintf (buffer, + "\nKernel Debugger: No serial port found!!!\n\n"); + HalDisplayString (buffer); + return FALSE; + } + } + + PortInitialized = TRUE; + } + + /* + * set baud rate and data format (8N1) + */ + + /* turn on DTR and RTS */ + WRITE_PORT_UCHAR (SER_MCR(PortBase), SR_MCR_DTR | SR_MCR_RTS); + + /* set DLAB */ + lcr = READ_PORT_UCHAR (SER_LCR(PortBase)) | SR_LCR_DLAB; + WRITE_PORT_UCHAR (SER_LCR(PortBase), lcr); + + /* set baud rate */ + divisor = 115200 / BaudRate; + WRITE_PORT_UCHAR (SER_DLL(PortBase), (UCHAR)(divisor & 0xff)); + WRITE_PORT_UCHAR (SER_DLM(PortBase), (UCHAR)((divisor >> 8) & 0xff)); + + /* reset DLAB and set 8N1 format */ + WRITE_PORT_UCHAR (SER_LCR(PortBase), + SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); + + /* read junk out of the RBR */ + lcr = READ_PORT_UCHAR (SER_RBR(PortBase)); + + /* + * set global info + */ + KdComPortInUse = (ULONG)PortBase; + + /* + * print message to blue screen + */ + sprintf (buffer, + "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", + ComPort, + (ULONG)PortBase, + BaudRate); + + HalDisplayString (buffer); + + return TRUE; +} + + +/* HAL.KdPortInitializeEx */ +BOOLEAN +STDCALL +KdPortInitializeEx ( + PKD_PORT_INFORMATION PortInformation, + ULONG Unknown1, + ULONG Unknown2 + ) +{ + ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; + PUCHAR ComPortBase; + char buffer[80]; + ULONG divisor; + UCHAR lcr; + + if (PortInformation->BaudRate == 0) + { + PortInformation->BaudRate = DEFAULT_BAUD_RATE; + } + + if (PortInformation->ComPort == 0) + { + return FALSE; + } + else + { + if (KdpDoesComPortExist ((PUCHAR)BaseArray[PortInformation->ComPort])) + { + ComPortBase = (PUCHAR)BaseArray[PortInformation->ComPort]; + PortInformation->BaseAddress = (ULONG)ComPortBase; +#ifndef NDEBUG + sprintf (buffer, + "\nSerial port COM%ld found at 0x%lx\n", + PortInformation->ComPort, + (ULONG)ComPortBase]; + HalDisplayString (buffer); +#endif /* NDEBUG */ + } + else + { + sprintf (buffer, + "\nKernel Debugger: Serial port not found!!!\n\n"); + HalDisplayString (buffer); + return FALSE; + } + } + + /* + * set baud rate and data format (8N1) + */ + + /* turn on DTR and RTS */ + WRITE_PORT_UCHAR (SER_MCR(ComPortBase), SR_MCR_DTR | SR_MCR_RTS); + + /* set DLAB */ + lcr = READ_PORT_UCHAR (SER_LCR(ComPortBase)) | SR_LCR_DLAB; + WRITE_PORT_UCHAR (SER_LCR(ComPortBase), lcr); + + /* set baud rate */ + divisor = 115200 / PortInformation->BaudRate; + WRITE_PORT_UCHAR (SER_DLL(ComPortBase), (UCHAR)(divisor & 0xff)); + WRITE_PORT_UCHAR (SER_DLM(ComPortBase), (UCHAR)((divisor >> 8) & 0xff)); + + /* reset DLAB and set 8N1 format */ + WRITE_PORT_UCHAR (SER_LCR(ComPortBase), + SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); + + /* read junk out of the RBR */ + lcr = READ_PORT_UCHAR (SER_RBR(ComPortBase)); + +#ifndef NDEBUG + + /* + * print message to blue screen + */ + sprintf (buffer, + "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", + PortInformation->ComPort, + (ULONG)ComPortBase, + PortInformation->BaudRate); + + HalDisplayString (buffer); + +#endif /* NDEBUG */ + + return TRUE; +} + + +/* HAL.KdPortGetByte */ +BOOLEAN +STDCALL +KdPortGetByte ( + PUCHAR ByteRecieved + ) +{ + if (PortInitialized == FALSE) + return FALSE; + + if ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_DR)) + { + *ByteRecieved = READ_PORT_UCHAR (SER_RBR(PortBase)); + return TRUE; + } + + return FALSE; +} + + +/* HAL.KdPortGetByteEx */ +BOOLEAN +STDCALL +KdPortGetByteEx ( + PKD_PORT_INFORMATION PortInformation, + PUCHAR ByteRecieved + ) +{ + PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; + + if ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_DR)) + { + *ByteRecieved = READ_PORT_UCHAR (SER_RBR(ComPortBase)); + return TRUE; + } + + return FALSE; +} + + +/* HAL.KdPortPollByte */ +BOOLEAN +STDCALL +KdPortPollByte ( + PUCHAR ByteRecieved + ) +{ + if (PortInitialized == FALSE) + return FALSE; + + while ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_DR) == 0) + ; + + *ByteRecieved = READ_PORT_UCHAR (SER_RBR(PortBase)); + + return TRUE; +} + + +/* HAL.KdPortPollByteEx */ +BOOLEAN +STDCALL +KdPortPollByteEx ( + PKD_PORT_INFORMATION PortInformation, + PUCHAR ByteRecieved + ) +{ + PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; + + while ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_DR) == 0) + ; + + *ByteRecieved = READ_PORT_UCHAR (SER_RBR(ComPortBase)); + + return TRUE; +} + + + + +/* HAL.KdPortPutByte */ +VOID +STDCALL +KdPortPutByte ( + UCHAR ByteToSend + ) +{ + if (PortInitialized == FALSE) + return; + + while ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_TBE) == 0) + ; + + WRITE_PORT_UCHAR (SER_THR(PortBase), ByteToSend); +} + +/* HAL.KdPortPutByteEx */ +VOID +STDCALL +KdPortPutByteEx ( + PKD_PORT_INFORMATION PortInformation, + UCHAR ByteToSend + ) +{ + PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; + + while ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_TBE) == 0) + ; + + WRITE_PORT_UCHAR (SER_THR(ComPortBase), ByteToSend); +} + + +/* HAL.KdPortRestore */ +VOID +STDCALL +KdPortRestore ( + VOID + ) +{ +} + + +/* HAL.KdPortSave */ +VOID +STDCALL +KdPortSave ( + VOID + ) +{ +} + + +/* HAL.KdPortDisableInterrupts */ +BOOLEAN +STDCALL +KdPortDisableInterrupts() +{ + UCHAR ch; + + if (PortInitialized == FALSE) + return FALSE; + + ch = READ_PORT_UCHAR (SER_MCR (PortBase)); + ch &= (~(SR_MCR_OUT1 | SR_MCR_OUT2)); + WRITE_PORT_UCHAR (SER_MCR (PortBase), ch); + + ch = READ_PORT_UCHAR (SER_IER (PortBase)); + ch &= (~SR_IER_ALL); + WRITE_PORT_UCHAR (SER_IER (PortBase), ch); + + return TRUE; +} + + +/* HAL.KdPortEnableInterrupts */ +BOOLEAN +STDCALL +KdPortEnableInterrupts() +{ + UCHAR ch; + + if (PortInitialized == FALSE) + return FALSE; + + ch = READ_PORT_UCHAR (SER_IER (PortBase)); + ch &= (~SR_IER_ALL); + ch |= SR_IER_ERDA; + WRITE_PORT_UCHAR (SER_IER (PortBase), ch); + + ch = READ_PORT_UCHAR (SER_MCR (PortBase)); + ch &= (~SR_MCR_LOOP); + ch |= (SR_MCR_OUT1 | SR_MCR_OUT2); + WRITE_PORT_UCHAR (SER_MCR (PortBase), ch); + + return TRUE; +} + +/* EOF */ Added: trunk/reactos/drivers/base/kdcom/kdcom.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.d… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.def (added) +++ trunk/reactos/drivers/base/kdcom/kdcom.def Fri Nov 17 09:14:31 2006 @@ -1,0 +1,16 @@ +LIBRARY kdcom.sys +EXPORTS + +KdComPortInUse=_KdComPortInUse +KdPortGetByte@4 +KdPortGetByteEx@8 +KdPortInitialize@12 +KdPortInitializeEx@12 +KdPortPollByte@4 +KdPortPollByteEx@8 +KdPortPutByte@4 +KdPortPutByteEx@8 +KdPortRestore@0 +KdPortSave@0 +KdPortDisableInterrupts@0 +KdPortEnableInterrupts@0 Added: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild (added) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild Fri Nov 17 09:14:31 2006 @@ -1,0 +1,9 @@ +<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.sys"> + <importlibrary definition="kdcom.def"></importlibrary> + <bootstrap base="reactos" nameoncd="kdcom.sys" /> + <include base="kdcom">.</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>kdbg.c</file> +</module> Added: trunk/reactos/drivers/base/kdcom/kdcom.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rc (added) +++ trunk/reactos/drivers/base/kdcom/kdcom.rc Fri Nov 17 09:14:31 2006 @@ -1,0 +1,14 @@ +/* $Id: bootvid.rc 24464 2006-10-09 04:00:34Z ion $ */ + +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS KDBG COM Library\0" +#define REACTOS_STR_INTERNAL_NAME "kdcom\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kdcom.sys\0" +#include <reactos/version.rc> + +IDB_BOOTIMAGE BITMAP DISCARDABLE "bootimage.bmp" +IDB_BAR BITMAP DISCARDABLE "bar.bmp" + + Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Fri Nov 17 09:14:31 2006 @@ -55,8 +55,16 @@ #define DIRQL_TO_IRQ(x) (PROFILE_LEVEL - x) #define IRQ_TO_DIRQL(x) (PROFILE_LEVEL - x) +#ifdef _MSC_VER + +#define KiInterruptDispatch2(x, y) + +#else + VOID STDCALL KiInterruptDispatch2 (ULONG Irq, KIRQL old_level); + +#endif /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/hal/halx86/xbox/display_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/display_xb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/display_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/display_xbox.c Fri Nov 17 09:14:31 2006 @@ -444,8 +444,8 @@ OldIrql = KfRaiseIrql(HIGH_LEVEL); KiAcquireSpinLock(&Lock); - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); + Ke386SaveFlags(Flags); + _disable(); while (*pch != 0) { @@ -482,7 +482,7 @@ pch++; } - Ki386RestoreFlags(Flags); + Ke386RestoreFlags(Flags); KiReleaseSpinLock(&Lock); KfLowerIrql(OldIrql);

1 0

[ion] 24774: - Fix some more MSVC problems. - Get rid of HAL's own intrisics and use intrin_i.h and/or MSVC intrinsics from intrin.h - If anyone knows how to make a .DEF file that is not only understood by both compilers, but also creates a proper import library, please let me know.
by ion＠svn.reactos.org 17 Nov '06

17 Nov '06

Author: ion Date: Fri Nov 17 07:18:41 2006 New Revision: 24774 URL: http://svn.reactos.org/svn/reactos?rev=24774&view=rev Log: - Fix some more MSVC problems. - Get rid of HAL's own intrisics and use intrin_i.h and/or MSVC intrinsics from intrin.h - If anyone knows how to make a .DEF file that is not only understood by both compilers, but also creates a proper import library, please let me know. Modified: trunk/reactos/hal/hal/hal.c trunk/reactos/hal/hal/hal.def trunk/reactos/hal/hal/hal.rbuild trunk/reactos/hal/halx86/generic/irql.c trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/hal/halx86/generic/reboot.c trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/include/hal.h trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/mp/apic.c trunk/reactos/hal/halx86/mp/mpsirql.c trunk/reactos/hal/halx86/up/halup.rbuild Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=24774&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c (original) +++ trunk/reactos/hal/hal/hal.c Fri Nov 17 07:18:41 2006 @@ -27,7 +27,7 @@ /* DATA **********************************************************************/ -ULONG KdComPortInUse = 0; +ULONG _KdComPortInUse = 0; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/hal/hal/hal.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.def?rev=24774&… ============================================================================== --- trunk/reactos/hal/hal/hal.def (original) +++ trunk/reactos/hal/hal/hal.def Fri Nov 17 07:18:41 2006 @@ -72,7 +72,7 @@ IoReadPartitionTable@16=HalpReadPartitionTable@16 IoSetPartitionInformation@16=HalpSetPartitionInformation@16 IoWritePartitionTable@20=HalpWritePartitionTable@20 -KdComPortInUse DATA +KdComPortInUse=_KdComPortInUse ; FIXME: DEPRECATED KdPortGetByte@4 KdPortGetByteEx@8 Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=247… ============================================================================== --- trunk/reactos/hal/hal/hal.rbuild (original) +++ trunk/reactos/hal/hal/hal.rbuild Fri Nov 17 07:18:41 2006 @@ -4,6 +4,7 @@ <library>ntoskrnl</library> <define name="_NTHAL_" /> <define name="__USE_W32API" /> + <linkerflag>-enable-stdcall-fixup</linkerflag> <file>hal.c</file> <file>hal.rc</file> </module> Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Fri Nov 17 07:18:41 2006 @@ -92,7 +92,7 @@ WRITE_PORT_UCHAR((PUCHAR)0xa1, pic_mask.slave); /* We can now enable interrupts */ - Ki386EnableInterrupts(); + _enable(); } VOID HalpEndSystemInterrupt(KIRQL Irql) @@ -100,7 +100,6 @@ * FUNCTION: Enable all irqs with higher priority. */ { - ULONG flags; const USHORT mask[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -110,15 +109,14 @@ }; /* Interrupts should be disable while enabling irqs of both pics */ - Ki386SaveFlags(flags); - Ki386DisableInterrupts(); + _disable(); pic_mask_intr.both &= mask[Irql]; WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); - /* restore flags */ - Ki386RestoreFlags(flags); + /* restore ints */ + _enable(); } VOID Modified: 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 (original) +++ trunk/reactos/hal/halx86/generic/processor.c Fri Nov 17 07:18:41 2006 @@ -68,7 +68,7 @@ { /* Enable interrupts and halt the processor */ _enable(); - Ki386HaltProcessor(); + Ke386HaltProcessor(); } /* Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c (original) +++ trunk/reactos/hal/halx86/generic/reboot.c Fri Nov 17 07:18:41 2006 @@ -65,7 +65,7 @@ HalpWriteResetCommand(); /* Halt the CPU */ - Ki386HaltProcessor(); + Ke386HaltProcessor(); } /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c (original) +++ trunk/reactos/hal/halx86/generic/timer.c Fri Nov 17 07:18:41 2006 @@ -130,11 +130,11 @@ if (Pcr->PrcbData.FeatureBits & KF_RDTSC) { LARGE_INTEGER EndCount, CurrentCount; - EndCount.QuadPart = (LONGLONG)__rdtsc; + EndCount.QuadPart = (LONGLONG)__rdtsc(); EndCount.QuadPart += Microseconds * (ULONGLONG)Pcr->PrcbData.MHz; do { - CurrentCount.QuadPart = (LONGLONG)__rdtsc; + CurrentCount.QuadPart = (LONGLONG)__rdtsc(); } while (CurrentCount.QuadPart < EndCount.QuadPart); } @@ -147,19 +147,15 @@ static ULONG Read8254Timer(VOID) { ULONG Count; - ULONG flags; - - /* save flags and disable interrupts */ - Ki386SaveFlags(flags); - Ki386DisableInterrupts(); + + /* Disable interrupts */ + _disable(); WRITE_PORT_UCHAR((PUCHAR) TMR_CTRL, TMR_SC0 | TMR_LATCH); Count = READ_PORT_UCHAR((PUCHAR) TMR_CNT0); Count |= READ_PORT_UCHAR((PUCHAR) TMR_CNT0) << 8; - /* restore flags */ - Ki386RestoreFlags(flags); - + _enable(); return Count; } @@ -212,10 +208,10 @@ { WaitFor8254Wraparound(); - StartCount.QuadPart = (LONGLONG)__rdtsc; + StartCount.QuadPart = (LONGLONG)__rdtsc(); WaitFor8254Wraparound(); - EndCount.QuadPart = (LONGLONG)__rdtsc; + EndCount.QuadPart = (LONGLONG)__rdtsc(); Pcr->PrcbData.MHz = (ULONG)(EndCount.QuadPart - StartCount.QuadPart) / 10000; DPRINT("%luMHz\n", Pcr->PrcbData.MHz); @@ -294,16 +290,12 @@ VOID STDCALL HalCalibratePerformanceCounter(ULONG Count) { - ULONG flags; - - /* save flags and disable interrupts */ - Ki386SaveFlags(flags); - Ki386DisableInterrupts(); + /* Disable interrupts */ + _disable(); __KeStallExecutionProcessor(Count); - /* restore flags */ - Ki386RestoreFlags(flags); + _enable(); } @@ -320,21 +312,19 @@ { PKIPCR Pcr; LARGE_INTEGER Value; - ULONG Flags; - - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); + + _disable(); Pcr = (PKIPCR)KeGetPcr(); if (Pcr->PrcbData.FeatureBits & KF_RDTSC) { - Ki386RestoreFlags(Flags); + _enable(); if (NULL != PerformanceFreq) { PerformanceFreq->QuadPart = Pcr->PrcbData.MHz * (ULONGLONG)1000000; } - Value.QuadPart = (LONGLONG)__rdtsc; + Value.QuadPart = (LONGLONG)__rdtsc(); } else { @@ -342,7 +332,7 @@ LARGE_INTEGER TicksNew; ULONG CountsLeft; - Ki386RestoreFlags(Flags); + _enable(); if (NULL != PerformanceFreq) { Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h (original) +++ trunk/reactos/hal/halx86/include/hal.h Fri Nov 17 07:18:41 2006 @@ -11,13 +11,14 @@ /* C Headers */ #include <stdio.h> -/* WDK HAL Complation hack */ +/* WDK HAL Compilation hack */ #ifdef _MSC_VER #include <excpt.h> #include <ntdef.h> #undef _NTHAL_ #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT +#define __declspec(dllimport) #endif /* IFS/DDK/NDK Headers */ @@ -31,10 +32,11 @@ #include <ldrtypes.h> #include <obfuncs.h> -#define KPCR_BASE 0xFF000000 // HACK! +/* Internal kernel headers */ +#include "internal/pci.h" +#include "internal/i386/intrin_i.h" /* Internal HAL Headers */ -#include "internal/pci.h" #include "apic.h" #include "bus.h" #include "halirq.h" 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 (original) +++ trunk/reactos/hal/halx86/include/halp.h Fri Nov 17 07:18:41 2006 @@ -4,6 +4,12 @@ #ifndef __INTERNAL_HAL_HAL_H #define __INTERNAL_HAL_HAL_H + +/* Temporary hack */ +#define KPCR_BASE 0xFF000000 + +/* WDK Hack */ +#define KdComPortInUse _KdComPortInUse #define HAL_APC_REQUEST 0 #define HAL_DPC_REQUEST 1 @@ -53,35 +59,6 @@ IN OUT PVOID Buffer, OUT PULONG ReturnedLength); -/* Non-standard functions */ -VOID STDCALL -HalReleaseDisplayOwnership(); - -BOOLEAN STDCALL -HalQueryDisplayOwnership(); - -#if defined(__GNUC__) -#define Ki386SaveFlags(x) __asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */) -#define Ki386RestoreFlags(x) __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory") -#define Ki386DisableInterrupts() __asm__ __volatile__("cli\n\t") -#define Ki386EnableInterrupts() __asm__ __volatile__("sti\n\t") -#define Ki386HaltProcessor() __asm__ __volatile__("hlt\n\t") -#define Ki386RdTSC(x) __asm__ __volatile__("rdtsc\n\t" : "=A" (x.u.LowPart), "=d" (x.u.HighPart)) -#define Ki386Rdmsr(msr,val1,val2) __asm__ __volatile__("rdmsr" : "=a" (val1), "=d" (val2) : "c" (msr)) -#define Ki386Wrmsr(msr,val1,val2) __asm__ __volatile__("wrmsr" : /* no outputs */ : "c" (msr), "a" (val1), "d" (val2)) -#define Ki386ReadFsByte(offset,x) __asm__ __volatile__("movb %%fs:%c1,%0" : "=q" (x) : "i" (offset)) -#define Ki386WriteFsByte(offset,x) __asm__ __volatile__("movb %0,%%fs:%c1" : : "q" ((UCHAR)x), "i" (offset)) - -#elif defined(_MSC_VER) -#define Ki386SaveFlags(x) __asm pushfd __asm pop x; -#define Ki386RestoreFlags(x) __asm push x __asm popfd; -#define Ki386DisableInterrupts() __asm cli -#define Ki386EnableInterrupts() __asm sti -#define Ki386HaltProcessor() __asm hlt -#else -#error Unknown compiler for inline assembler -#endif - typedef struct tagHALP_HOOKS { void (*InitPciBus)(ULONG BusNumber, PBUS_HANDLER BusHandler); Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=2… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c (original) +++ trunk/reactos/hal/halx86/mp/apic.c Fri Nov 17 07:18:41 2006 @@ -465,14 +465,14 @@ return FALSE; } - Ki386Rdmsr(0x1b /*MSR_IA32_APICBASE*/, l, h); + Ke386Rdmsr(0x1b /*MSR_IA32_APICBASE*/, l, h); if (!(l & /*MSR_IA32_APICBASE_ENABLE*/(1<<11))) { DPRINT1("Local APIC disabled by BIOS -- reenabling.\n"); l &= ~/*MSR_IA32_APICBASE_BASE*/(1<<11); l |= /*MSR_IA32_APICBASE_ENABLE | APIC_DEFAULT_PHYS_BASE*/(1<<11)|0xfee00000; - Ki386Wrmsr(0x1b/*MSR_IA32_APICBASE*/, l, h); + Ke386Wrmsr(0x1b/*MSR_IA32_APICBASE*/, l, h); } @@ -486,8 +486,8 @@ ULONG tmp, i, flags; /* save flags and disable interrupts */ - Ki386SaveFlags(flags); - Ki386DisableInterrupts(); + Ke386SaveFlags(flags); + _disable(); /* Wait up to 100ms for the APIC to become ready */ for (i = 0; i < 10000; i++) @@ -542,7 +542,7 @@ { DPRINT1("CPU(%d) Current IPI was not delivered after 100ms.\n", ThisCPU()); } - Ki386RestoreFlags(flags); + Ke386RestoreFlags(flags); } #endif @@ -754,7 +754,7 @@ HalBeginSystemInterrupt(IPI_LEVEL, IPI_VECTOR, &oldIrql); - Ki386EnableInterrupts(); + _enable(); #if 0 DbgPrint("(%s:%d) MpsIpiHandler on CPU%d, current irql is %d\n", __FILE__,__LINE__, KeGetCurrentProcessorNumber(), KeGetCurrentIrql()); @@ -766,7 +766,7 @@ DbgPrint("(%s:%d) MpsIpiHandler on CPU%d done\n", __FILE__,__LINE__, KeGetCurrentProcessorNumber()); #endif - Ki386DisableInterrupts(); + _disable(); HalEndSystemInterrupt(oldIrql, 0); } #endif @@ -804,7 +804,7 @@ HalBeginSystemInterrupt(LOCAL_TIMER_VECTOR, PROFILE_LEVEL, &oldIrql); - Ki386EnableInterrupts(); + _enable(); #if 0 CPU = ThisCPU(); @@ -826,7 +826,7 @@ //KeUpdateRunTime(&KernelTrapFrame, oldIrql); } - Ki386DisableInterrupts(); + _disable(); HalEndSystemInterrupt (oldIrql, 0); } @@ -878,7 +878,7 @@ */ if (TSCPresent) { - Ki386RdTSC(t1); + t1.QuadPart = (LONGLONG)__rdtsc(); } tt1 = APICRead(APIC_CCRT); @@ -888,7 +888,7 @@ tt2 = APICRead(APIC_CCRT); if (TSCPresent) { - Ki386RdTSC(t2); + t2.QuadPart = (LONGLONG)__rdtsc(); CPUMap[CPU].CoreSpeed = (HZ * (t2.QuadPart - t1.QuadPart)); DPRINT("CPU clock speed is %ld.%04ld MHz.\n", CPUMap[CPU].CoreSpeed/1000000, 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 (original) +++ trunk/reactos/hal/halx86/mp/mpsirql.c Fri Nov 17 07:18:41 2006 @@ -30,10 +30,10 @@ KIRQL irql; ULONG Flags; - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); - - Ki386ReadFsByte(FIELD_OFFSET(KPCR, Irql), irql); + Ke386SaveFlags(Flags); + _disable(); + + irql = __readfsbyte(FIELD_OFFSET(KPCR, Irql)); if (irql > HIGH_LEVEL) { DPRINT1 ("CurrentIrql %x\n", irql); @@ -41,7 +41,7 @@ } if (Flags & EFLAGS_INTERRUPT_MASK) { - Ki386EnableInterrupts(); + _enable(); } return irql; } @@ -59,12 +59,12 @@ DPRINT1 ("NewIrql %x\n", NewIrql); KEBUGCHECK (0); } - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); - Ki386WriteFsByte(FIELD_OFFSET(KPCR, Irql), NewIrql); + Ke386SaveFlags(Flags); + _disable(); + __writefsbyte(FIELD_OFFSET(KPCR, Irql), NewIrql); if (Flags & EFLAGS_INTERRUPT_MASK) { - Ki386EnableInterrupts(); + _enable(); } } @@ -79,20 +79,20 @@ APICWrite(APIC_TPR, IRQL2TPR (NewIrql) & APIC_TPR_PRI); return; } - Ki386SaveFlags(Flags); + Ke386SaveFlags(Flags); if (KeGetCurrentIrql() > APC_LEVEL) { KeSetCurrentIrql (DISPATCH_LEVEL); APICWrite(APIC_TPR, IRQL2TPR (DISPATCH_LEVEL) & APIC_TPR_PRI); - Ki386ReadFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), DpcRequested); + DpcRequested = __readfsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST])); if (FromHalEndSystemInterrupt || DpcRequested) { - Ki386WriteFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 0); - Ki386EnableInterrupts(); + __writefsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 0); + _enable(); KiDispatchInterrupt(); if (!(Flags & EFLAGS_INTERRUPT_MASK)) { - Ki386DisableInterrupts(); + _disable(); } } KeSetCurrentIrql (APC_LEVEL); @@ -104,11 +104,11 @@ if (KeGetCurrentThread () != NULL && KeGetCurrentThread ()->ApcState.KernelApcPending) { - Ki386EnableInterrupts(); + _enable(); KiDeliverApc(KernelMode, NULL, NULL); if (!(Flags & EFLAGS_INTERRUPT_MASK)) { - Ki386DisableInterrupts(); + _disable(); } } KeSetCurrentIrql (PASSIVE_LEVEL); @@ -190,8 +190,8 @@ KIRQL OldIrql; ULONG Flags; - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); + Ke386SaveFlags(Flags); + _disable(); OldIrql = KeGetCurrentIrql (); @@ -209,7 +209,7 @@ KeSetCurrentIrql (NewIrql); if (Flags & EFLAGS_INTERRUPT_MASK) { - Ki386EnableInterrupts(); + _enable(); } return OldIrql; @@ -304,7 +304,7 @@ KEBUGCHECK(0); } - Ki386SaveFlags(Flags); + Ke386SaveFlags(Flags); if (Flags & EFLAGS_INTERRUPT_MASK) { DPRINT1("HalBeginSystemInterrupt was called with interrupt's enabled\n"); @@ -325,7 +325,7 @@ */ { ULONG Flags; - Ki386SaveFlags(Flags); + Ke386SaveFlags(Flags); if (Flags & EFLAGS_INTERRUPT_MASK) { @@ -386,11 +386,11 @@ switch (Request) { case APC_LEVEL: - Ki386WriteFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_APC_REQUEST]), 1); + __writefsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_APC_REQUEST]), 1); break; case DISPATCH_LEVEL: - Ki386WriteFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 1); + __writefsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 1); break; default: Modified: trunk/reactos/hal/halx86/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/up/halup.rbuild (original) +++ trunk/reactos/hal/halx86/up/halup.rbuild Fri Nov 17 07:18:41 2006 @@ -6,6 +6,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> <define name="_NTHAL_" /> + <linkerflag>-enable-stdcall-fixup</linkerflag> <library>hal_generic</library> <library>hal_generic_up</library> <library>hal_generic_pc</library>

1 0

[ion] 24773: - MSVC VCPROJ Maker: * Don't insert NDEBUG as a define, files define this manually already. * Don't add _CRT flags, since the RTM WDK defines them properly. * Force warning.h to be included just like the WDK does. * Disable WPO and LTCG for now. * Disable 64-bit warnings for now. * Fix assembly custom steps. NASMW for .asm, and GAS for .S. - Please remember that you NEED the WDK 6000 RTM installed to use MSVC for building ReactOS. Don't change global build settings just because you
by ion＠svn.reactos.org 17 Nov '06

17 Nov '06

Author: ion Date: Fri Nov 17 05:44:37 2006 New Revision: 24773 URL: http://svn.reactos.org/svn/reactos?rev=24773&view=rev Log: - MSVC VCPROJ Maker: * Don't insert NDEBUG as a define, files define this manually already. * Don't add _CRT flags, since the RTM WDK defines them properly. * Force warning.h to be included just like the WDK does. * Disable WPO and LTCG for now. * Disable 64-bit warnings for now. * Fix assembly custom steps. NASMW for .asm, and GAS for .S. - Please remember that you NEED the WDK 6000 RTM installed to use MSVC for building ReactOS. Don't change global build settings just because you were too lazy to download it and think that because your Win32 app doesn't need it, it's ok to break other people's native/system/kernel/hal builds. Change it locally if you're lazy, but don't revert these changes again. Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Nov 17 05:44:37 2006 @@ -291,18 +291,11 @@ { defines.insert ( "_DEBUG" ); } - else - { - defines.insert ( "NDEBUG" ); - } if ( cfg.headers == MSVCHeaders ) { // this is a define in MinGW w32api, but not Microsoft's headers defines.insert ( "STDCALL=__stdcall" ); - // MinGW doesn't have a safe-string library yet - defines.insert ( "_CRT_SECURE_NO_DEPRECATE" ); - defines.insert ( "_CRT_NON_CONFORMING_SWPRINTFS" ); } if ( lib || exe ) @@ -329,7 +322,7 @@ fprintf ( OUT, "%s", escaped.c_str() ); } fprintf ( OUT, "\"\r\n" ); - + fprintf ( OUT, "\t\t\t\tForcedIncludeFiles=\"%s\"\r\n", "warning.h"); fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", sys ? 0 : (debug ? "3" : "0") ); fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"%d\"\r\n", debug ? 1 : 5 ); // 1=/MTd 5=/MT @@ -352,7 +345,7 @@ fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" ); } - fprintf ( OUT, "\t\t\t\tWholeProgramOptimization=\"%s\"\r\n", release ? "TRUE" : "FALSE"); + fprintf ( OUT, "\t\t\t\tWholeProgramOptimization=\"%s\"\r\n", release ? "FALSE" : "FALSE"); if ( release ) { fprintf ( OUT, "\t\t\t\tFavorSizeOrSpeed=\"1\"\r\n" ); @@ -360,7 +353,7 @@ } fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", speed ? "0" : "3" ); - fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", speed ? "FALSE" : "TRUE"); + fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", "FALSE"); if ( !module.cplusplus ) fprintf ( OUT, "\t\t\t\tCompileAs=\"1\"\r\n" ); fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 2 ); // 2=__stdcall 0=__cdecl @@ -411,7 +404,7 @@ fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"\r\n", module.name.c_str(), module_type.c_str() ); fprintf ( OUT, "\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 ); fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); - fprintf ( OUT, "\t\t\t\tLinkTimeCodeGeneration=\"%d\"\r\n", release? 1: 0); // whole program optimization + fprintf ( OUT, "\t\t\t\tLinkTimeCodeGeneration=\"%d\"\r\n", release? 0 : 0); // whole program optimization if ( debug ) fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() ); @@ -580,12 +573,18 @@ fprintf ( OUT, "lib.exe /OUT:"$(OutDir)\\%s.lib" "$(IntDir)\\%s.obj"
\"\r\n", module.name.c_str (), src.c_str () ); fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(IntDir)\\$(InputName).obj\"/>\r\n" ); } - else if ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')) + else if ((source_file.find(".asm") != string::npos)) { fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"nasmw $(InputPath) -f coff -o "$(OutDir)\\$(InputName).obj"\"\r\n"); fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); } + else if ((tolower(source_file.at(source_file.size() - 1)) == 's')) + { + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\$(InputName).obj"\"\r\n",include_string.c_str() ); + fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); + } fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); } //}

1 0

[hpoussin] 24772: Fix HAL compilation
by hpoussin＠svn.reactos.org 16 Nov '06

16 Nov '06

Author: hpoussin Date: Thu Nov 16 23:52:13 2006 New Revision: 24772 URL: http://svn.reactos.org/svn/reactos?rev=24772&view=rev Log: Fix HAL compilation Modified: trunk/reactos/hal/hal/hal.c trunk/reactos/hal/halx86/mp/spinlock.c Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=24772&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c (original) +++ trunk/reactos/hal/hal/hal.c Thu Nov 16 23:52:13 2006 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: hal/hal.c @@ -295,7 +294,7 @@ } -BOOLEAN +ARC_STATUS NTAPI HalGetEnvironmentVariable( PCH Name, @@ -304,7 +303,7 @@ { UNIMPLEMENTED; - return FALSE; + return ENOENT; } @@ -506,7 +505,7 @@ } -BOOLEAN +ARC_STATUS NTAPI HalSetEnvironmentVariable( PCH Name, @@ -514,16 +513,29 @@ { UNIMPLEMENTED; - return TRUE; -} - - -VOID + return ESUCCESS; +} + + +BOOLEAN NTAPI HalSetRealTimeClock( PTIME_FIELDS Time) { UNIMPLEMENTED; + + return TRUE; +} + + +ULONG +NTAPI +HalSetTimeIncrement( + ULONG Increment) +{ + UNIMPLEMENTED; + + return Increment; } @@ -949,6 +961,30 @@ } +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( Modified: 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 (original) +++ trunk/reactos/hal/halx86/mp/spinlock.c Thu Nov 16 23:52:13 2006 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/hal/x86/spinlock.c @@ -69,6 +68,29 @@ */ { 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

1 0

[gedmurphy] 24771: - Add test code for adjusting the brightness of an image. It's a bit of a hack at the moment, but adjusting the trackbar in the brightness dialog will alter the brightness of the small image. - save pointer to the bitmap header and bitmap bits in the image struct.
by gedmurphy＠svn.reactos.org 16 Nov '06

16 Nov '06

Author: gedmurphy Date: Thu Nov 16 21:49:58 2006 New Revision: 24771 URL: http://svn.reactos.org/svn/reactos?rev=24771&view=rev Log: - Add test code for adjusting the brightness of an image. It's a bit of a hack at the moment, but adjusting the trackbar in the brightness dialog will alter the brightness of the small image. - save pointer to the bitmap header and bitmap bits in the image struct. Added: trunk/reactos/base/applications/imagesoft/adjust.c trunk/reactos/base/applications/imagesoft/imageprop.h Modified: trunk/reactos/base/applications/imagesoft/imageprop.c trunk/reactos/base/applications/imagesoft/imagesoft.rbuild trunk/reactos/base/applications/imagesoft/imgedwnd.c trunk/reactos/base/applications/imagesoft/imgedwnd.h trunk/reactos/base/applications/imagesoft/precomp.h trunk/reactos/base/applications/imagesoft/res/imagesoft.ico (props changed) Added: trunk/reactos/base/applications/imagesoft/adjust.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/adjust.c (added) +++ trunk/reactos/base/applications/imagesoft/adjust.c Thu Nov 16 21:49:58 2006 @@ -1,0 +1,101 @@ +#include "precomp.h" + + +VOID +AdjustBrightness(PIMAGEADJUST pImgAdj, + HDC hdcMem) +{ + BITMAPINFO bi; + BITMAP bitmap; + BOOL bRes; + DWORD Count = 0; + INT i, j; + PBYTE pBits; + + /* Bitmap header */ + bi.bmiHeader.biSize = sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth = pImgAdj->ImageRect.right; + bi.bmiHeader.biHeight = pImgAdj->ImageRect.bottom; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + bi.bmiHeader.biCompression = BI_RGB; + bi.bmiHeader.biSizeImage = pImgAdj->ImageRect.right * 4 * pImgAdj->ImageRect.bottom; + bi.bmiHeader.biClrUsed = 0; + bi.bmiHeader.biClrImportant = 0; + + /* Buffer */ + pBits = (PBYTE)HeapAlloc(ProcessHeap, + 0, + pImgAdj->ImageRect.right * 4 * pImgAdj->ImageRect.bottom); + + bRes = GetDIBits(hdcMem, + pImgAdj->hBitmap, + 0, + pImgAdj->ImageRect.bottom, + pBits, + &bi, + DIB_RGB_COLORS); + + GetObject(pImgAdj->hBitmap, + sizeof(BITMAP), + &bitmap); + + for (i = 0; i < bitmap.bmHeight; i++) + { + for (j = 0; j < bitmap.bmWidth; j++) + { + DWORD Val = 0; + INT b, g, r; + + CopyMemory(&Val, + &pBits[Count], + 4); + + /* Get pixels in reverse order */ + b = GetRValue(Val); + g = GetGValue(Val); + r = GetBValue(Val); + + /* Red */ + r += pImgAdj->RedVal; + if (r > 255) r = 255; + else if (r < 0) r = 0; + + /* Green */ + g += pImgAdj->GreenVal; + if (g > 255) g = 255; + else if (g < 0) g = 0; + + /* Blue */ + b += pImgAdj->BlueVal; + if (b > 255) b = 255; + else if (b < 0) b = 0; + + /* Store in reverse order */ + Val = RGB(b, g, r); + CopyMemory(&pBits[Count], + &Val, + 4); + + /* RGB color take 4 bytes.The high-order byte must be zero */ + Count += 4; + } + } + + /* Set the new pixel bits */ + SetDIBits(hdcMem, + pImgAdj->hBitmap, + 0, + bRes, + pBits, + &bi, + DIB_RGB_COLORS); + + HeapFree(ProcessHeap, + 0, + pBits); + + InvalidateRect(pImgAdj->hPicPrev, + &pImgAdj->ImageRect, + FALSE); +} Modified: trunk/reactos/base/applications/imagesoft/imageprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imageprop.c (original) +++ trunk/reactos/base/applications/imagesoft/imageprop.c Thu Nov 16 21:49:58 2006 @@ -6,36 +6,52 @@ WPARAM wParam, LPARAM lParam) { - static PMAIN_WND_INFO Info = NULL; + static PIMAGEADJUST pImgAdj = NULL; switch (message) { case WM_INITDIALOG: { - Info = (PMAIN_WND_INFO)lParam; + pImgAdj = HeapAlloc(ProcessHeap, + 0, + sizeof(IMAGEADJUST)); + if (!pImgAdj) + return -1; + /* setup values */ + pImgAdj->Info = (PMAIN_WND_INFO)lParam; + pImgAdj->hPicPrev = GetDlgItem(hDlg, IDC_PICPREVIEW); + GetClientRect(pImgAdj->hPicPrev, + &pImgAdj->ImageRect); + + pImgAdj->hBitmap = CopyImage(pImgAdj->Info->ImageEditors->hBitmap, + IMAGE_BITMAP, + pImgAdj->ImageRect.right, + pImgAdj->ImageRect.bottom, + LR_CREATEDIBSECTION); + + pImgAdj->OldTrackPos = 100; + pImgAdj->RedVal = pImgAdj->BlueVal = pImgAdj->GreenVal = 0; + + /* setup dialog */ SendDlgItemMessage(hDlg, IDC_BRI_FULL, BM_SETCHECK, BST_CHECKED, 0); - SendDlgItemMessage(hDlg, IDC_BRI_TRACKBAR, TBM_SETRANGE, TRUE, (LPARAM)MAKELONG(0, 200)); - SendDlgItemMessage(hDlg, IDC_BRI_TRACKBAR, TBM_SETPOS, TRUE, (LPARAM)100); - SetDlgItemText(hDlg, IDC_BRI_EDIT, _T("100")); - return TRUE; } @@ -43,33 +59,26 @@ case WM_DRAWITEM: { LPDRAWITEMSTRUCT lpDrawItem; - HWND hPicPrev = GetDlgItem(hDlg, IDC_PICPREVIEW); - RECT ImageRect = {0}; HDC hdcMem; lpDrawItem = (LPDRAWITEMSTRUCT)lParam; - - GetClientRect(hPicPrev, - &ImageRect); hdcMem = CreateCompatibleDC(lpDrawItem->hDC); if(lpDrawItem->CtlID == IDC_PICPREVIEW) { - SelectObject(hdcMem, - Info->ImageEditors->hBitmap); + SelectObject(hdcMem, + pImgAdj->hBitmap); - StretchBlt(lpDrawItem->hDC, - ImageRect.left, - ImageRect.top, - ImageRect.right, - ImageRect.bottom, - hdcMem, - 0, - 0, - Info->ImageEditors->Width, - Info->ImageEditors->Height, - SRCCOPY); + BitBlt(lpDrawItem->hDC, + pImgAdj->ImageRect.left, + pImgAdj->ImageRect.top, + pImgAdj->ImageRect.right, + pImgAdj->ImageRect.bottom, + hdcMem, + 0, + 0, + SRCCOPY); DeleteDC(hdcMem); } @@ -81,15 +90,29 @@ if (LOWORD(wParam) == TB_THUMBTRACK || LOWORD(wParam) == TB_ENDTRACK) { - DWORD Pos = (DWORD)SendDlgItemMessage(hDlg, - IDC_BRI_TRACKBAR, - TBM_GETPOS, - 0, - 0); + HDC hdcMem; + DWORD TrackPos = (DWORD)SendDlgItemMessage(hDlg, + IDC_BRI_TRACKBAR, + TBM_GETPOS, + 0, + 0); + + /* quick hack, change all the colours regardless */ + pImgAdj->RedVal = pImgAdj->BlueVal = pImgAdj->GreenVal = TrackPos - pImgAdj->OldTrackPos; + pImgAdj->OldTrackPos = TrackPos; + SetDlgItemInt(hDlg, IDC_BRI_EDIT, - Pos, + TrackPos, FALSE); + + hdcMem = GetDC(pImgAdj->hPicPrev); + + AdjustBrightness(pImgAdj, + hdcMem); + + ReleaseDC(pImgAdj->hPicPrev, hdcMem); + } return TRUE; @@ -106,6 +129,16 @@ } } break; + + case WM_DESTROY: + { + DeleteObject(pImgAdj->hBitmap); + + HeapFree(ProcessHeap, + 0, + pImgAdj); + } + } return FALSE; Added: trunk/reactos/base/applications/imagesoft/imageprop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imageprop.h (added) +++ trunk/reactos/base/applications/imagesoft/imageprop.h Thu Nov 16 21:49:58 2006 @@ -1,0 +1,25 @@ + +typedef struct _IMAGEADJUST +{ + PMAIN_WND_INFO Info; + HWND hPicPrev; + HBITMAP hBitmap; + RECT ImageRect; + DWORD OldTrackPos; + INT RedVal; + INT GreenVal; + INT BlueVal; +} IMAGEADJUST, *PIMAGEADJUST; + + +INT_PTR CALLBACK ImagePropDialogProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam); +INT_PTR CALLBACK BrightnessProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam); + +VOID AdjustBrightness(PIMAGEADJUST pImgAdj, + HDC hdcMem); Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rbuild (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rbuild Thu Nov 16 21:49:58 2006 @@ -17,6 +17,7 @@ <library>comdlg32</library> <compilationunit name="unit.c"> <file>about.c</file> + <file>adjust.c</file> <file>custcombo.c</file> <file>floatwindow.c</file> <file>font.c</file> Modified: trunk/reactos/base/applications/imagesoft/imgedwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imgedwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/imgedwnd.c Thu Nov 16 21:49:58 2006 @@ -70,41 +70,35 @@ if (bSuccess && (BytesRead == sizeof(BITMAPFILEHEADER)) && (bmfh.bfType == *(WORD *)"BM")) { - PBITMAPINFO pbmi; - DWORD InfoSize; - - InfoSize = bmfh.bfOffBits - sizeof(BITMAPFILEHEADER); - - pbmi = HeapAlloc(ProcessHeap, - 0, - InfoSize); - if (pbmi) + DWORD InfoSize = bmfh.bfOffBits - sizeof(BITMAPFILEHEADER); + + Info->pbmi = HeapAlloc(ProcessHeap, + 0, + InfoSize); + if (Info->pbmi) { bSuccess = ReadFile(hFile, - pbmi, + Info->pbmi, InfoSize, &BytesRead, NULL); if (bSuccess && (BytesRead == InfoSize)) { - PBYTE pBits; - Info->hBitmap = CreateDIBSection(NULL, - pbmi, + Info->pbmi, DIB_RGB_COLORS, - (VOID *)&pBits, + (VOID *)&Info->pBits, NULL, 0); if (Info->hBitmap != NULL) { ReadFile(hFile, - pBits, + Info->pBits, bmfh.bfSize - bmfh.bfOffBits, &BytesRead, NULL); - /* get bitmap dimensions */ GetObject(Info->hBitmap, sizeof(BITMAP), &bitmap); @@ -115,10 +109,6 @@ bRet = TRUE; } } - - HeapFree(ProcessHeap, - 0, - pbmi); } } else if (!bSuccess) @@ -186,6 +176,12 @@ DeleteDC(Info->hDCMem); /* FIXME - free resources and run down editor */ + HeapFree(ProcessHeap, + 0, + Info->pbmi); + HeapFree(ProcessHeap, + 0, + Info->pBits); /* Remove the image editor from the list */ PrevEditor = &Info->MainWnd->ImageEditors; Modified: trunk/reactos/base/applications/imagesoft/imgedwnd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imgedwnd.h (original) +++ trunk/reactos/base/applications/imagesoft/imgedwnd.h Thu Nov 16 21:49:58 2006 @@ -66,6 +66,8 @@ HWND hSelf; HBITMAP hBitmap; HDC hDCMem; + PBITMAPINFO pbmi; + PBYTE pBits; struct _MAIN_WND_INFO *MainWnd; struct _EDIT_WND_INFO *Next; POINT ScrollPos; Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Thu Nov 16 21:49:58 2006 @@ -12,6 +12,7 @@ #include "tooldock.h" #include "imgedwnd.h" #include "mainwnd.h" +#include "imageprop.h" #include "misc.h" #define MAX_KEY_LENGTH 256 @@ -31,16 +32,6 @@ UINT message, WPARAM wParam, LPARAM lParam); - -/* imageprop.c */ -INT_PTR CALLBACK ImagePropDialogProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam); -INT_PTR CALLBACK BrightnessProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam); /* opensave.c */ VOID FileInitialize(HWND hwnd); Propchange: trunk/reactos/base/applications/imagesoft/res/imagesoft.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 24770: - Reorganize HAL exports and export KeTRyToAcquireQueuedSpinlock and KeTryToAcquireQueuedSpinLockRaisetoSynch. - Add stub for HalSetTimeIncrement. - Cleanup CMOS-related routines (Get/Set environment value and get/set RTC). Fixup some prototypes as well. Inline HalpReadCmos/HalpWriteCmos instead of having a separate function. - Fixup wrong protypes for various Queued Spinlock functions. - Use __rdtsc intrinsic instead of Ke386RdTsc. - Other MSVC compilation fixes.
by ion＠svn.reactos.org 16 Nov '06

16 Nov '06

Author: ion Date: Thu Nov 16 20:30:52 2006 New Revision: 24770 URL: http://svn.reactos.org/svn/reactos?rev=24770&view=rev Log: - Reorganize HAL exports and export KeTRyToAcquireQueuedSpinlock and KeTryToAcquireQueuedSpinLockRaisetoSynch. - Add stub for HalSetTimeIncrement. - Cleanup CMOS-related routines (Get/Set environment value and get/set RTC). Fixup some prototypes as well. Inline HalpReadCmos/HalpWriteCmos instead of having a separate function. - Fixup wrong protypes for various Queued Spinlock functions. - Use __rdtsc intrinsic instead of Ke386RdTsc. - Other MSVC compilation fixes. Added: trunk/reactos/hal/halx86/generic/cmos.c Removed: trunk/reactos/hal/halx86/generic/time.c Modified: trunk/reactos/hal/hal/hal.def trunk/reactos/hal/halx86/generic/beep.c trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/irql.c trunk/reactos/hal/halx86/generic/spinlock.c trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/include/hal.h trunk/reactos/include/ndk/halfuncs.h trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/hal/hal/hal.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.def?rev=24770&… ============================================================================== --- trunk/reactos/hal/hal/hal.def (original) +++ trunk/reactos/hal/hal/hal.def Thu Nov 16 20:30:52 2006 @@ -6,6 +6,22 @@ @ExAcquireFastMutex@4=@ExiAcquireFastMutex@4 @ExReleaseFastMutex@4=@ExiReleaseFastMutex@4 @ExTryToAcquireFastMutex@4=@ExiTryToAcquireFastMutex@4 +@HalClearSoftwareInterrupt@4 +@HalRequestSoftwareInterrupt@4 +@HalSystemVectorDispatchEntry@12 +@KeAcquireInStackQueuedSpinLock@8 +@KeAcquireInStackQueuedSpinLockRaiseToSynch@8 +@KeAcquireSpinLockRaiseToSynch@4 +@KeAcquireQueuedSpinLock@4 +@KeReleaseInStackQueuedSpinLock@4 +@KeReleaseQueuedSpinLock@8 +@KeTryToAcquireQueuedSpinLock@8 +@KeTryToAcquireQueuedSpinLockRaiseToSynch@8 +@KfAcquireSpinLock@4 +@KfLowerIrql@4 +@KfRaiseIrql@4 +@KfReleaseSpinLock@8 + HalAcquireDisplayOwnership@4 HalAdjustResourceList@4 HalAllProcessorsStarted@0 @@ -15,7 +31,6 @@ HalAssignSlotResources@32 HalBeginSystemInterrupt@12 HalCalibratePerformanceCounter@4 -@HalClearSoftwareInterrupt@4 HalDisableSystemInterrupt@8 HalDisplayString@4 HalEnableSystemInterrupt@12 @@ -37,7 +52,6 @@ HalReadDmaCounter@4 HalReportResourceUsage@0 HalRequestIpi@4 -@HalRequestSoftwareInterrupt@4 HalReturnToFirmware@4 HalSetBusData@20 HalSetBusDataByOffset@24 @@ -45,14 +59,13 @@ HalSetEnvironmentVariable@8 ;HalSetProfileInterval@4 HalSetRealTimeClock@4 -;HalSetTimeIncrement@4 +HalSetTimeIncrement@4 HalStartNextProcessor@8 ;HalStartProfileInterrupt@4 ;HalStopProfileInterrupt@4 -@HalSystemVectorDispatchEntry@12 HalTranslateBusAddress@24 +IoAssignDriveLetters@16=HalpAssignDriveLetters@16 IoFlushAdapterBuffers@24 -IoAssignDriveLetters@16=HalpAssignDriveLetters@16 IoFreeAdapterChannel@4 IoFreeMapRegisters@12 IoMapTransfer@24 @@ -60,6 +73,7 @@ IoSetPartitionInformation@16=HalpSetPartitionInformation@16 IoWritePartitionTable@20=HalpWritePartitionTable@20 KdComPortInUse DATA +; FIXME: DEPRECATED KdPortGetByte@4 KdPortGetByteEx@8 KdPortInitialize@12 @@ -72,26 +86,17 @@ KdPortSave@0 KdPortDisableInterrupts@0 KdPortEnableInterrupts@0 +; FIXME: END DEPRECATED BLOCK KeAcquireSpinLock@8 -@KeAcquireInStackQueuedSpinLock@8 -@KeAcquireInStackQueuedSpinLockRaiseToSynch@8 -@KeAcquireSpinLockRaiseToSynch@4 -@KeAcquireQueuedSpinLock@4 +KeFlushWriteBuffer@0 KeGetCurrentIrql@0 -KeFlushWriteBuffer@0 KeLowerIrql@4 KeQueryPerformanceCounter@4 KeRaiseIrql@8 KeRaiseIrqlToDpcLevel@0 KeRaiseIrqlToSynchLevel@0 -@KeReleaseInStackQueuedSpinLock@4 KeReleaseSpinLock@8 -@KeReleaseQueuedSpinLock@8 KeStallExecutionProcessor@4 -@KfAcquireSpinLock@4 -@KfLowerIrql@4 -@KfRaiseIrql@4 -@KfReleaseSpinLock@8 READ_PORT_BUFFER_UCHAR@12 READ_PORT_BUFFER_ULONG@12 READ_PORT_BUFFER_USHORT@12 Modified: trunk/reactos/hal/halx86/generic/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/beep.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/beep.c (original) +++ trunk/reactos/hal/halx86/generic/beep.c Thu Nov 16 20:30:52 2006 @@ -2,7 +2,7 @@ * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/hal/x86/beep.c - * PURPOSE: Speak support (beeping) + * PURPOSE: Speaker support (beeping) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) */ @@ -22,6 +22,9 @@ /* FUNCTIONS *****************************************************************/ +/* + * @implemented + */ BOOLEAN NTAPI HalMakeBeep(IN ULONG Frequency) @@ -66,3 +69,4 @@ return Result; } + Added: 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 (added) +++ trunk/reactos/hal/halx86/generic/cmos.c Thu Nov 16 20:30:52 2006 @@ -1,0 +1,304 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/hal/halx86/generic/cmos.c + * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* CMOS Registers and Ports */ +#define CMOS_CONTROL_PORT (PUCHAR)0x70 +#define CMOS_DATA_PORT (PUCHAR)0x71 +#define RTC_REGISTER_A 0x0A +#define RTC_REGISTER_B 0x0B +#define RTC_REG_A_UIP 0x80 +#define RTC_REGISTER_CENTURY 0x32 + +/* Conversion functions */ +#define BCD_INT(bcd) \ + (((bcd & 0xF0) >> 4) * 10 + (bcd & 0x0F)) +#define INT_BCD(int) \ + (UCHAR)(((int / 10) << 4) + (int % 10)) + +/* PRIVATE FUNCTIONS *********************************************************/ + +UCHAR +FORCEINLINE +HalpReadCmos(IN UCHAR Reg) +{ + /* Select the register */ + WRITE_PORT_UCHAR(CMOS_CONTROL_PORT, Reg); + + /* Query the value */ + return READ_PORT_UCHAR(CMOS_DATA_PORT); +} + +VOID +FORCEINLINE +HalpWriteCmos(IN UCHAR Reg, + IN UCHAR Value) +{ + /* Select the register */ + WRITE_PORT_UCHAR(CMOS_CONTROL_PORT, Reg); + + /* Write the value */ + WRITE_PORT_UCHAR(CMOS_DATA_PORT, Value); +} + +ULONG +NTAPI +HalpGetCmosData(IN PBUS_HANDLER BusHandler, + IN ULONG BusNumber, + IN ULONG SlotNumber, + OUT PVOID Buffer, + IN ULONG Offset, + IN ULONG Length) +{ + PUCHAR Ptr = (PUCHAR)Buffer; + ULONG Address = SlotNumber; + ULONG Len = Length; + + /* FIXME: Acquire CMOS Lock */ + + /* Do nothing if we don't have a length */ + if (!Length) return 0; + + /* Check if this is simple CMOS */ + if (!BusNumber) + { + /* Loop the buffer up to 0xFF */ + while ((Len > 0) && (Address < 0x100)) + { + /* Read the data */ + *Ptr = HalpReadCmos((UCHAR)Address); + + /* Update position and length */ + Ptr++; + Address++; + Len--; + } + } + else if (BusNumber == 1) + { + /* Loop the buffer up to 0xFFFF */ + while ((Len > 0) && (Address < 0x10000)) + { + /* Write the data */ + *Ptr = HalpReadCmos((UCHAR)Address); + + /* Update position and length */ + Ptr++; + Address++; + Len--; + } + } + + /* FIXME: Release the CMOS Lock */ + + /* Return length read */ + return Length - Len; +} + +ULONG +NTAPI +HalpSetCmosData(IN PBUS_HANDLER BusHandler, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length) +{ + PUCHAR Ptr = (PUCHAR)Buffer; + ULONG Address = SlotNumber; + ULONG Len = Length; + + /* FIXME: Acquire CMOS Lock */ + + /* Do nothing if we don't have a length */ + if (!Length) return 0; + + /* Check if this is simple CMOS */ + if (!BusNumber) + { + /* Loop the buffer up to 0xFF */ + while ((Len > 0) && (Address < 0x100)) + { + /* Write the data */ + HalpWriteCmos((UCHAR)Address, *Ptr); + + /* Update position and length */ + Ptr++; + Address++; + Len--; + } + } + else if (BusNumber == 1) + { + /* Loop the buffer up to 0xFFFF */ + while ((Len > 0) && (Address < 0x10000)) + { + /* Write the data */ + HalpWriteCmos((UCHAR)Address, *Ptr); + + /* Update position and length */ + Ptr++; + Address++; + Len--; + } + } + + /* FIXME: Release the CMOS Lock */ + + /* Return length read */ + return Length - Len; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +ARC_STATUS +NTAPI +HalGetEnvironmentVariable(IN PCH Name, + IN USHORT ValueLength, + IN PCH Value) +{ + UCHAR Val; + + /* Only variable supported on x86 */ + if (_stricmp(Name, "LastKnownGood")) return ENOENT; + + /* FIXME: Acquire CMOS Lock */ + + /* Query the current value */ + Val = HalpReadCmos(RTC_REGISTER_B) & 0x01; + + /* FIXME: Release CMOS lock */ + + /* Check the flag */ + if (Val) + { + /* Return false */ + strncpy(Value, "FALSE", ValueLength); + } + else + { + /* Return true */ + strncpy(Value, "TRUE", ValueLength); + } + + /* Return success */ + return ESUCCESS; +} + +/* + * @implemented + */ +ARC_STATUS +NTAPI +HalSetEnvironmentVariable(IN PCH Name, + IN PCH Value) +{ + UCHAR Val; + + /* Only variable supported on x86 */ + if (_stricmp(Name, "LastKnownGood")) return ENOMEM; + + /* Check if this is true or false */ + if (!_stricmp(Value, "TRUE")) + { + /* It's true, acquire CMOS lock (FIXME) */ + + /* Read the current value and add the flag */ + Val = HalpReadCmos(RTC_REGISTER_B) | 1; + } + else if (!_stricmp(Value, "FALSE")) + { + /* It's false, acquire CMOS lock (FIXME) */ + + /* Read the current value and mask out the flag */ + Val = HalpReadCmos(RTC_REGISTER_B) & ~1; + } + else + { + /* Fail */ + return ENOMEM; + } + + /* Write new value */ + HalpWriteCmos(RTC_REGISTER_B, Val); + + /* Release the lock and return success */ + return ESUCCESS; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +HalQueryRealTimeClock(OUT PTIME_FIELDS Time) +{ + /* FIXME: Acquire CMOS Lock */ + + /* Loop while update is in progress */ + while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP); + + /* Set the time data */ + Time->Second = BCD_INT(HalpReadCmos(0)); + Time->Minute = BCD_INT(HalpReadCmos(2)); + Time->Hour = BCD_INT(HalpReadCmos(4)); + Time->Weekday = BCD_INT(HalpReadCmos(6)); + Time->Day = BCD_INT(HalpReadCmos(7)); + Time->Month = BCD_INT(HalpReadCmos(8)); + Time->Year = BCD_INT(HalpReadCmos(9)); + Time->Milliseconds = 0; + + /* FIXME: Check century byte */ + + /* Compensate for the century field */ + Time->Year += (Time->Year > 80) ? 1900: 2000; + + /* FIXME: Release CMOS Lock */ + + /* Always return TRUE */ + return TRUE; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +HalSetRealTimeClock(IN PTIME_FIELDS Time) +{ + /* FIXME: Acquire CMOS Lock */ + + /* Loop while update is in progress */ + while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP); + + /* Write time fields to CMOS RTC */ + HalpWriteCmos(0, INT_BCD(Time->Second)); + HalpWriteCmos(2, INT_BCD(Time->Minute)); + HalpWriteCmos(4, INT_BCD(Time->Hour)); + HalpWriteCmos(6, INT_BCD(Time->Weekday)); + HalpWriteCmos(7, INT_BCD(Time->Day)); + HalpWriteCmos(8, INT_BCD(Time->Month)); + HalpWriteCmos(9, INT_BCD(Time->Year % 100)); + + /* FIXME: Set the century byte */ + + /* FIXME: Release the CMOS Lock */ + + /* Always return TRUE */ + return TRUE; +} + +/* EOF */ Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Thu Nov 16 20:30:52 2006 @@ -6,7 +6,8 @@ <define name="_NTHAL_" /> <file>beep.c</file> <file>bus.c</file> - <file>dma.c</file> + <file>cmos.c</file> + <file>dma.c</file> <file>drive.c</file> <file>halinit.c</file> <file>isa.c</file> @@ -18,7 +19,6 @@ <file>reboot.c</file> <file>sysbus.c</file> <file>sysinfo.c</file> - <file>time.c</file> <file>timer.c</file> <pch>../include/hal.h</pch> </module> Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Thu Nov 16 20:30:52 2006 @@ -24,8 +24,8 @@ USHORT both; struct { - BYTE master; - BYTE slave; + UCHAR master; + UCHAR slave; }; } PIC_MASK; @@ -121,7 +121,7 @@ Ki386RestoreFlags(flags); } -VOID STATIC +VOID HalpExecuteIrqs(KIRQL NewIrql) { ULONG IrqLimit, i; @@ -153,7 +153,7 @@ } -VOID STATIC +VOID HalpLowerIrql(KIRQL NewIrql) { if (NewIrql >= PROFILE_LEVEL) 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 (original) +++ trunk/reactos/hal/halx86/generic/spinlock.c Thu Nov 16 20:30:52 2006 @@ -105,7 +105,7 @@ */ KIRQL FASTCALL -KeAcquireQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) +KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) { /* Simply raise to dispatch */ return KfRaiseIrql(DISPATCH_LEVEL); @@ -151,7 +151,7 @@ */ VOID FASTCALL -KeReleaseQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle, +KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, IN KIRQL OldIrql) { /* Simply lower IRQL back */ @@ -174,7 +174,7 @@ */ BOOLEAN FASTCALL -KeTryToAcquireQueuedSpinLockRaiseToSynch(IN PKLOCK_QUEUE_HANDLE LockHandle, +KeTryToAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, IN PKIRQL OldIrql) { /* Simply raise to dispatch */ @@ -187,10 +187,10 @@ /* * @implemented */ -BOOLEAN -FASTCALL -KeTryToAcquireQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle, - IN PKIRQL OldIrql) +LOGICAL +FASTCALL +KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + OUT PKIRQL OldIrql) { /* Simply raise to dispatch */ *OldIrql = KfRaiseIrql(DISPATCH_LEVEL); Removed: trunk/reactos/hal/halx86/generic/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/time.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/time.c (original) +++ trunk/reactos/hal/halx86/generic/time.c (removed) @@ -1,356 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/time.c - * PURPOSE: Getting time information - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - - -/* MACROS and CONSTANTS ******************************************************/ - -/* macro BCD_INT : convert bcd to int */ -#define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f)) - -/* macro INT_BCD : convert int to bcd */ -#define INT_BCD(int) (((int / 10) << 4) + (int % 10)) - - -#define RTC_REGISTER_A 0x0A -#define RTC_REG_A_UIP 0x80 /* Update In Progress bit */ - -#define RTC_REGISTER_B 0x0B - -#define RTC_REGISTER_CENTURY 0x32 - -/* GLOBALS ******************************************************************/ - -static KSPIN_LOCK CmosLock = {0}; - -/* FUNCTIONS *****************************************************************/ - - -static UCHAR -HalpQueryCMOS(UCHAR Reg) -{ - UCHAR Val; - ULONG Flags; - - Reg |= 0x80; - - /* save flags and disable interrupts */ - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); - - WRITE_PORT_UCHAR((PUCHAR)0x70, Reg); - Val = READ_PORT_UCHAR((PUCHAR)0x71); - WRITE_PORT_UCHAR((PUCHAR)0x70, 0); - - /* restore flags */ - Ki386RestoreFlags(Flags); - - return(Val); -} - - -static VOID -HalpSetCMOS(UCHAR Reg, - UCHAR Val) -{ - ULONG Flags; - - Reg |= 0x80; - - /* save flags and disable interrupts */ - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); - - WRITE_PORT_UCHAR((PUCHAR)0x70, Reg); - WRITE_PORT_UCHAR((PUCHAR)0x71, Val); - WRITE_PORT_UCHAR((PUCHAR)0x70, 0); - - /* restore flags */ - Ki386RestoreFlags(Flags); -} - - -static UCHAR -HalpQueryECMOS(USHORT Reg) -{ - UCHAR Val; - ULONG Flags; - - /* save flags and disable interrupts */ - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); - - WRITE_PORT_UCHAR((PUCHAR)0x74, (UCHAR)(Reg & 0x00FF)); - WRITE_PORT_UCHAR((PUCHAR)0x75, (UCHAR)(Reg>>8)); - Val = READ_PORT_UCHAR((PUCHAR)0x76); - - /* restore flags */ - Ki386RestoreFlags(Flags); - - return(Val); -} - - -static VOID -HalpSetECMOS(USHORT Reg, - UCHAR Val) -{ - ULONG Flags; - - /* save flags and disable interrupts */ - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); - - WRITE_PORT_UCHAR((PUCHAR)0x74, (UCHAR)(Reg & 0x00FF)); - WRITE_PORT_UCHAR((PUCHAR)0x75, (UCHAR)(Reg>>8)); - WRITE_PORT_UCHAR((PUCHAR)0x76, Val); - - /* restore flags */ - Ki386RestoreFlags(Flags); -} - - -BOOLEAN STDCALL -HalQueryRealTimeClock(PTIME_FIELDS Time) -{ - KIRQL oldIrql; - - KeAcquireSpinLock(&CmosLock, &oldIrql); - - /* check 'Update In Progress' bit */ - while (HalpQueryCMOS (RTC_REGISTER_A) & RTC_REG_A_UIP); - - Time->Second = BCD_INT(HalpQueryCMOS (0)); - Time->Minute = BCD_INT(HalpQueryCMOS (2)); - Time->Hour = BCD_INT(HalpQueryCMOS (4)); - Time->Weekday = BCD_INT(HalpQueryCMOS (6)); - Time->Day = BCD_INT(HalpQueryCMOS (7)); - Time->Month = BCD_INT(HalpQueryCMOS (8)); - Time->Year = BCD_INT(HalpQueryCMOS (9)); - - if (Time->Year > 80) - Time->Year += 1900; - else - Time->Year += 2000; - -#if 0 - /* Century */ - Time->Year += BCD_INT(HalpQueryCMOS (RTC_REGISTER_CENTURY)) * 100; -#endif - - KeReleaseSpinLock(&CmosLock, oldIrql); - -#ifndef NDEBUG - DbgPrint ("HalQueryRealTimeClock() %d:%d:%d %d/%d/%d\n", - Time->Hour, - Time->Minute, - Time->Second, - Time->Day, - Time->Month, - Time->Year - ); -#endif - - Time->Milliseconds = 0; - return TRUE; -} - - -VOID STDCALL -HalSetRealTimeClock(PTIME_FIELDS Time) -{ - KIRQL oldIrql; - - KeAcquireSpinLock(&CmosLock, &oldIrql); - - /* check 'Update In Progress' bit */ - while (HalpQueryCMOS (RTC_REGISTER_A) & RTC_REG_A_UIP); - - HalpSetCMOS (0, (UCHAR)INT_BCD(Time->Second)); - HalpSetCMOS (2, (UCHAR)INT_BCD(Time->Minute)); - HalpSetCMOS (4, (UCHAR)INT_BCD(Time->Hour)); - HalpSetCMOS (6, (UCHAR)INT_BCD(Time->Weekday)); - HalpSetCMOS (7, (UCHAR)INT_BCD(Time->Day)); - HalpSetCMOS (8, (UCHAR)INT_BCD(Time->Month)); - HalpSetCMOS (9, (UCHAR)INT_BCD(Time->Year % 100)); - -#if 0 - /* Century */ - HalpSetCMOS (RTC_REGISTER_CENTURY, INT_BCD(Time->Year / 100)); -#endif - KeReleaseSpinLock(&CmosLock, oldIrql); -} - - -BOOLEAN STDCALL -HalGetEnvironmentVariable(PCH Name, - USHORT ValueLength, - PCH Value) -{ - KIRQL oldIrql; - - - if (_stricmp(Name, "LastKnownGood") != 0) - { - return FALSE; - } - - KeAcquireSpinLock(&CmosLock, &oldIrql); - if (HalpQueryCMOS(RTC_REGISTER_B) & 0x01) - { - strncpy(Value, "FALSE", ValueLength); - } - else - { - strncpy(Value, "TRUE", ValueLength); - } - KeReleaseSpinLock(&CmosLock, oldIrql); - - return TRUE; -} - - -BOOLEAN STDCALL -HalSetEnvironmentVariable(PCH Name, - PCH Value) -{ - UCHAR Val; - KIRQL oldIrql; - BOOLEAN result = TRUE; - - if (_stricmp(Name, "LastKnownGood") != 0) - return FALSE; - - KeAcquireSpinLock(&CmosLock, &oldIrql); - - Val = HalpQueryCMOS(RTC_REGISTER_B); - - if (_stricmp(Value, "TRUE") == 0) - HalpSetCMOS(RTC_REGISTER_B, (UCHAR)(Val | 0x01)); - else if (_stricmp(Value, "FALSE") == 0) - HalpSetCMOS(RTC_REGISTER_B, (UCHAR)(Val & ~0x01)); - else - result = FALSE; - - KeReleaseSpinLock(&CmosLock, oldIrql); - - return result; -} - - -ULONG STDCALL -HalpGetCmosData(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) -{ - PUCHAR Ptr = Buffer; - ULONG Address = SlotNumber; - ULONG Len = Length; - KIRQL oldIrql; - - DPRINT("HalpGetCmosData() called.\n"); - DPRINT(" BusNumber %lu\n", BusNumber); - DPRINT(" SlotNumber %lu\n", SlotNumber); - DPRINT(" Offset 0x%lx\n", Offset); - DPRINT(" Length 0x%lx\n", Length); - - if (Length == 0) - return 0; - - if (BusNumber == 0) - { - /* CMOS */ - KeAcquireSpinLock(&CmosLock, &oldIrql); - while ((Len > 0) && (Address < 0x100)) - { - *Ptr = HalpQueryCMOS((UCHAR)Address); - Ptr = Ptr + 1; - Address++; - Len--; - } - KeReleaseSpinLock(&CmosLock, oldIrql); - } - else if (BusNumber == 1) - { - /* Extended CMOS */ - KeAcquireSpinLock(&CmosLock, &oldIrql); - while ((Len > 0) && (Address < 0x1000)) - { - *Ptr = HalpQueryECMOS((USHORT)Address); - Ptr = Ptr + 1; - Address++; - Len--; - } - KeReleaseSpinLock(&CmosLock, oldIrql); - } - - return(Length - Len); -} - - -ULONG STDCALL -HalpSetCmosData(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) -{ - PUCHAR Ptr = (PUCHAR)Buffer; - ULONG Address = SlotNumber; - ULONG Len = Length; - KIRQL oldIrql; - - DPRINT("HalpSetCmosData() called.\n"); - DPRINT(" BusNumber %lu\n", BusNumber); - DPRINT(" SlotNumber %lu\n", SlotNumber); - DPRINT(" Offset 0x%lx\n", Offset); - DPRINT(" Length 0x%lx\n", Length); - - if (Length == 0) - return 0; - - if (BusNumber == 0) - { - /* CMOS */ - KeAcquireSpinLock(&CmosLock, &oldIrql); - while ((Len > 0) && (Address < 0x100)) - { - HalpSetCMOS((UCHAR)Address, *Ptr); - Ptr = Ptr + 1; - Address++; - Len--; - } - KeReleaseSpinLock(&CmosLock, oldIrql); - } - else if (BusNumber == 1) - { - /* Extended CMOS */ - KeAcquireSpinLock(&CmosLock, &oldIrql); - while ((Len > 0) && (Address < 0x1000)) - { - HalpSetECMOS((USHORT)Address, *Ptr); - Ptr = Ptr + 1; - Address++; - Len--; - } - KeReleaseSpinLock(&CmosLock, oldIrql); - } - - return(Length - Len); -} - -/* EOF */ Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c (original) +++ trunk/reactos/hal/halx86/generic/timer.c Thu Nov 16 20:30:52 2006 @@ -130,11 +130,11 @@ if (Pcr->PrcbData.FeatureBits & KF_RDTSC) { LARGE_INTEGER EndCount, CurrentCount; - Ki386RdTSC(EndCount); + EndCount.QuadPart = (LONGLONG)__rdtsc; EndCount.QuadPart += Microseconds * (ULONGLONG)Pcr->PrcbData.MHz; do { - Ki386RdTSC(CurrentCount); + CurrentCount.QuadPart = (LONGLONG)__rdtsc; } while (CurrentCount.QuadPart < EndCount.QuadPart); } @@ -212,10 +212,10 @@ { WaitFor8254Wraparound(); - Ki386RdTSC(StartCount); + StartCount.QuadPart = (LONGLONG)__rdtsc; WaitFor8254Wraparound(); - Ki386RdTSC(EndCount); + EndCount.QuadPart = (LONGLONG)__rdtsc; Pcr->PrcbData.MHz = (ULONG)(EndCount.QuadPart - StartCount.QuadPart) / 10000; DPRINT("%luMHz\n", Pcr->PrcbData.MHz); @@ -334,7 +334,7 @@ { PerformanceFreq->QuadPart = Pcr->PrcbData.MHz * (ULONGLONG)1000000; } - Ki386RdTSC(Value); + Value.QuadPart = (LONGLONG)__rdtsc; } else { @@ -361,4 +361,12 @@ return Value; } +ULONG +NTAPI +HalSetTimeIncrement(IN ULONG Increment) +{ + /* FIXME: TODO */ + return Increment; +} + /* EOF */ Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h (original) +++ trunk/reactos/hal/halx86/include/hal.h Thu Nov 16 20:30:52 2006 @@ -29,6 +29,7 @@ #include <halfuncs.h> #include <iofuncs.h> #include <ldrtypes.h> +#include <obfuncs.h> #define KPCR_BASE 0xFF000000 // HACK! Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Thu Nov 16 20:30:52 2006 @@ -163,15 +163,6 @@ ); NTHALAPI -BOOLEAN -NTAPI -HalGetEnvironmentVariable( - PCH Variable, - USHORT Length, - PCH Buffer -); - -NTHALAPI VOID NTAPI HalReportResourceUsage( @@ -202,14 +193,25 @@ // // Environment Functions // -NTHALAPI -BOOLEAN +#ifdef _ARC_ +NTHALAPI +ARC_STATUS NTAPI HalSetEnvironmentVariable( IN PCH Name, IN PCH Value ); +NTHALAPI +ARC_STATUS +NTAPI +HalGetEnvironmentVariable( + IN PCH Variable, + IN USHORT Length, + OUT PCH Buffer +); +#endif + // // Time Functions // @@ -221,7 +223,7 @@ ); NTHALAPI -VOID +BOOLEAN NTAPI HalSetRealTimeClock( IN PTIME_FIELDS RtcTime Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=247… ============================================================================== --- trunk/reactos/lib/rtl/registry.c (original) +++ trunk/reactos/lib/rtl/registry.c Thu Nov 16 20:30:52 2006 @@ -94,11 +94,6 @@ } /* And now append the path */ - DPRINT1("I'm about to crash due to an overwrite problem, Alex thinks\n"); - DPRINT1("I'm about to crash due to a overwrite problem, Alex thinks\n"); - DPRINT1("I'm about to crash due to a overwrite problem, Alex thinks\n"); - DPRINT1("I'm about to crash due to a overwrite problem, Alex thinks\n"); - DPRINT1("I'm about to crash due to a overwrite problem, Alex thinks\n"); if (Path[0] == L'\\' && RelativeTo != RTL_REGISTRY_ABSOLUTE) Path++; // HACK! Status = RtlAppendUnicodeToString(&KeyName, Path); if (!NT_SUCCESS(Status)) return Status;

1 0

[fireball] 24769: Use Uint32x32To64() function instead of ULONG * ULONG. Fixes partition length truncation. See issue #1871 for more details.
by fireball＠svn.reactos.org 16 Nov '06

16 Nov '06

Author: fireball Date: Thu Nov 16 20:26:31 2006 New Revision: 24769 URL: http://svn.reactos.org/svn/reactos?rev=24769&view=rev Log: Use Uint32x32To64() function instead of ULONG * ULONG. Fixes partition length truncation. See issue #1871 for more details. Modified: trunk/reactos/ntoskrnl/fstub/disksup.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Thu Nov 16 20:26:31 2006 @@ -1583,7 +1583,8 @@ /* Get the starting offset */ PartitionInfo->StartingOffset.QuadPart = StartOffset + - GET_STARTING_SECTOR(PartitionDescriptor) * SectorSize; + UInt32x32To64(GET_STARTING_SECTOR(PartitionDescriptor), + SectorSize); /* Calculate the number of hidden sectors */ PartitionInfo->HiddenSectors = (PartitionInfo-> @@ -1593,7 +1594,8 @@ /* Get the partition length */ PartitionInfo->PartitionLength.QuadPart = - GET_PARTITION_LENGTH(PartitionDescriptor) * SectorSize; + UInt32x32To64(GET_PARTITION_LENGTH(PartitionDescriptor), + SectorSize); /* FIXME: REACTOS HACK */ PartitionInfo->PartitionNumber = i + 1; @@ -1637,8 +1639,9 @@ { /* Get its offset */ Offset.QuadPart = VolumeOffset.QuadPart + - GET_STARTING_SECTOR(PartitionDescriptor) * - SectorSize; + UInt32x32To64( + GET_STARTING_SECTOR(PartitionDescriptor), + SectorSize); /* If this is a primary partition, this is the volume offset */ if (IsPrimary) VolumeOffset = Offset;

1 0

[greatlrd] 24768: remove two compiling warnings thx frik85 to notice it.
by greatlrd＠svn.reactos.org 16 Nov '06

16 Nov '06

Author: greatlrd Date: Thu Nov 16 18:56:10 2006 New Revision: 24768 URL: http://svn.reactos.org/svn/reactos?rev=24768&view=rev Log: remove two compiling warnings thx frik85 to notice it. Modified: trunk/rosapps/devutils/roswebparser/Windows28591.h trunk/rosapps/devutils/roswebparser/roswebparser.c Modified: trunk/rosapps/devutils/roswebparser/Windows28591.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/Wind… ============================================================================== --- trunk/rosapps/devutils/roswebparser/Windows28591.h (original) +++ trunk/rosapps/devutils/roswebparser/Windows28591.h Thu Nov 16 18:56:10 2006 @@ -29,4 +29,4 @@ 0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, - 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF}; + 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF}; Modified: trunk/rosapps/devutils/roswebparser/roswebparser.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/rosw… ============================================================================== --- trunk/rosapps/devutils/roswebparser/roswebparser.c (original) +++ trunk/rosapps/devutils/roswebparser/roswebparser.c Thu Nov 16 18:56:10 2006 @@ -17,6 +17,8 @@ #define true 1 #define false 0 + +int ansiCodePage(int codepage, unsigned char *inBuffer, unsigned char *outBuffer, int Lenght); int paraser1(unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format, unsigned char *iso_type);

1 0

[ion] 24767: - Purposefully add 6 debug prints to RtlpGetRegistryHandle, which, while ndis.sys is initializing, should BSOD the system. I have seen this "RtlpGetRegistryHandle" BSOD randomly during boot (But always with the same stack trace), and a local HAL patch managed to cause it 100% of the time. I know that the problem had nothing to do with the HAL or registry paths, because it came up before too when I added debug prints to fstub. These 6 prints 100% reproduce the problem on my machine w
by ion＠svn.reactos.org 16 Nov '06

16 Nov '06

Author: ion Date: Thu Nov 16 10:09:37 2006 New Revision: 24767 URL: http://svn.reactos.org/svn/reactos?rev=24767&view=rev Log: - Purposefully add 6 debug prints to RtlpGetRegistryHandle, which, while ndis.sys is initializing, should BSOD the system. I have seen this "RtlpGetRegistryHandle" BSOD randomly during boot (But always with the same stack trace), and a local HAL patch managed to cause it 100% of the time. I know that the problem had nothing to do with the HAL or registry paths, because it came up before too when I added debug prints to fstub. These 6 prints 100% reproduce the problem on my machine with GCC 3.4.5. It is my hope it will do the same for everyone. This is a nasty bug, either stack related or some critical structure is being damaged. I am breaking trunk because it's been here for a long time, but now I found a way to repro it so that we can work together to try finding it. In a way, trunk was always broken, but this patch should force a freeze. Please help. Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=247… ============================================================================== --- trunk/reactos/lib/rtl/registry.c (original) +++ trunk/reactos/lib/rtl/registry.c Thu Nov 16 10:09:37 2006 @@ -94,6 +94,11 @@ } /* And now append the path */ + DPRINT1("I'm about to crash due to an overwrite problem, Alex thinks\n"); + DPRINT1("I'm about to crash due to a overwrite problem, Alex thinks\n"); + DPRINT1("I'm about to crash due to a overwrite problem, Alex thinks\n"); + DPRINT1("I'm about to crash due to a overwrite problem, Alex thinks\n"); + DPRINT1("I'm about to crash due to a overwrite problem, Alex thinks\n"); if (Path[0] == L'\\' && RelativeTo != RTL_REGISTRY_ABSOLUTE) Path++; // HACK! Status = RtlAppendUnicodeToString(&KeyName, Path); if (!NT_SUCCESS(Status)) return Status;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs