[ofw] vnic rename

[Fab Tillier]

Yes, a single INF can support multiple devices.

-----Original Message-----
From: Alex Estrin [mailto:alex.estrin at qlogic.com]
Sent: Wednesday, February 13, 2008 3:44 PM
To: Fab Tillier; ofw at lists.openfabrics.org
Subject: RE: [ofw] vnic rename

I thought to keep it as is. It is possible to add another driver
sections to the same INF, isn't it?


> -----Original Message-----
> From: Fab Tillier [mailto:ftillier at windows.microsoft.com]
> Sent: Wednesday, February 13, 2008 5:44 PM
> To: Alex Estrin; ofw at lists.openfabrics.org
> Subject: RE: [ofw] vnic rename
>
> Are you going to rename the netvnic.inf file too?
>
> -----Original Message-----
> From: ofw-bounces at lists.openfabrics.org [mailto:ofw-
> bounces at lists.openfabrics.org] On Behalf Of Alex Estrin
> Sent: Wednesday, February 13, 2008 2:23 PM
> To: ofw at lists.openfabrics.org
> Subject: [ofw] vnic rename
>
> Finally, driver name is 'qlgcvnic.sys' and service name is 'qlgcvnic'.
> If no comments I'll push these changes. ULP directory rename will
follow.
>
> Thanks,
>
> Alex Estrin
>
>
>
> Index: ulp/qlc_vnic/kernel/netvnic.inf
> ===================================================================
> --- ulp/qlc_vnic/kernel/netvnic.inf     (revision 941)
> +++ ulp/qlc_vnic/kernel/netvnic.inf     (working copy)
> @@ -26,7 +26,7 @@
>  1=%DiskId%,,,""
>
>  [SourceDisksFiles]
> -qlc_vnic.sys=1
> +qlgcvnic.sys=1
>
>  [Manufacturer]
>  %Inf_Provider% = vnic.DeviceSection,ntx86,ntamd64,ntia64
> @@ -68,19 +68,19 @@
>  CopyFiles = vnic.CopyFiles
>
>  [vnic.DDInstall.ntx86.Services]
> -AddService =
> vnic,%SPSVCINST_ASSOCSERVICE%,vnic.ServiceInstall,vnic.EventLogInstall
> +AddService =
>
qlgcvnic,%SPSVCINST_ASSOCSERVICE%,vnic.ServiceInstall,vnic.EventLogInsta
> ll
>
>  [vnic.DDInstall.ntamd64.Services]
> -AddService =
> vnic,%SPSVCINST_ASSOCSERVICE%,vnic.ServiceInstall,vnic.EventLogInstall
> +AddService =
>
qlgcvnic,%SPSVCINST_ASSOCSERVICE%,vnic.ServiceInstall,vnic.EventLogInsta
> ll
>
>  [vnic.DDInstall.ntia64.Services]
> -AddService =
> vnic,%SPSVCINST_ASSOCSERVICE%,vnic.ServiceInstall,vnic.EventLogInstall
> +AddService =
>
qlgcvnic,%SPSVCINST_ASSOCSERVICE%,vnic.ServiceInstall,vnic.EventLogInsta
> ll
>
>  [vnic.CopyFiles]
> -qlc_vnic.sys,,,2
> +qlgcvnic.sys,,,2
>
>  [vnic.AddReg]
> -HKR, Ndi,                       Service,    0, "vnic"
> +HKR, Ndi,                       Service,    0, "qlgcvnic"
>  HKR, Ndi\Interfaces,            UpperRange, 0, "ndis5"
>  HKR, Ndi\Interfaces,            LowerRange, 0, "ethernet"
>
> @@ -156,7 +156,7 @@
>  ServiceType     = %SERVICE_KERNEL_DRIVER%
>  StartType       = %SERVICE_DEMAND_START%
>  ErrorControl    = %SERVICE_ERROR_NORMAL%
> -ServiceBinary   = %12%\qlc_vnic.sys
> +ServiceBinary   = %12%\qlgcvnic.sys
>  LoadOrderGroup  = NDIS
>  AddReg          = vnic.ParamsReg
>
> Index: ulp/qlc_vnic/kernel/SOURCES
> ===================================================================
> --- ulp/qlc_vnic/kernel/SOURCES (revision 941)
> +++ ulp/qlc_vnic/kernel/SOURCES (working copy)
> @@ -7,7 +7,7 @@
>
>  # The TARGETNAME.  This is name of the item being built (without the
#
> extension.
> -TARGETNAME=qlc_vnic
> +TARGETNAME=qlgcvnic
>
>
>
########################################################################
>  # The path where all binaries are built.
> Index: ulp/qlc_vnic/kernel/inic.rc
> ===================================================================
> --- ulp/qlc_vnic/kernel/inic.rc (revision 941)
> +++ ulp/qlc_vnic/kernel/inic.rc (working copy)
> @@ -36,12 +36,12 @@
>  #define VER_FILESUBTYPE
VFT2_DRV_NETWORK
>
>  #ifdef _DEBUG_
> -#define VER_FILEDESCRIPTION_STR                "Virtual Nic NDIS
> Miniport (Debug)"
> +#define VER_FILEDESCRIPTION_STR                "QLogic VNIC NDIS
> Miniport (Debug)"
>  #else
> -#define VER_FILEDESCRIPTION_STR                "Virtual Nic NDIS
> Miniport"
> +#define VER_FILEDESCRIPTION_STR                "QLogic VNIC NDIS
> Miniport"
>  #endif
>
> -#define VER_INTERNALNAME_STR           "qlc_vnic.sys"
> -#define VER_ORIGINALFILENAME_STR       "qlc_vnic.sys"
> +#define VER_INTERNALNAME_STR           "qlgcvnic.sys"