Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixup all the file headers with proper paths and authors.

Browse source 
- Move sysbus.c contents (a 4 line function) into bus.c.
- Unify initialization code.
- Delete and disable stall execution calibration (currently using the default). Will implement later in a more precise manner (this routine was bizarly setting the MHz of the CPU in the PRCB in some cases...).

svn path=/trunk/; revision=24964
This commit is contained in:
Alex Ionescu 2006-11-29 08:28:20 +00:00
parent f09a042483
commit d466efb4fb
19 changed files with 68 additions and 262 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/hal/halx86/generic/beep.c
View file

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS HAL * PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/x86/beep.c * FILE: hal/halx86/generic/beep.c
* PURPOSE: Speaker support (beeping) * PURPOSE: Speaker support (beeping)
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
* Eric Kohl (ekohl@abo.rhein-zeitung.de) * Eric Kohl (ekohl@abo.rhein-zeitung.de)

16
reactos/hal/halx86/generic/bus.c
View file

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS HAL * PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/halx86/generic/bus.c * FILE: hal/halx86/generic/bus.c
* PURPOSE: Bus Support Routines * PURPOSE: Bus Support Routines
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
*/ */
@ -63,6 +63,20 @@ HalpTranslateBusAddress(IN INTERFACE_TYPE InterfaceType,
return TRUE; return TRUE;
} }
ULONG
NTAPI
HalpGetSystemInterruptVector(IN ULONG BusNumber,
IN ULONG BusInterruptLevel,
IN ULONG BusInterruptVector,
OUT PKIRQL Irql,
OUT PKAFFINITY Affinity)
{
ULONG Vector = IRQ2VECTOR(BusInterruptVector);
*Irql = (KIRQL)VECTOR2IRQL(Vector);
*Affinity = 0xFFFFFFFF;
return Vector;
}
VOID VOID
NTAPI NTAPI
HalpInitNonBusHandler(VOID) HalpInitNonBusHandler(VOID)

3
reactos/hal/halx86/generic/cmos.c
View file

@ -1,9 +1,10 @@
/* /*
* PROJECT: ReactOS HAL * PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/halx86/generic/cmos.c * FILE: hal/halx86/generic/cmos.c
* PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood) * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood)
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
* Eric Kohl (ekohl@abo.rhein-zeitung.de)
*/ */
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/

6
reactos/hal/halx86/generic/display.c
View file

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS HA: * PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/halx86/generic/display.c * FILE: hal/halx86/generic/display.c
* PURPOSE: Screen Display Routines, now useless since NT 5.1+ * PURPOSE: Screen Display Routines, now useless since NT 5.1+
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
*/ */
@ -11,7 +11,7 @@
#include <debug.h> #include <debug.h>
#include <ndk/inbvfuncs.h> #include <ndk/inbvfuncs.h>
/* PUBLIC FUNCTIONS *********************************************************/ /* PUBLIC FUNCTIONS **********************************************************/
/* /*
* @implemented * @implemented

4
reactos/hal/halx86/generic/drive.c
View file

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS HA: * PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/halx86/drive.c * FILE: hal/halx86/generic/drive.c
* PURPOSE: I/O HAL Routines for Disk Access * PURPOSE: I/O HAL Routines for Disk Access
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
*/ */

1
reactos/hal/halx86/generic/generic.rbuild
View file

@ -14,7 +14,6 @@
<file>pci.c</file> <file>pci.c</file>
<file>portio.c</file> <file>portio.c</file>
<file>reboot.c</file> <file>reboot.c</file>
<file>sysbus.c</file>
<file>sysinfo.c</file> <file>sysinfo.c</file>
<file>timer.c</file> <file>timer.c</file>
<file>systimer.S</file> <file>systimer.S</file>

28
reactos/hal/halx86/generic/halinit.c
View file

@ -1,8 +1,8 @@
/* /*
* PROJECT: ReactOS HAL * PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/halx86/generic/processor.c * FILE: hal/halx86/generic/halinit.c
* PURPOSE: HAL Processor Routines * PURPOSE: HAL Entrypoint and Initialization
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
*/ */
@ -92,8 +92,17 @@ HalInitSystem(IN ULONG BootPhase,
KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0); KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0);
} }
/* Continue with HAL-specific initialization */ /* Initialize the PICs */
HalpInitPhase0(LoaderBlock); HalpInitPICs();
/* Force initial PIC state */
KfRaiseIrql(KeGetCurrentIrql());
/* Initialize the clock */
HalpInitializeClock();
/* Setup busy waiting */
//HalpCalibrateStallExecution();
/* Fill out the dispatch tables */ /* Fill out the dispatch tables */
HalQuerySystemInformation = HaliQuerySystemInformation; HalQuerySystemInformation = HaliQuerySystemInformation;
@ -110,8 +119,12 @@ HalInitSystem(IN ULONG BootPhase,
/* Initialize the default HAL stubs for bus handling functions */ /* Initialize the default HAL stubs for bus handling functions */
HalpInitNonBusHandler(); HalpInitNonBusHandler();
/* Initialize the clock interrupt */ /* Enable the clock interrupt */
HalpInitPhase1(); ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset =
(USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF);
((PKIPCR)KeGetPcr())->IDT[0x30].Offset =
(USHORT)HalpClockInterrupt;
HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched);
/* Initialize DMA. NT does this in Phase 0 */ /* Initialize DMA. NT does this in Phase 0 */
HalpInitDma(); HalpInitDma();
@ -122,7 +135,7 @@ HalInitSystem(IN ULONG BootPhase,
} }
/* /*
* @implemented * @unimplemented
*/ */
VOID VOID
NTAPI NTAPI
@ -137,5 +150,4 @@ HalReportResourceUsage(VOID)
/* FIXME: Report HAL Usage to kernel */ /* FIXME: Report HAL Usage to kernel */
} }
/* EOF */ /* EOF */

2
reactos/hal/halx86/generic/misc.c
View file

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS HAL * PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/halx86/misc.c * FILE: hal/halx86/generic/misc.c
* PURPOSE: Miscellanous Routines * PURPOSE: Miscellanous Routines
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
* Eric Kohl (ekohl@abo.rhein-zeitung.de) * Eric Kohl (ekohl@abo.rhein-zeitung.de)

2
reactos/hal/halx86/generic/pci.c
View file

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS HAL * PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/halx86/generic/pci.c * FILE: hal/halx86/generic/pci.c
* PURPOSE: PCI Bus Support (Configuration Space, Resource Allocation) * PURPOSE: PCI Bus Support (Configuration Space, Resource Allocation)
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
*/ */

2
reactos/hal/halx86/generic/portio.c
View file

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS HAL * PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/x86/portio.c * FILE: hal/halx86/generic/portio.c
* PURPOSE: I/O Functions for access to ports * PURPOSE: I/O Functions for access to ports
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
*/ */

2
reactos/hal/halx86/generic/processor.c
View file

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS HAL * PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/halx86/generic/processor.c * FILE: hal/halx86/up/processor.c
* PURPOSE: HAL Processor Routines * PURPOSE: HAL Processor Routines
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
*/ */

2
reactos/hal/halx86/generic/reboot.c
View file

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS HAL * PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/x86/reboot.c * FILE: hal/halx86/generic/reboot.c
* PURPOSE: Reboot functions * PURPOSE: Reboot functions
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
* Eric Kohl (ekohl@abo.rhein-zeitung.de) * Eric Kohl (ekohl@abo.rhein-zeitung.de)

15
reactos/hal/halx86/generic/spinlock.c
View file

@ -1,12 +1,12 @@
/* /*
* COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS HAL
* PROJECT: ReactOS kernel * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/halx86/up/spinlock.c * FILE: hal/halx86/up/spinlock.c
* PURPOSE: Implements spinlocks * PURPOSE: Spinlock and Queued Spinlock Support
* PROGRAMMER: Alex Ionescu (alex@relsoft.net) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
*/ */
/* INCLUDES ****************************************************************/ /* INCLUDES ******************************************************************/
#include <hal.h> #include <hal.h>
#define NDEBUG #define NDEBUG
@ -17,7 +17,7 @@
#undef KeLowerIrql #undef KeLowerIrql
#undef KeRaiseIrql #undef KeRaiseIrql
/* FUNCTIONS ***************************************************************/ /* FUNCTIONS *****************************************************************/
/* /*
* @implemented * @implemented
@ -199,5 +199,4 @@ KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber,
return TRUE; return TRUE;
} }
/* EOF */ /* EOF */

