mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 13:45:58 +00:00
Cleanup to make buildable
svn path=/trunk/; revision=729
This commit is contained in:
parent
a53e883bb0
commit
c0b2b118a0
|
@ -1,8 +1,10 @@
|
|||
#
|
||||
#
|
||||
#
|
||||
BASE_CFLAGS = -I../../../include
|
||||
|
||||
MP_OBJECTS = vgamp.o ../../../ntoskrnl/ntoskrnl.a ../vidport/vidport.a
|
||||
DDI_OBJECTS = vgaddi.o ../../subsys/win32k/win32k.a
|
||||
DDI_OBJECTS = vgaddi.o ../../../subsys/win32k/win32k.a
|
||||
|
||||
all: vgamp.sys vgaddi.sys
|
||||
|
||||
|
@ -17,27 +19,61 @@ clean:
|
|||
|
||||
.phony: clean
|
||||
|
||||
vgamp.sys: $(OBJECTS)
|
||||
vgamp.sys: $(MP_OBJECTS)
|
||||
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
|
||||
-Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
|
||||
-Wl,--base-file,base.tmp $(OBJECTS)
|
||||
-Wl,--base-file,base.tmp $(MP_OBJECTS)
|
||||
- $(RM) junk.tmp
|
||||
$(DLLTOOL) --dllname vgamp.sys --base-file base.tmp \
|
||||
--output-exp temp.exp
|
||||
- $(RM) base.tmp
|
||||
$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
|
||||
-specs=../../svc_specs -mdll -o vgamp.sys $(OBJECTS) -Wl,temp.exp
|
||||
-specs=../../svc_specs -mdll -o vgamp.sys $(MP_OBJECTS) -Wl,temp.exp
|
||||
- $(RM) temp.exp
|
||||
|
||||
vgaddi.sys: $(OBJECTS)
|
||||
vgaddi.sys: $(DDI_OBJECTS)
|
||||
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
|
||||
-Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
|
||||
-Wl,--base-file,base.tmp $(OBJECTS)
|
||||
-Wl,--base-file,base.tmp $(DDI_OBJECTS)
|
||||
- $(RM) junk.tmp
|
||||
$(DLLTOOL) --dllname vgaddi.sys --base-file base.tmp \
|
||||
--output-exp temp.exp
|
||||
- $(RM) base.tmp
|
||||
$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
|
||||
-specs=../../svc_specs -mdll -o vgaddi.sys $(OBJECTS) -Wl,temp.exp
|
||||
-specs=../../svc_specs -mdll -o vgaddi.sys $(DDI_OBJECTS) -Wl,temp.exp
|
||||
- $(RM) temp.exp
|
||||
|
||||
floppy: $(FLOPPY_DIR)/drivers/vgamp.sys $(FLOPPY_DIR)/drivers/vgaddi.sys
|
||||
|
||||
$(FLOPPY_DIR)/drivers/vgamp.sys: vgamp.sys
|
||||
ifeq ($(DOSCLI),yes)
|
||||
$(CP) vgamp.sys $(FLOPPY_DIR)\drivers\vgamp.sys
|
||||
else
|
||||
$(CP) vgamp.sys $(FLOPPY_DIR)/drivers/vgamp.sys
|
||||
endif
|
||||
|
||||
$(FLOPPY_DIR)/drivers/vgaddi.sys: vgaddi.sys
|
||||
ifeq ($(DOSCLI),yes)
|
||||
$(CP) vgaddi.sys $(FLOPPY_DIR)\drivers\vgaddi.sys
|
||||
else
|
||||
$(CP) vgaddi.sys $(FLOPPY_DIR)/drivers/vgaddi.sys
|
||||
endif
|
||||
|
||||
dist: ../../../$(DIST_DIR)/drivers/vgamp.sys ../../../$(DIST_DIR)/drivers/vgaddi.sys
|
||||
|
||||
../../../$(DIST_DIR)/drivers/vgamp.sys: vgamp.sys
|
||||
ifeq ($(DOSCLI),yes)
|
||||
$(CP) vgamp.sys ..\..\..\$(DIST_DIR)\drivers\vgamp.sys
|
||||
else
|
||||
$(CP) vgamp.sys ../../../$(DIST_DIR)/drivers/vgamp.sys
|
||||
endif
|
||||
|
||||
../../../$(DIST_DIR)/drivers/vgaddi.sys: vgaddi.sys
|
||||
ifeq ($(DOSCLI),yes)
|
||||
$(CP) vgaddi.sys ..\..\..\$(DIST_DIR)\drivers\vgaddi.sys
|
||||
else
|
||||
$(CP) vgaddi.sys ../../../$(DIST_DIR)/drivers/vgaddi.sys
|
||||
endif
|
||||
|
||||
include ../../../rules.mak
|
||||
|
||||
|
|
|
@ -3,10 +3,13 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <winddi.h>
|
||||
#include <ddk/ntddk.h>
|
||||
#include <ddk/winddi.h>
|
||||
|
||||
#include "vgaddi.h"
|
||||
|
||||
#define DBG_PREFIX "VGADDI: "
|
||||
|
||||
VOID VGADDIAssertMode(IN DHPDEV DPev,
|
||||
IN BOOL Enable);
|
||||
VOID VGADDICompletePDEV(IN DHPDEV PDev,
|
||||
|
@ -150,7 +153,7 @@ DHPDEV VGADDIEnablePDEV(IN DEVMODEW *DM,
|
|||
PDev = EngAllocMem(FL_ZERO_MEMORY, sizeof(PDEV), ALLOC_TAG);
|
||||
if (PDev == NULL)
|
||||
{
|
||||
EngDebugPrint(1, "EngAllocMem failed for PDEV\n");
|
||||
EngDebugPrint(DBG_PREFIX, "EngAllocMem failed for PDEV\n", 0);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
@ -175,13 +178,33 @@ VOID VGADDICompletePDEV(IN DHPDEV PDev,
|
|||
|
||||
|
||||
VOID VGADDIAssertMode(IN DHPDEV DPev,
|
||||
IN BOOL Enable);
|
||||
VOID VGADDIDisablePDEV(IN DHPDEV PDev);
|
||||
VOID VGADDIDisableSurface(IN DHPDEV PDev);
|
||||
HSURF VGADDIEnableSurface(IN DHPDEV PDev);
|
||||
IN BOOL Enable)
|
||||
{
|
||||
EngDebugPrint(DBG_PREFIX, "UNIMPLEMENTED\n", 0);
|
||||
}
|
||||
|
||||
VOID VGADDIDisablePDEV(IN DHPDEV PDev)
|
||||
{
|
||||
EngDebugPrint(DBG_PREFIX, "UNIMPLEMENTED\n", 0);
|
||||
}
|
||||
|
||||
VOID VGADDIDisableSurface(IN DHPDEV PDev)
|
||||
{
|
||||
EngDebugPrint(DBG_PREFIX, "UNIMPLEMENTED\n", 0);
|
||||
}
|
||||
|
||||
HSURF VGADDIEnableSurface(IN DHPDEV PDev)
|
||||
{
|
||||
EngDebugPrint(DBG_PREFIX, "UNIMPLEMENTED\n", 0);
|
||||
}
|
||||
|
||||
ULONG VGADDIGetModes(IN HANDLE Driver,
|
||||
IN ULONG DataSize,
|
||||
OUT PDEVMODEW DM);
|
||||
OUT PDEVMODEW DM)
|
||||
{
|
||||
EngDebugPrint(DBG_PREFIX, "UNIMPLEMENTED\n", 0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
typedef struct _PDEV
|
||||
{
|
||||
HANDLE KMDriver;
|
||||
HDEV GDIDevHandle;
|
||||
} PDEV, *PPDEV;
|
||||
|
||||
|
||||
|
|
|
@ -77,17 +77,17 @@ DriverEntry(IN PVOID Context1,
|
|||
VideoPortZeroMemory(&InitData, sizeof InitData);
|
||||
|
||||
/* FIXME: Fill in InitData members */
|
||||
InitData->StartingDeviceNumber = 0;
|
||||
InitData.StartingDeviceNumber = 0;
|
||||
|
||||
/* Export driver entry points... */
|
||||
InitData->HwVidFindAdapter = VGAFindAdapter;
|
||||
InitData->HwVidInitialize = VGAInitialize;
|
||||
InitData->HwVidStartIO = VGAStartIO;
|
||||
/* InitData->HwVidInterrupt = VGAInterrupt; */
|
||||
/* InitData->HwVidResetHw = VGAResetHw; */
|
||||
/* InitData->HwVidTimer = VGATimer; */
|
||||
InitData.HwFindAdapter = VGAFindAdapter;
|
||||
InitData.HwInitialize = VGAInitialize;
|
||||
InitData.HwStartIO = VGAStartIO;
|
||||
/* InitData.HwInterrupt = VGAInterrupt; */
|
||||
/* InitData.HwResetHw = VGAResetHw; */
|
||||
/* InitData.HwTimer = VGATimer; */
|
||||
|
||||
return VideoPortInitialize(Context1, Context2, InitData, NULL);
|
||||
return VideoPortInitialize(Context1, Context2, &InitData, NULL);
|
||||
}
|
||||
|
||||
// VGAFindAdapter
|
||||
|
@ -247,7 +247,7 @@ VGAStartIO(PVOID DeviceExtension,
|
|||
break;
|
||||
|
||||
case IOCTL_VIDEO_SHARE_VIDEO_MEMORY:
|
||||
VGAShareVideoMemory((PVIDEO_SHAR_MEMORY) RequestPacket->InputBuffer,
|
||||
VGAShareVideoMemory((PVIDEO_SHARE_MEMORY) RequestPacket->InputBuffer,
|
||||
(PVIDEO_MEMORY_INFORMATION) RequestPacket->OutputBuffer,
|
||||
&RequestPacket->StatusBlock);
|
||||
break;
|
||||
|
@ -302,7 +302,7 @@ VGAStartIO(PVOID DeviceExtension,
|
|||
#endif
|
||||
|
||||
default:
|
||||
RequestPacket->StatusBlock.Status = ERROR_INVALID_FUNCTION;
|
||||
RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -366,24 +366,64 @@ static VOID VGATimer(PVOID DeviceExtension);
|
|||
|
||||
VOID VGAMapVideoMemory(IN PVIDEO_MEMORY RequestedAddress,
|
||||
OUT PVIDEO_MEMORY_INFORMATION MapInformation,
|
||||
OUT PSTATUS_BLOCK StatusBlock);
|
||||
OUT PSTATUS_BLOCK StatusBlock)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
VOID VGAQueryAvailModes(OUT PVIDEO_MODE_INFORMATION ReturnedModes,
|
||||
OUT PSTATUS_BLOCK StatusBlock);
|
||||
OUT PSTATUS_BLOCK StatusBlock)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
VOID VGAQueryCurrentMode(OUT PVIDEO_MODE_INFORMATION CurrentMode,
|
||||
OUT PSTATUS_BLOCK StatusBlock);
|
||||
OUT PSTATUS_BLOCK StatusBlock)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
VOID VGAQueryNumAvailModes(OUT PVIDEO_NUM_MODES NumberOfModes,
|
||||
OUT PSTATUS_BLOCK StatusBlock);
|
||||
VOID VGAResetDevice(OUT PSTATUS_BLOCK StatusBlock);
|
||||
OUT PSTATUS_BLOCK StatusBlock)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
VOID VGAResetDevice(OUT PSTATUS_BLOCK StatusBlock)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
VOID VGASetColorRegisters(IN PVIDEO_CLUT ColorLookUpTable,
|
||||
OUT PSTATUS_BLOCK StatusBlock);
|
||||
OUT PSTATUS_BLOCK StatusBlock)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
VOID VGASetCurrentMode(IN PVIDEO_MODE RequestedMode,
|
||||
OUT PSTATUS_BLOCK StatusBlock);
|
||||
OUT PSTATUS_BLOCK StatusBlock)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
VOID VGAShareVideoMemory(IN PVIDEO_SHARE_MEMORY RequestedMemory,
|
||||
OUT PVIDEO_MEMORY_INFORMATION ReturnedMemory,
|
||||
OUT PSTATUS_BLOCK StatusBlock);
|
||||
OUT PSTATUS_BLOCK StatusBlock)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
VOID VGAUnmapVideoMemory(IN PVIDEO_MEMORY MemoryToUnmap,
|
||||
OUT PSTATUS_BLOCK StatusBlock);
|
||||
OUT PSTATUS_BLOCK StatusBlock)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
VOID VGAUnshareVideoMemory(IN PVIDEO_MEMORY MemoryToUnshare,
|
||||
OUT PSTATUS_BLOCK StatusBlock);
|
||||
OUT PSTATUS_BLOCK StatusBlock)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue