From 91eb7c34c77a51b67abd9e360cb53adf4c749a93 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 19 May 2013 16:43:27 +0200 Subject: [PATCH] Update Windows RNDIS driver template. --- .../ClassDriver/RNDISEthernet/LUFA RNDIS.inf | 88 ++++++++++--------- .../LowLevel/RNDISEthernet/LUFA RNDIS.inf | 88 ++++++++++--------- Projects/Webserver/LUFA Webserver RNDIS.inf | 88 ++++++++++--------- 3 files changed, 138 insertions(+), 126 deletions(-) diff --git a/Demos/Device/ClassDriver/RNDISEthernet/LUFA RNDIS.inf b/Demos/Device/ClassDriver/RNDISEthernet/LUFA RNDIS.inf index 47dbf236de..af94620712 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/LUFA RNDIS.inf +++ b/Demos/Device/ClassDriver/RNDISEthernet/LUFA RNDIS.inf @@ -2,51 +2,55 @@ ; Copyright (c) 2000 Microsoft Corporation [Version] -Signature = "$Windows NT$" -Class = Net -ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} -Provider = %COMPANY% -DriverVer = 06/21/2006,6.0.6000.16384 -;CatalogFile = device.cat +Signature="$Windows NT$" +Class=Net +ClassGUID={4d36e972-e325-11ce-bfc1-08002be10318} +Provider=%MFGNAME% +DriverVer=7/1/2012,10.0.0.0 [Manufacturer] -%COMPANY% = RndisDevices,NTx86,NTamd64,NTia64 +%MFGNAME%=DeviceList, NTx86, NTamd64, NTia64 -; Decoration for x86 architecture -[RndisDevices.NTx86] -%RNDISDEV% = RNDIS.NT.5.1, USB\VID_03EB&PID_204C - -; Decoration for x64 architecture -[RndisDevices.NTamd64] -%RNDISDEV% = RNDIS.NT.5.1, USB\VID_03EB&PID_204C - -; Decoration for ia64 architecture -[RndisDevices.NTia64] -%RNDISDEV% = RNDIS.NT.5.1, USB\VID_03EB&PID_204C - -;@@@ This is the common setting for setup [ControlFlags] ExcludeFromSelect=* -; DDInstall section -; References the in-build Netrndis.inf -[RNDIS.NT.5.1] -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 -; NEVER REMOVE THE FOLLOWING REFERENCE FOR NETRNDIS.INF -include = netrndis.inf -needs = Usb_Rndis.ndi -AddReg = Rndis_AddReg_Vista - -; DDInstal.Services section -[RNDIS.NT.5.1.Services] -include = netrndis.inf -needs = Usb_Rndis.ndi.Services - -; No sys copyfiles - the sys files are already in-build -; (part of the operating system). - -; Modify these strings for your device as needed. -[Strings] -COMPANY="LUFA Library" -RNDISDEV="LUFA USB RNDIS Demo" \ No newline at end of file +[DriverInstall] +Characteristics=0x84 ; NCF_PHYSICAL + NCF_HAS_UI +BusType=15 +include=netrndis.inf +needs=Usb_Rndis.ndi +AddReg=Rndis_AddReg_Vista + +[DriverInstall.Services] +include=netrndis.inf +needs=Usb_Rndis.ndi.Services + +;------------------------------------------------------------------------------ +; Vendor and Product ID Definitions +;------------------------------------------------------------------------------ +; When developing your USB device, the VID and PID used in the PC side +; application program and the firmware on the microcontroller must match. +; Modify the below line to use your VID and PID. Use the format as shown below. +; Note: One INF file can be used for multiple devices with different VID and PIDs. +; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line. +;------------------------------------------------------------------------------ +[DeviceList] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C + +[DeviceList.NTx86] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C + +[DeviceList.NTamd64] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C + +[DeviceList.NTia64] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C + +;------------------------------------------------------------------------------ +; String Definitions +;------------------------------------------------------------------------------ +;Modify these strings to customize your device +;------------------------------------------------------------------------------ +[Strings] +MFGNAME="http://www.lufa-lib.org" +DESCRIPTION="LUFA USB RNDIS Demo" diff --git a/Demos/Device/LowLevel/RNDISEthernet/LUFA RNDIS.inf b/Demos/Device/LowLevel/RNDISEthernet/LUFA RNDIS.inf index 47dbf236de..af94620712 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/LUFA RNDIS.inf +++ b/Demos/Device/LowLevel/RNDISEthernet/LUFA RNDIS.inf @@ -2,51 +2,55 @@ ; Copyright (c) 2000 Microsoft Corporation [Version] -Signature = "$Windows NT$" -Class = Net -ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} -Provider = %COMPANY% -DriverVer = 06/21/2006,6.0.6000.16384 -;CatalogFile = device.cat +Signature="$Windows NT$" +Class=Net +ClassGUID={4d36e972-e325-11ce-bfc1-08002be10318} +Provider=%MFGNAME% +DriverVer=7/1/2012,10.0.0.0 [Manufacturer] -%COMPANY% = RndisDevices,NTx86,NTamd64,NTia64 +%MFGNAME%=DeviceList, NTx86, NTamd64, NTia64 -; Decoration for x86 architecture -[RndisDevices.NTx86] -%RNDISDEV% = RNDIS.NT.5.1, USB\VID_03EB&PID_204C - -; Decoration for x64 architecture -[RndisDevices.NTamd64] -%RNDISDEV% = RNDIS.NT.5.1, USB\VID_03EB&PID_204C - -; Decoration for ia64 architecture -[RndisDevices.NTia64] -%RNDISDEV% = RNDIS.NT.5.1, USB\VID_03EB&PID_204C - -;@@@ This is the common setting for setup [ControlFlags] ExcludeFromSelect=* -; DDInstall section -; References the in-build Netrndis.inf -[RNDIS.NT.5.1] -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 -; NEVER REMOVE THE FOLLOWING REFERENCE FOR NETRNDIS.INF -include = netrndis.inf -needs = Usb_Rndis.ndi -AddReg = Rndis_AddReg_Vista - -; DDInstal.Services section -[RNDIS.NT.5.1.Services] -include = netrndis.inf -needs = Usb_Rndis.ndi.Services - -; No sys copyfiles - the sys files are already in-build -; (part of the operating system). - -; Modify these strings for your device as needed. -[Strings] -COMPANY="LUFA Library" -RNDISDEV="LUFA USB RNDIS Demo" \ No newline at end of file +[DriverInstall] +Characteristics=0x84 ; NCF_PHYSICAL + NCF_HAS_UI +BusType=15 +include=netrndis.inf +needs=Usb_Rndis.ndi +AddReg=Rndis_AddReg_Vista + +[DriverInstall.Services] +include=netrndis.inf +needs=Usb_Rndis.ndi.Services + +;------------------------------------------------------------------------------ +; Vendor and Product ID Definitions +;------------------------------------------------------------------------------ +; When developing your USB device, the VID and PID used in the PC side +; application program and the firmware on the microcontroller must match. +; Modify the below line to use your VID and PID. Use the format as shown below. +; Note: One INF file can be used for multiple devices with different VID and PIDs. +; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line. +;------------------------------------------------------------------------------ +[DeviceList] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C + +[DeviceList.NTx86] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C + +[DeviceList.NTamd64] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C + +[DeviceList.NTia64] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C + +;------------------------------------------------------------------------------ +; String Definitions +;------------------------------------------------------------------------------ +;Modify these strings to customize your device +;------------------------------------------------------------------------------ +[Strings] +MFGNAME="http://www.lufa-lib.org" +DESCRIPTION="LUFA USB RNDIS Demo" diff --git a/Projects/Webserver/LUFA Webserver RNDIS.inf b/Projects/Webserver/LUFA Webserver RNDIS.inf index 5087ba31da..72d16885e9 100644 --- a/Projects/Webserver/LUFA Webserver RNDIS.inf +++ b/Projects/Webserver/LUFA Webserver RNDIS.inf @@ -2,51 +2,55 @@ ; Copyright (c) 2000 Microsoft Corporation [Version] -Signature = "$Windows NT$" -Class = Net -ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} -Provider = %COMPANY% -DriverVer = 06/21/2006,6.0.6000.16384 -;CatalogFile = device.cat +Signature="$Windows NT$" +Class=Net +ClassGUID={4d36e972-e325-11ce-bfc1-08002be10318} +Provider=%MFGNAME% +DriverVer=7/1/2012,10.0.0.0 [Manufacturer] -%COMPANY% = RndisDevices,NTx86,NTamd64,NTia64 +%MFGNAME%=DeviceList, NTx86, NTamd64, NTia64 -; Decoration for x86 architecture -[RndisDevices.NTx86] -%RNDISDEV% = RNDIS.NT.5.1, USB\VID_03EB&PID_2069&MI_00 - -; Decoration for x64 architecture -[RndisDevices.NTamd64] -%RNDISDEV% = RNDIS.NT.5.1, USB\VID_03EB&PID_2069&MI_00 - -; Decoration for ia64 architecture -[RndisDevices.NTia64] -%RNDISDEV% = RNDIS.NT.5.1, USB\VID_03EB&PID_2069&MI_00 - -;@@@ This is the common setting for setup [ControlFlags] ExcludeFromSelect=* -; DDInstall section -; References the in-build Netrndis.inf -[RNDIS.NT.5.1] -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 -; NEVER REMOVE THE FOLLOWING REFERENCE FOR NETRNDIS.INF -include = netrndis.inf -needs = Usb_Rndis.ndi -AddReg = Rndis_AddReg_Vista - -; DDInstal.Services section -[RNDIS.NT.5.1.Services] -include = netrndis.inf -needs = Usb_Rndis.ndi.Services - -; No sys copyfiles - the sys files are already in-build -; (part of the operating system). - -; Modify these strings for your device as needed. -[Strings] -COMPANY="LUFA Library" -RNDISDEV="LUFA USB RNDIS Webserver" \ No newline at end of file +[DriverInstall] +Characteristics=0x84 ; NCF_PHYSICAL + NCF_HAS_UI +BusType=15 +include=netrndis.inf +needs=Usb_Rndis.ndi +AddReg=Rndis_AddReg_Vista + +[DriverInstall.Services] +include=netrndis.inf +needs=Usb_Rndis.ndi.Services + +;------------------------------------------------------------------------------ +; Vendor and Product ID Definitions +;------------------------------------------------------------------------------ +; When developing your USB device, the VID and PID used in the PC side +; application program and the firmware on the microcontroller must match. +; Modify the below line to use your VID and PID. Use the format as shown below. +; Note: One INF file can be used for multiple devices with different VID and PIDs. +; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line. +;------------------------------------------------------------------------------ +[DeviceList] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_2069 + +[DeviceList.NTx86] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_2069 + +[DeviceList.NTamd64] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_2069 + +[DeviceList.NTia64] +%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_2069 + +;------------------------------------------------------------------------------ +; String Definitions +;------------------------------------------------------------------------------ +;Modify these strings to customize your device +;------------------------------------------------------------------------------ +[Strings] +MFGNAME="http://www.lufa-lib.org" +DESCRIPTION="LUFA USB RNDIS Demo"