34
reactos/hal/halx86/generic/sysbus.c
View file

@ -1,34 +0,0 @@
/* $Id$
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* FILE: ntoskrnl/hal/sysbus.c
* PURPOSE: System bus handler functions
* PROGRAMMER: Eric Kohl (ekohl@rz-online.de)
* UPDATE HISTORY:
* 09/04/2000 Created
*/
/* INCLUDES *****************************************************************/
#include <hal.h>
#define NDEBUG
#include <debug.h>
/* FUNCTIONS ****************************************************************/
ULONG
NTAPI
HalpGetSystemInterruptVector(ULONG BusNumber,
ULONG BusInterruptLevel,
ULONG BusInterruptVector,
PKIRQL Irql,
PKAFFINITY Affinity)
{
ULONG Vector = IRQ2VECTOR(BusInterruptVector);
*Irql = (KIRQL)VECTOR2IRQL(Vector);
*Affinity = 0xFFFFFFFF;
return Vector;
}
/* EOF */

2
reactos/hal/halx86/generic/sysinfo.c
View file

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS HA: * PROJECT: ReactOS HA:
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: ntoskrnl/hal/halx86/generic/sysinfo.c * FILE: hal/halx86/generic/sysinfo.c
* PURPOSE: HAL Information Routines * PURPOSE: HAL Information Routines
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
*/ */

1
reactos/hal/halx86/generic/systimer.S
View file

@ -236,7 +236,6 @@ Spurious:
/* Exit the interrupt */ /* Exit the interrupt */
add esp, 8 add esp, 8
mov esi, $
jmp _Kei386EoiHelper@0 jmp _Kei386EoiHelper@0
.endfunc .endfunc

180
reactos/hal/halx86/generic/timer.c
View file

@ -1,49 +1,17 @@
/* /*
* ReactOS kernel * PROJECT: ReactOS HAL
* Copyright (C) 2000 David Welch <welch@cwcom.net> * LICENSE: GPL - See COPYING in the top level directory
* Copyright (C) 1999 Gareth Owen <gaz@athene.co.uk>, Ramon von Handel * FILE: hal/halx86/generic/timer.c
* Copyright (C) 1991, 1992 Linus Torvalds * PURPOSE: HAL Timer Routines
* * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
* This software is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write
* to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
* MA 02139, USA.
*
*/
/* $Id$
*
* PROJECT: ReactOS kernel
* FILE: ntoskrnl/hal/x86/udelay.c
* PURPOSE: Busy waiting
* PROGRAMMER: David Welch (david.welch@seh.ox.ac.uk)
* UPDATE HISTORY:
* 06/11/99 Created
*/ */
/* INCLUDES ***************************************************************/ /* INCLUDES ******************************************************************/
#include <hal.h> #include <hal.h>
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
/* GLOBALS ******************************************************************/
#define MILLISEC 10 /* Number of millisec between interrupts */
#define HZ (1000 / MILLISEC) /* Number of interrupts per second */
#define CLOCK_TICK_RATE 1193182 /* Clock frequency of the timer chip */
#define LATCH (CLOCK_TICK_RATE / HZ) /* Count to program into the timer chip */
#define PRECISION 8 /* Number of bits to calibrate for delay loop */
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
BOOLEAN HalpClockSetMSRate; BOOLEAN HalpClockSetMSRate;
@ -158,140 +126,4 @@ HalSetTimeIncrement(IN ULONG Increment)
return HalpRolloverTable[Increment - 1].HighPart; return HalpRolloverTable[Increment - 1].HighPart;
} }
/* STUFF *********************************************************************/
ULONG
FORCEINLINE
Read8254Timer(VOID)
{
ULONG Count;
/* Disable interrupts */
_disable();
/* Set the rollover */
__outbyte(TIMER_CONTROL_PORT, TIMER_SC0);
Count = __inbyte(TIMER_DATA_PORT0);
Count |= __inbyte(TIMER_DATA_PORT0) << 8;
/* Restore interrupts and return count*/
_enable();
return Count;
}
VOID WaitFor8254Wraparound(VOID)
{
ULONG CurCount, PrevCount = ~0;
LONG Delta;
CurCount = Read8254Timer();
do
{
PrevCount = CurCount;
CurCount = Read8254Timer();
Delta = CurCount - PrevCount;
/*
* This limit for delta seems arbitrary, but it isn't, it's
* slightly above the level of error a buggy Mercury/Neptune
* chipset timer can cause.
*/
}
while (Delta < 300);
}
VOID HalpCalibrateStallExecution(VOID)
{
ULONG i;
ULONG calib_bit;
ULONG CurCount;
PKIPCR Pcr;
LARGE_INTEGER StartCount, EndCount;
Pcr = (PKIPCR)KeGetPcr();
if (Pcr->PrcbData.FeatureBits & KF_RDTSC)
{
WaitFor8254Wraparound();
StartCount.QuadPart = (LONGLONG)__rdtsc();
WaitFor8254Wraparound();
EndCount.QuadPart = (LONGLONG)__rdtsc();
Pcr->PrcbData.MHz = (ULONG)(EndCount.QuadPart - StartCount.QuadPart) / 10000;
DPRINT("%luMHz\n", Pcr->PrcbData.MHz);
return;
}
DPRINT("Calibrating delay loop... [");
/* Stage 1: Coarse calibration */
WaitFor8254Wraparound();
Pcr->StallScaleFactor = 1;
do
{
Pcr->StallScaleFactor <<= 1; /* Next delay count to try */
WaitFor8254Wraparound();
KeStallExecutionProcessor(Pcr->StallScaleFactor); /* Do the delay */
CurCount = Read8254Timer();
}
while (CurCount > LATCH / 2);
Pcr->StallScaleFactor >>= 1; /* Get bottom value for delay */
/* Stage 2: Fine calibration */
DPRINT("delay_count: %d", Pcr->StallScaleFactor);
calib_bit = Pcr->StallScaleFactor; /* Which bit are we going to test */
for (i = 0; i < PRECISION; i++)
{
calib_bit >>= 1; /* Next bit to calibrate */
if (!calib_bit)
{
break; /* If we have done all bits, stop */
}
Pcr->StallScaleFactor |= calib_bit; /* Set the bit in delay_count */
WaitFor8254Wraparound();
KeStallExecutionProcessor(Pcr->StallScaleFactor); /* Do the delay */
CurCount = Read8254Timer();
if (CurCount <= LATCH / 2) /* If a tick has passed, turn the */
{ /* calibrated bit back off */
Pcr->StallScaleFactor &= ~calib_bit;
}
}
/* We're finished: Do the finishing touches */
Pcr->StallScaleFactor /= (MILLISEC / 2); /* Calculate delay_count for 1ms */
DPRINT("]\n");
DPRINT("delay_count: %d\n", Pcr->StallScaleFactor);
DPRINT("CPU speed: %d\n", Pcr->StallScaleFactor / 250);
#if 0
DbgPrint("About to start delay loop test\n");
DbgPrint("Waiting for five minutes...");
for (i = 0; i < (5*60*1000*20); i++)
{
KeStallExecutionProcessor(50);
}
DbgPrint("finished\n");
for(;;);
#endif
}
/* EOF */ /* EOF */

17
reactos/hal/halx86/up/halinit_up.c
View file

@ -20,28 +20,13 @@
VOID VOID
HalpInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) HalpInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
{ {
/* Initialize the PICs */
HalpInitPICs();
/* Force initial PIC state */
KfRaiseIrql(KeGetCurrentIrql());
/* Initialize the clock */
HalpInitializeClock();
/* Setup busy waiting */
HalpCalibrateStallExecution();
} }
VOID VOID
HalpInitPhase1(VOID) HalpInitPhase1(VOID)
{ {
/* Enable the clock interrupt */
((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset =
(USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF);
((PKIPCR)KeGetPcr())->IDT[0x30].Offset =
(USHORT)HalpClockInterrupt;
HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched);
} }
/* EOF */ /* EOF */

1
reactos/ntoskrnl/ke/i386/clock.S
View file

@ -241,7 +241,6 @@ IncompleteTick2:
Done: Done:
/* Exit the interrupt */ /* Exit the interrupt */
mov esi, $
cli cli
call _HalEndSystemInterrupt@8 call _HalEndSystemInterrupt@8
jmp _Kei386EoiHelper@0 jmp _Kei386EoiHelper@0