1.1 --- a/xennet/xennet.inx	Tue May 10 19:50:46 2011 +1000
     1.2 +++ b/xennet/xennet.inx	Sat May 14 15:14:52 2011 +1000
     1.3 @@ -12,19 +12,29 @@ DefaultDestDir = 12
     1.4  ExcludeFromSelect=*
     1.5  
     1.6  [Manufacturer]
     1.7 -%XenGplPv%=XenGplPv,NT$ARCH$
     1.8 +%XenGplPv%=XenGplPv,NT$ARCH$,NT$ARCH$.6.0
     1.9  
    1.10  [XenGplPv.NT$ARCH$]
    1.11 -%XenNet.DRVDESC%=XenNet_Inst, XEN\VIF
    1.12 +%XenNet.DRVDESC%=XenNet_Inst_NDIS5, XEN\VIF
    1.13 +
    1.14 +[XenGplPv.NT$ARCH$.6.0]
    1.15 +%XenNet.DRVDESC%=XenNet_Inst_NDIS6, XEN\VIF
    1.16  
    1.17  [XenGplPv]
    1.18 -%XenNet.DRVDESC%=XenNet_Inst, XEN\VIF
    1.19 +%XenNet.DRVDESC%=XenNet_Inst_NDIS5, XEN\VIF
    1.20  
    1.21 -[XenNet_Inst.NT]
    1.22 +[XenNet_Inst_NDIS5]
    1.23  CopyFiles=XenNet.CopyFiles
    1.24 -Characteristics = 0x1 ; NCF_VIRTUAL
    1.25 -AddReg = XenNet_Reg, XenNet_Params
    1.26 -BusType            = 15 ; PNPBus
    1.27 +Characteristics = 0x81 ; NCF_VIRTUAL | NCF_HAS_UI
    1.28 +AddReg = XenNet_Reg, XenNet_Params_Common, XenNet_Params_NDIS5
    1.29 +*IfType            = 6  ; Ethernet
    1.30 +*MediaType         = 0	; NdisMedium802_3
    1.31 +*PhysicalMediaType = 19	; NdisPhysicalMedium802_3 
    1.32 +
    1.33 +[XenNet_Inst_NDIS6]
    1.34 +CopyFiles=XenNet.CopyFiles
    1.35 +Characteristics = 0x81 ; NCF_VIRTUAL | NCF_HAS_UI
    1.36 +AddReg = XenNet_Reg, XenNet_Params_Common, XenNet_Params_NDIS6
    1.37  *IfType            = 6  ; Ethernet
    1.38  *MediaType         = 0	; NdisMedium802_3
    1.39  *PhysicalMediaType = 19	; NdisPhysicalMedium802_3 
    1.40 @@ -34,7 +44,7 @@ HKR, Ndi, Service, 0, "XenNet"
    1.41  HKR, Ndi\Interfaces, UpperRange, 0, "ndis5"
    1.42  HKR, Ndi\Interfaces, LowerRange, 0, "ethernet"
    1.43  
    1.44 -[XenNet_Params]
    1.45 +[XenNet_Params_Common]
    1.46  HKR, Ndi\Params\MTU, ParamDesc, , "MTU"
    1.47  HKR, Ndi\Params\MTU, default, , "1500"
    1.48  HKR, Ndi\Params\MTU, type, , "dword"
    1.49 @@ -49,24 +59,6 @@ HKR, Ndi\Params\ChecksumOffload, type, ,
    1.50  HKR, Ndi\Params\ChecksumOffload\enum, 0, , "Disabled"
    1.51  HKR, Ndi\Params\ChecksumOffload\enum, 1, , "Enabled"
    1.52  
    1.53 -HKR, Ndi\Params\ChecksumOffloadRxCheck, ParamDesc, , "Check checksum on RX packets"
    1.54 -HKR, Ndi\Params\ChecksumOffloadRxCheck, default, , "1"
    1.55 -HKR, Ndi\Params\ChecksumOffloadRxCheck, type, , "enum"
    1.56 -HKR, Ndi\Params\ChecksumOffloadRxCheck\enum, 0, , "Disabled"
    1.57 -HKR, Ndi\Params\ChecksumOffloadRxCheck\enum, 1, , "Enabled"
    1.58 -
    1.59 -HKR, Ndi\Params\ChecksumOffloadDontFix, ParamDesc, , "Dont fix the blank checksum on offloaded RX packets"
    1.60 -HKR, Ndi\Params\ChecksumOffloadDontFix, default, , "0"
    1.61 -HKR, Ndi\Params\ChecksumOffloadDontFix, type, , "enum"
    1.62 -HKR, Ndi\Params\ChecksumOffloadDontFix\enum, 0, , "Disabled"
    1.63 -HKR, Ndi\Params\ChecksumOffloadDontFix\enum, 1, , "Enabled"
    1.64 -
    1.65 -HKR, Ndi\Params\LargeSendOffloadRxSplitMTU, ParamDesc, , "Allow received packets larger than MTU"
    1.66 -HKR, Ndi\Params\LargeSendOffloadRxSplitMTU, default, , "0"
    1.67 -HKR, Ndi\Params\LargeSendOffloadRxSplitMTU, type, , "enum"
    1.68 -HKR, Ndi\Params\LargeSendOffloadRxSplitMTU\enum, 0, , "Disabled"
    1.69 -HKR, Ndi\Params\LargeSendOffloadRxSplitMTU\enum, 1, , "Enabled"
    1.70 -
    1.71  HKR, Ndi\Params\LargeSendOffload, ParamDesc, , "Large Send Offload"
    1.72  HKR, Ndi\Params\LargeSendOffload, default, , "61440"
    1.73  HKR, Ndi\Params\LargeSendOffload, type, , "enum"
    1.74 @@ -82,12 +74,6 @@ HKR, Ndi\Params\ScatterGather, type, , "
    1.75  HKR, Ndi\Params\ScatterGather\enum, 0, , "Disabled"
    1.76  HKR, Ndi\Params\ScatterGather\enum, 1, , "Enabled"
    1.77  
    1.78 -HKR, Ndi\Params\RxInterruptModeration, ParamDesc, , "Rx Interrupt Moderation (beta)"
    1.79 -HKR, Ndi\Params\RxInterruptModeration, default, , "0"
    1.80 -HKR, Ndi\Params\RxInterruptModeration, type, , "enum"
    1.81 -HKR, Ndi\Params\RxInterruptModeration\enum, 0, , "Disabled"
    1.82 -HKR, Ndi\Params\RxInterruptModeration\enum, 1, , "Enabled"
    1.83 -
    1.84  HKR, Ndi\Params\NetworkAddress, ParamDesc, , "Locally Administered Address"
    1.85  HKR, Ndi\Params\NetworkAddress, Type, , "edit"
    1.86  HKR, Ndi\Params\NetworkAddress, LimitText, , "12"
    1.87 @@ -95,6 +81,33 @@ HKR, Ndi\Params\NetworkAddress, UpperCas
    1.88  HKR, Ndi\Params\NetworkAddress, Default, , ""
    1.89  HKR, Ndi\Params\NetworkAddress, Optional, , "1"
    1.90  
    1.91 +[XenNet_Params_NDIS5]
    1.92 +HKR, Ndi\Params\ChecksumOffloadRxCheck, ParamDesc, , "Check checksum on RX packets"
    1.93 +HKR, Ndi\Params\ChecksumOffloadRxCheck, default, , "1"
    1.94 +HKR, Ndi\Params\ChecksumOffloadRxCheck, type, , "enum"
    1.95 +HKR, Ndi\Params\ChecksumOffloadRxCheck\enum, 0, , "Disabled"
    1.96 +HKR, Ndi\Params\ChecksumOffloadRxCheck\enum, 1, , "Enabled"
    1.97 +
    1.98 +HKR, Ndi\Params\ChecksumOffloadDontFix, ParamDesc, , "Dont fix the blank checksum on offloaded RX packets"
    1.99 +HKR, Ndi\Params\ChecksumOffloadDontFix, default, , "0"
   1.100 +HKR, Ndi\Params\ChecksumOffloadDontFix, type, , "enum"
   1.101 +HKR, Ndi\Params\ChecksumOffloadDontFix\enum, 0, , "Disabled"
   1.102 +HKR, Ndi\Params\ChecksumOffloadDontFix\enum, 1, , "Enabled"
   1.103 +
   1.104 +[XenNet_Params_NDIS6]
   1.105 +HKR, Ndi\Params\LargeSendOffloadRxSplitMTU, ParamDesc, , "Allow received packets larger than MTU"
   1.106 +HKR, Ndi\Params\LargeSendOffloadRxSplitMTU, default, , "1"
   1.107 +HKR, Ndi\Params\LargeSendOffloadRxSplitMTU, type, , "enum"
   1.108 +HKR, Ndi\Params\LargeSendOffloadRxSplitMTU\enum, 0, , "Disabled (Limit to MSS)"
   1.109 +HKR, Ndi\Params\LargeSendOffloadRxSplitMTU\enum, 1, , "Half (Split packet in half)"
   1.110 +HKR, Ndi\Params\LargeSendOffloadRxSplitMTU\enum, 2, , "Enabled (Full packet)"
   1.111 +
   1.112 +;HKR, Ndi\Params\RxInterruptModeration, ParamDesc, , "Rx Interrupt Moderation (beta)"
   1.113 +;HKR, Ndi\Params\RxInterruptModeration, default, , "0"
   1.114 +;HKR, Ndi\Params\RxInterruptModeration, type, , "enum"
   1.115 +;HKR, Ndi\Params\RxInterruptModeration\enum, 0, , "Disabled"
   1.116 +;HKR, Ndi\Params\RxInterruptModeration\enum, 1, , "Enabled"
   1.117 +
   1.118  [XenNet.CopyFiles]
   1.119  xennet.sys,,0x00001000 ; COPYFLG_REPLACE_BOOT_FILE
   1.120  
   1.121 @@ -104,10 +117,10 @@ xennet.sys=1
   1.122  [SourceDisksNames]
   1.123  1 = %DISK_NAME%
   1.124  
   1.125 -[XenNet_Inst.Services]
   1.126 +[XenNet_Inst_NDIS5.Services]
   1.127  AddService=XenNet,2,XenNet_Service 
   1.128  
   1.129 -[XenNet_Inst.NT.Services]
   1.130 +[XenNet_Inst_NDIS6.Services]
   1.131  AddService=XenNet,2,XenNet_Service 
   1.132  
   1.133  [XenNet_Service]