win-pvdrivers

changeset 689:f1bb26495379 0.10.0.133

xennet cleanup
author James Harper <james.harper@bendigoit.com.au>
date Sun Nov 08 10:05:10 2009 +1100 (2009-11-08)
parents f169bfa6450d
children abde3e790a21
files wix.bat xennet/xennet.c xennet/xennet.h
line diff
     1.1 --- a/wix.bat	Thu Oct 29 23:43:19 2009 +1100
     1.2 +++ b/wix.bat	Sun Nov 08 10:05:10 2009 +1100
     1.3 @@ -1,4 +1,18 @@
     1.4  @ECHO OFF
     1.5 +
     1.6  IF "%_BUILDARCH%"=="x86" (SET DIFXLIB=%WIX%bin\difxapp_x86.wixlib) ELSE (SET DIFXLIB=%WIX%bin\difxapp_x64.wixlib)
     1.7 +
     1.8 +IF "%_BUILDARCH%"=="x86" (SET MSIARCH=x32) ELSE (SET MSIARCH=x64)
     1.9 +
    1.10 +IF "%DDKBUILDENV%"=="chk" (SET MSIBUILD=_debug) ELSE (SET MSIBUILD=)
    1.11 +
    1.12 +SET MSIOS=%DDK_TARGET_OS%
    1.13 +IF "%DDK_TARGET_OS%"=="WinXP" (SET MSIOS=XP)
    1.14 +IF "%DDK_TARGET_OS%"=="WinXP" (SET MSIARCH=)
    1.15 +IF "%DDK_TARGET_OS%"=="WinNET" (SET MSIOS=2003)
    1.16 +IF "%DDK_TARGET_OS%"=="WinLH" (SET MSIOS=Vista2008)
    1.17 +
    1.18 +SET MSINAME=gplpv_%MSIOS%%MSIARCH%_%GPLPV_VERSION%%MSIBUILD%.msi
    1.19 +
    1.20  "%WIX%\bin\candle" installer.wxs -ext "%WIX%\bin\WixUIExtension.dll" -ext "%WIX%\bin\WixDifxAppExtension.dll" -ext "%WIX%\bin\WixIIsExtension.dll"
    1.21 -"%WIX%\bin\light.exe" -o gplpv_%BUILD_ALT_DIR%_%GPLPV_VERSION%.msi installer.wixobj "%DIFXLIB%" -ext "%WIX%\bin\WixUIExtension.dll" -ext "%WIX%\bin\WixDifxAppExtension.dll" -ext "%WIX%\bin\WixIIsExtension.dll"
    1.22 +"%WIX%\bin\light.exe" -o %MSINAME% installer.wixobj "%DIFXLIB%" -ext "%WIX%\bin\WixUIExtension.dll" -ext "%WIX%\bin\WixDifxAppExtension.dll" -ext "%WIX%\bin\WixIIsExtension.dll"
     2.1 --- a/xennet/xennet.c	Thu Oct 29 23:43:19 2009 +1100
     2.2 +++ b/xennet/xennet.c	Sun Nov 08 10:05:10 2009 +1100
     2.3 @@ -661,6 +661,7 @@ XenNet_Init(
     2.4  
     2.5    if (xi->config_sg)
     2.6    {
     2.7 +    KdPrint((__DRIVER_NAME "     SG Enabled\n"));
     2.8      status = NdisMInitializeScatterGatherDma(xi->adapter_handle, TRUE, xi->config_gso);
     2.9      if (!NT_SUCCESS(status))
    2.10      {
    2.11 @@ -670,6 +671,7 @@ XenNet_Init(
    2.12    }
    2.13    else
    2.14    {
    2.15 +    KdPrint((__DRIVER_NAME "     SG Disabled\n"));
    2.16      status = NdisMAllocateMapRegisters(xi->adapter_handle, 0, NDIS_DMA_64BITS, 64, PAGE_SIZE);
    2.17      if (status != NDIS_STATUS_SUCCESS)
    2.18      {
     3.1 --- a/xennet/xennet.h	Thu Oct 29 23:43:19 2009 +1100
     3.2 +++ b/xennet/xennet.h	Sun Nov 08 10:05:10 2009 +1100
     3.3 @@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fi
     3.4  #define NDIS50_MINIPORT 1
     3.5  #include <ndis.h>
     3.6  #include "../mingw/mingw_extras.h"
     3.7 -
     3.8  #else
     3.9  #define DDKAPI
    3.10  #include <ntddk.h>
    3.11 @@ -42,9 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fi
    3.12  #include <ntstrsafe.h>
    3.13  #endif
    3.14  
    3.15 -
    3.16  #define VENDOR_DRIVER_VERSION_MAJOR 0
    3.17 -#define VENDOR_DRIVER_VERSION_MINOR 9
    3.18 +#define VENDOR_DRIVER_VERSION_MINOR 10
    3.19  
    3.20  #define VENDOR_DRIVER_VERSION (((VENDOR_DRIVER_VERSION_MAJOR) << 16) | (VENDOR_DRIVER_VERSION_MINOR))
    3.21