mirror of
https://github.com/reactos/reactos.git
synced 2024-07-29 15:49:03 +00:00
- Fix call to VidInitialize.
- Disable call to HalDisplayReset to avoid bugcheck. [Lock held] - Don't unload bootvid after Phase 3 I/O Init since we still need to call it. - Implement HalpTranslateResourceAddress since bootvid (and other windows boot drivers, potentially) needs it. svn path=/trunk/; revision=25721
This commit is contained in:
parent
7f1390f3c4
commit
925751080d
|
@ -423,7 +423,7 @@ TryAgain:
|
||||||
//
|
//
|
||||||
// Reset the display
|
// Reset the display
|
||||||
//
|
//
|
||||||
HalResetDisplay();
|
//HalResetDisplay();
|
||||||
curr_x = 0;
|
curr_x = 0;
|
||||||
curr_y = 0;
|
curr_y = 0;
|
||||||
|
|
||||||
|
|
|
@ -93,6 +93,28 @@ HalpGetSystemInterruptVector(IN ULONG BusNumber,
|
||||||
return Vector;
|
return Vector;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOLEAN
|
||||||
|
NTAPI
|
||||||
|
HalpFindBusAddressTranslation(IN PHYSICAL_ADDRESS BusAddress,
|
||||||
|
IN OUT PULONG AddressSpace,
|
||||||
|
OUT PPHYSICAL_ADDRESS TranslatedAddress,
|
||||||
|
IN OUT PULONG_PTR Context,
|
||||||
|
IN BOOLEAN NextBus)
|
||||||
|
{
|
||||||
|
/* Make sure we have a context */
|
||||||
|
if (!Context) return FALSE;
|
||||||
|
|
||||||
|
/* If we have data in the context, then this shouldn't be a new lookup */
|
||||||
|
if ((*Context) && (NextBus == TRUE)) return FALSE;
|
||||||
|
|
||||||
|
/* Return bus data */
|
||||||
|
TranslatedAddress->QuadPart = BusAddress.QuadPart;
|
||||||
|
|
||||||
|
/* Set context value and return success */
|
||||||
|
*Context = 1;
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
NTAPI
|
NTAPI
|
||||||
HalpInitNonBusHandler(VOID)
|
HalpInitNonBusHandler(VOID)
|
||||||
|
@ -100,7 +122,7 @@ HalpInitNonBusHandler(VOID)
|
||||||
/* These should be written by the PCI driver later, but we give defaults */
|
/* These should be written by the PCI driver later, but we give defaults */
|
||||||
HalPciTranslateBusAddress = HalpTranslateBusAddress;
|
HalPciTranslateBusAddress = HalpTranslateBusAddress;
|
||||||
HalPciAssignSlotResources = HalpAssignSlotResources;
|
HalPciAssignSlotResources = HalpAssignSlotResources;
|
||||||
//HalFindBusAddressTranslation = HalpFindBusAddressTranslation;
|
HalFindBusAddressTranslation = HalpFindBusAddressTranslation;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* PUBLIC FUNCTIONS **********************************************************/
|
/* PUBLIC FUNCTIONS **********************************************************/
|
||||||
|
|
|
@ -68,5 +68,4 @@ VidSolidColorFill(IN ULONG Left,
|
||||||
IN ULONG Bottom,
|
IN ULONG Bottom,
|
||||||
IN UCHAR Color);
|
IN UCHAR Color);
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -104,8 +104,7 @@ InbvDriverInitialize(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize the video */
|
/* Initialize the video */
|
||||||
InbvBootDriverInstalled = VidInitialize(CustomLogo);
|
InbvBootDriverInstalled = VidInitialize(!CustomLogo);
|
||||||
DPRINT1("Init: %lx\n", InbvBootDriverInstalled);
|
|
||||||
if (InbvBootDriverInstalled)
|
if (InbvBootDriverInstalled)
|
||||||
{
|
{
|
||||||
/* Find bitmap resources in the kernel */
|
/* Find bitmap resources in the kernel */
|
||||||
|
@ -239,10 +238,8 @@ InbvDisplayString(IN PCHAR String)
|
||||||
/* Acquire the lock */
|
/* Acquire the lock */
|
||||||
InbvAcquireLock();
|
InbvAcquireLock();
|
||||||
|
|
||||||
#if 0
|
|
||||||
/* Make sure we're installed and display the string */
|
/* Make sure we're installed and display the string */
|
||||||
if (InbvBootDriverInstalled) VidDisplayString(String);
|
if (InbvBootDriverInstalled) VidDisplayString(String);
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Call Headless (We don't support headless for now)
|
/* Call Headless (We don't support headless for now)
|
||||||
HeadlessDispatch(DISPLAY_STRING); */
|
HeadlessDispatch(DISPLAY_STRING); */
|
||||||
|
|
|
@ -1018,7 +1018,7 @@ IopInitializeBootDrivers(VOID)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Loop modules again */
|
/* Loop modules again */
|
||||||
NextEntry = ListHead->Flink->Flink->Flink;
|
NextEntry = ListHead->Flink->Flink->Flink->Flink;
|
||||||
while (ListHead != NextEntry)
|
while (ListHead != NextEntry)
|
||||||
{
|
{
|
||||||
/* Get the entry */
|
/* Get the entry */
|
||||||
|
|
Loading…
Reference in a new issue