Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixes for compile errors.

Browse source 
svn path=/trunk/; revision=528
This commit is contained in:
Rex Jolliff 1999-05-29 02:51:05 +00:00
parent 126768af64
commit 28f788e6ed
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
reactos/drivers/dd/vidport/vidport.c
View file

@ -5,6 +5,7 @@
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <ddk/ntddvid.h> #include <ddk/ntddvid.h>
#include <internal/halio.h>
#include "vidport.h" #include "vidport.h"
@ -211,7 +212,7 @@ VideoPortInitialize(IN PVOID Context1,
/* FIXME: Need to figure out what string to pass as param 3 */ /* FIXME: Need to figure out what string to pass as param 3 */
Status = HwInitializationData->HwFindAdapter(VPExtensionToMPExtension(ExtensionData), Status = HwInitializationData->HwFindAdapter(VPExtensionToMPExtension(ExtensionData),
Context2, Context2,
"", L"",
&ConfigInfo, &ConfigInfo,
&Again); &Again);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
@ -230,22 +231,23 @@ VideoPortInitialize(IN PVOID Context1,
ConfigInfo.BusInterruptVector == 0)) ConfigInfo.BusInterruptVector == 0))
{ {
ExtensionData->IRQL = ConfigInfo.BusInterruptLevel; ExtensionData->IRQL = ConfigInfo.BusInterruptLevel;
ExtensionData->Interrupt = ExtensionData->InterruptLevel =
HalGetinterruptVector(ConfigInfo.AdapterInterfaceType, HalGetInterruptVector(ConfigInfo.AdapterInterfaceType,
ConfigInfo.SystemIoBusNumber, ConfigInfo.SystemIoBusNumber,
ConfigInfo.BusInterruptLevel, ConfigInfo.BusInterruptLevel,
ConfigInfo.BufInterruptVector, ConfigInfo.BusInterruptVector,
&ExtensionData->IRQL, &ExtensionData->IRQL,
&ExtensionData->Affinity); &ExtensionData->Affinity);
KeInitializeSpinLock(&ExtensionData->InterruptSpinLock); KeInitializeSpinLock(&ExtensionData->InterruptSpinLock);
Status = IoConnectInterrupt(&ExtensionData->InterruptObject, Status = IoConnectInterrupt(&ExtensionData->InterruptObject,
HwInitializationData->HwInterrupt, (PKSERVICE_ROUTINE)
HwInitializationData->HwInterrupt,
VPExtensionToMPExtension(ExtensionData), VPExtensionToMPExtension(ExtensionData),
&ExtensionData->InterruptSpinLock, &ExtensionData->InterruptSpinLock,
ExtensionData->InterruptLevel, ExtensionData->InterruptLevel,
ExtensionData->IRQL, ExtensionData->IRQL,
ExtensionData->IRQL, ExtensionData->IRQL,
ConfigData.InterruptMode, ConfigInfo.InterruptMode,
FALSE, FALSE,
ExtensionData->Affinity, ExtensionData->Affinity,
FALSE); FALSE);
@ -262,11 +264,12 @@ VideoPortInitialize(IN PVOID Context1,
while (&Again); while (&Again);
/* FIXME: initialize timer routine for MP Driver */ /* FIXME: initialize timer routine for MP Driver */
if (HwInitialization->HwTimer != NULL) if (HwInitializationData->HwTimer != NULL)
{ {
Status = IoInitializeTimer(MPDeviceObject, Status = IoInitializeTimer(MPDeviceObject,
HwInitialization->HwTimer, (PIO_TIMER_ROUTINE)
VPExtensionTPMPExtension(ExtensionData)); HwInitializationData->HwTimer,
VPExtensionToMPExtension(ExtensionData));
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DbgPrint("IoInitializeTimer failed\n"); DbgPrint("IoInitializeTimer failed\n");
@ -323,9 +326,10 @@ VideoPortMapMemory(IN PVOID HwDeviceExtension,
{ {
if (*InIoSpace) if (*InIoSpace)
{ {
*VirtualAddress = MmMapIoSpace(PhyiscalAddress, Length, FALSE); *VirtualAddress = MmMapIoSpace(PhysicalAddress, *Length, FALSE);
return *VirtualAddress != NULL ? STATUS_SUCCESS : STATUS_INSUFFICFIENT_RESOURCES; return *VirtualAddress != NULL ? STATUS_SUCCESS :
STATUS_INSUFFICIENT_RESOURCES;
} }
else else
{ {

2
reactos/drivers/dd/vidport/vidport.h
View file

@ -2,7 +2,7 @@
typedef struct _VIDEOPORT_EXTENSTION_DATA typedef struct _VIDEOPORT_EXTENSTION_DATA
{ {
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
KINTERRUPT InterruptObject; PKINTERRUPT InterruptObject;
KSPIN_LOCK InterruptSpinLock; KSPIN_LOCK InterruptSpinLock;
ULONG InterruptLevel; ULONG InterruptLevel;
KIRQL IRQL; KIRQL IRQL;