win-pvdrivers

changeset 164:0d62c04dae52 0.6.4

Fixed a problem on XP caused by a fix on x64. Added a stub driver to be used on console and vfb.
author James Harper <james.harper@bendigoit.com.au>
date Sun Feb 03 22:18:21 2008 +1100 (2008-02-03)
parents 218a05ac3de0
children dd8ad388519e
files common.inc dirs makedist.bat xenaddresource/sources xenenum/sources xenhide/sources xennet/sources xenpci/i386/hypercall.asm xenpci/sources xenvbd/sources xenvbd/xenvbd.c
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/common.inc	Sun Feb 03 22:18:21 2008 +1100
     1.3 @@ -0,0 +1,8 @@
     1.4 +VERSION=0.6.4.0
     1.5 +TARGETPATH=..\Target\$(DDK_TARGET_OS)
     1.6 +KMDF_VERSION=1
     1.7 +MSC_WARNING_LEVEL=/W4
     1.8 +INCLUDES = ..\common\include;..\common\include\public
     1.9 +TARGETLIBS=$(TARGETLIBS) $(DDK_LIB_PATH)\ntstrsafe.lib
    1.10 +NTTARGETFILES=
    1.11 +#SOURCES_USED=..\common.inc
    1.12 \ No newline at end of file
     2.1 --- a/dirs	Sat Feb 02 22:49:00 2008 +1100
     2.2 +++ b/dirs	Sun Feb 03 22:18:21 2008 +1100
     2.3 @@ -1,1 +1,1 @@
     2.4 -DIRS=xenpci xenhide xenvbd xenaddresource xenenum xennet
     2.5 \ No newline at end of file
     2.6 +DIRS=xenpci xenhide xenvbd xenaddresource xenenum xennet xenstub
     2.7 \ No newline at end of file
     3.1 --- a/makedist.bat	Sat Feb 02 22:49:00 2008 +1100
     3.2 +++ b/makedist.bat	Sun Feb 03 22:18:21 2008 +1100
     3.3 @@ -2,5 +2,5 @@
     3.4  cmd /C "C:\WinDDK\6000\bin\setenv.bat C:\WinDDK\6000\ chk AMD64 WNET && CD \Projects\win-pvdrivers.hg && build -cZg"
     3.5  cmd /C "C:\WinDDK\6000\bin\setenv.bat C:\WinDDK\6000\ chk WNET && CD \Projects\win-pvdrivers.hg && build -cZg"
     3.6  cmd /C "C:\WinDDK\6000\bin\setenv.bat C:\WinDDK\6000\ chk WXP && CD \Projects\win-pvdrivers.hg && build -cZg"
     3.7 -xcopy target\* dist /E /EXCLUDE:exclude.txt /D /Y
     3.8 +xcopy target\* dist /E /EXCLUDE:exclude.txt /I /D /Y
     3.9  copy doc\*.txt dist
     4.1 --- a/xenaddresource/sources	Sat Feb 02 22:49:00 2008 +1100
     4.2 +++ b/xenaddresource/sources	Sun Feb 03 22:18:21 2008 +1100
     4.3 @@ -1,12 +1,4 @@
     4.4 -TARGETNAME=XENADDRESOURCE
     4.5 +!include "..\common.inc"
     4.6 +TARGETNAME=xenaddresource
     4.7  TARGETTYPE=DRIVER
     4.8 -TARGETPATH=..\Target\$(DDK_TARGET_OS)
     4.9 -VERSION=0.6.0.0
    4.10 -KMDF_VERSION=1
    4.11 -MSC_WARNING_LEVEL=/W4
    4.12 -#INF_NAME=xenaddresource
    4.13 -INCLUDES = ..\common\include;..\common\include\public
    4.14 -TARGETLIBS=$(DDK_LIB_PATH)\ntstrsafe.lib
    4.15 -#MISCFILES=$(TARGETPATH)\$(INF_NAME).inf
    4.16 -#NTTARGETFILES=
    4.17  SOURCES=xenaddresource.c
     5.1 --- a/xenenum/sources	Sat Feb 02 22:49:00 2008 +1100
     5.2 +++ b/xenenum/sources	Sun Feb 03 22:18:21 2008 +1100
     5.3 @@ -1,13 +1,6 @@
     5.4 +!include "..\common.inc"
     5.5  TARGETNAME=xenenum
     5.6  TARGETTYPE=DRIVER
     5.7 -TARGETPATH=..\Target\$(DDK_TARGET_OS)
     5.8 -VERSION=0.6.3.0
     5.9 -KMDF_VERSION=1
    5.10 -MSC_WARNING_LEVEL=/W4
    5.11 -INF_NAME=xenenum
    5.12 -INCLUDES = ..\common\include;..\common\include\public
    5.13 -TARGETLIBS=$(DDK_LIB_PATH)\ntstrsafe.lib
    5.14 +INF_NAME=$(TARGETNAME)
    5.15  MISCFILES=..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf
    5.16 -NTTARGETFILES=
    5.17  SOURCES=xenenum.c
    5.18 -
     6.1 --- a/xenhide/sources	Sat Feb 02 22:49:00 2008 +1100
     6.2 +++ b/xenhide/sources	Sun Feb 03 22:18:21 2008 +1100
     6.3 @@ -1,13 +1,6 @@
     6.4 -TARGETNAME=XENHIDE
     6.5 +!include "..\common.inc"
     6.6 +TARGETNAME=xenhide
     6.7  TARGETTYPE=DRIVER
     6.8 -TARGETPATH=..\Target\$(DDK_TARGET_OS)
     6.9 -VERSION=0.6.3.0
    6.10 -KMDF_VERSION=1
    6.11 -MSC_WARNING_LEVEL=/W4
    6.12 -INF_NAME=xenhide
    6.13 -INCLUDES = ..\common\include;..\common\include\public
    6.14 -TARGETLIBS=$(DDK_LIB_PATH)\ntstrsafe.lib
    6.15 -MISCFILES=$(TARGETPATH)\$(INF_NAME).inf
    6.16 -NTTARGETFILES=
    6.17 +INF_NAME=$(TARGETNAME)
    6.18 +MISCFILES=..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf
    6.19  SOURCES=xenhide.c
    6.20 -
     7.1 --- a/xennet/sources	Sat Feb 02 22:49:00 2008 +1100
     7.2 +++ b/xennet/sources	Sun Feb 03 22:18:21 2008 +1100
     7.3 @@ -1,13 +1,7 @@
     7.4 -TARGETNAME=XENNET
     7.5 +!include "..\common.inc"
     7.6 +TARGETNAME=xennet
     7.7  TARGETTYPE=DRIVER
     7.8 -TARGETPATH=..\Target\$(DDK_TARGET_OS)
     7.9 -VERSION=0.6.3.0
    7.10 -KMDF_VERSION=1
    7.11 -MSC_WARNING_LEVEL=/W4
    7.12 -INF_NAME=xennet
    7.13 -INCLUDES = ..\common\include;..\common\include\public
    7.14 -TARGETLIBS=$(DDK_LIB_PATH)\ntstrsafe.lib \
    7.15 -  $(DDK_LIB_PATH)\ndis.lib
    7.16 -MISCFILES=$(TARGETPATH)\$(INF_NAME).inf
    7.17 -NTTARGETFILES=
    7.18 +INF_NAME=$(TARGETNAME)
    7.19 +TARGETLIBS=$(TARGETLIBS) $(DDK_LIB_PATH)\ndis.lib
    7.20 +MISCFILES=..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf
    7.21  SOURCES=xennet.c
     8.1 --- a/xenpci/i386/hypercall.asm	Sat Feb 02 22:49:00 2008 +1100
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,2 +0,0 @@
     8.4 -;nothing to do here for x86
     8.5 -END
     8.6 \ No newline at end of file
     9.1 --- a/xenpci/sources	Sat Feb 02 22:49:00 2008 +1100
     9.2 +++ b/xenpci/sources	Sun Feb 03 22:18:21 2008 +1100
     9.3 @@ -1,12 +1,7 @@
     9.4 -TARGETNAME=XENPCI
     9.5 +!INCLUDE ..\common.inc
     9.6 +TARGETNAME=xenpci
     9.7  TARGETTYPE=DRIVER
     9.8 -TARGETPATH=..\Target\$(DDK_TARGET_OS)
     9.9 -VERSION=0.6.3.0
    9.10 -KMDF_VERSION=1
    9.11 -MSC_WARNING_LEVEL=/W4
    9.12 -INF_NAME=xenpci
    9.13 -INCLUDES = ..\common\include;..\common\include\public
    9.14 -TARGETLIBS=$(DDK_LIB_PATH)\ntstrsafe.lib
    9.15 -MISCFILES=$(TARGETPATH)\$(INF_NAME).inf
    9.16 -NTTARGETFILES=
    9.17 -SOURCES=xenpci.c xenbus.c gnttbl.c evtchn.c hypercall.asm
    9.18 +INF_NAME=$(TARGETNAME)
    9.19 +MISCFILES=..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf
    9.20 +AMD64_SOURCES=hypercall.asm
    9.21 +SOURCES=xenpci.c xenbus.c gnttbl.c evtchn.c
    10.1 --- a/xenvbd/sources	Sat Feb 02 22:49:00 2008 +1100
    10.2 +++ b/xenvbd/sources	Sun Feb 03 22:18:21 2008 +1100
    10.3 @@ -1,12 +1,7 @@
    10.4 -TARGETNAME=XENVBD
    10.5 +!include "..\common.inc"
    10.6 +TARGETNAME=xenvbd
    10.7  TARGETTYPE=DRIVER
    10.8 -TARGETPATH=..\Target\$(DDK_TARGET_OS)
    10.9 -VERSION=0.6.3.0
   10.10 -KMDF_VERSION=1
   10.11 -MSC_WARNING_LEVEL=/W4
   10.12 -INF_NAME=xenvbd
   10.13 -INCLUDES = ..\common\include;..\common\include\public
   10.14 -TARGETLIBS=$(TARGETLIBS) $(DDK_LIB_PATH)\ntstrsafe.lib $(DDK_LIB_PATH)\scsiport.lib
   10.15 +INF_NAME=$(TARGETNAME)
   10.16 +TARGETLIBS=$(TARGETLIBS) $(DDK_LIB_PATH)\scsiport.lib
   10.17  MISCFILES=..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf
   10.18 -NTTARGETFILES=
   10.19  SOURCES=xenvbd.c
    11.1 --- a/xenvbd/xenvbd.c	Sat Feb 02 22:49:00 2008 +1100
    11.2 +++ b/xenvbd/xenvbd.c	Sun Feb 03 22:18:21 2008 +1100
    11.3 @@ -640,7 +640,9 @@ XenVbd_HwScsiFindAdapter(PVOID DeviceExt
    11.4        break;
    11.5      }
    11.6    }
    11.7 +#if defined(__x86_64__)
    11.8    ConfigInfo->Master = TRUE; // Won't work under x64 without this...
    11.9 +#endif
   11.10    ConfigInfo->MaximumTransferLength = BUF_PAGES_PER_SRB * PAGE_SIZE;
   11.11    ConfigInfo->NumberOfPhysicalBreaks = BUF_PAGES_PER_SRB - 1;
   11.12    ConfigInfo->ScatterGather = TRUE;
   11.13 @@ -923,7 +925,7 @@ XenVbd_HwScsiStartIo(PVOID DeviceExtensi
   11.14      switch(cdb->CDB6GENERIC.OperationCode)
   11.15      {
   11.16      case SCSIOP_TEST_UNIT_READY:
   11.17 -//      KdPrint((__DRIVER_NAME "     Command = TEST_UNIT_READY\n"));
   11.18 +      KdPrint((__DRIVER_NAME "     Command = TEST_UNIT_READY\n"));
   11.19        Srb->SrbStatus = SRB_STATUS_SUCCESS;
   11.20        Srb->ScsiStatus = 0;
   11.21        ScsiPortNotification(RequestComplete, DeviceExtension, Srb);