From 4a42f9d5c20dcaf5fd7591ccf9e32c6130d9d538 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 28 Nov 2010 00:22:14 -0800
Subject: [PATCH] windows: Add compatibility IDs to telemetrum.inf

This will allow the .nsi file to reference just the compatibility ID
instead of needing to have all of the USB IDs listed.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 telemetrum.inf | 65 +++++++++++++++++++++-----------------------------
 1 file changed, 27 insertions(+), 38 deletions(-)

diff --git a/telemetrum.inf b/telemetrum.inf
index f7a729b8..b4a84b97 100755
--- a/telemetrum.inf
+++ b/telemetrum.inf
@@ -5,68 +5,48 @@
 Signature	= "$Windows NT$"
 Class   	= Modem
 ClassGUID	= {4D36E96D-E325-11CE-BFC1-08002BE10318}
-LayoutFile	= layout.inf
 Provider	= %Mfg%
 DriverVer	= 08/05/2010,7.1.1.0
+PnpLockDown	= 0
+DriverPackageDisplayName = %DriverName%
 
 [DestinationDirs]
 FakeModemCopyFileSection = 12
 DefaultDestDir	= 12
 
 [ControlFlags]
-ExcludeFromSelect = *
 
 [Manufacturer]
 %Mfg% = Models, NTx86, NTamd64, NTia64
 
 [Models]
-%AltusMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000A
-%TeleMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000B
-%TeleDongle%	= AltusMetrum.Install, USB\VID_FFFE&PID_000C
-%TeleTerra%	= AltusMetrum.Install, USB\VID_FFFE&PID_000D
+%AltusMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000A, AltusMetrumSerial
+%TeleMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000B, AltusMetrumSerial
+%TeleDongle%	= AltusMetrum.Install, USB\VID_FFFE&PID_000C, AltusMetrumSerial
+%TeleTerra%	= AltusMetrum.Install, USB\VID_FFFE&PID_000D, AltusMetrumSerial
 
 [Models.NTx86]
-%AltusMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000A
-%TeleMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000B
-%TeleDongle%	= AltusMetrum.Install, USB\VID_FFFE&PID_000C
-%TeleTerra%	= AltusMetrum.Install, USB\VID_FFFE&PID_000D
+%AltusMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000A, AltusMetrumSerial
+%TeleMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000B, AltusMetrumSerial
+%TeleDongle%	= AltusMetrum.Install, USB\VID_FFFE&PID_000C, AltusMetrumSerial
+%TeleTerra%	= AltusMetrum.Install, USB\VID_FFFE&PID_000D, AltusMetrumSerial
 
 [Models.NTamd64]
-%AltusMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000A
-%TeleMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000B
-%TeleDongle%	= AltusMetrum.Install, USB\VID_FFFE&PID_000C
-%TeleTerra%	= AltusMetrum.Install, USB\VID_FFFE&PID_000D
+%AltusMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000A, AltusMetrumSerial
+%TeleMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000B, AltusMetrumSerial
+%TeleDongle%	= AltusMetrum.Install, USB\VID_FFFE&PID_000C, AltusMetrumSerial
+%TeleTerra%	= AltusMetrum.Install, USB\VID_FFFE&PID_000D, AltusMetrumSerial
 
 [Models.NTia64]
-%AltusMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000A
-%TeleMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000B
-%TeleDongle%	= AltusMetrum.Install, USB\VID_FFFE&PID_000C
-%TeleTerra%	= AltusMetrum.Install, USB\VID_FFFE&PID_000D
-
-[Strings]
-Mfg		= "altusmetrum.org"
-AltusMetrum	= "AltusMetrum"
-TeleMetrum	= "TeleMetrum"
-TeleDongle	= "TeleDongle"
-TeleTerra	= "TeleTerra"
+%AltusMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000A, AltusMetrumSerial
+%TeleMetrum%	= AltusMetrum.Install, USB\VID_FFFE&PID_000B, AltusMetrumSerial
+%TeleDongle%	= AltusMetrum.Install, USB\VID_FFFE&PID_000C, AltusMetrumSerial
+%TeleTerra%	= AltusMetrum.Install, USB\VID_FFFE&PID_000D, AltusMetrumSerial
 
 ;----------------------------------------------------------------------------
 ; Installation sections
 ;----------------------------------------------------------------------------
 
-[AltusMetrum.Install]
-include		= mdmcpq.inf
-CopyFiles	= FakeModemCopyFileSection
-AddReg		= All.AddReg, Modem.AddReg, Uninstall.AddReg
-
-[AltusMetrum.Install.Services]
-include		= mdmcpq.inf
-AddService	= usbser, 0x00000000, LowerFilter_Service_Inst
-
-[AltusMetrum.Install.HW]
-include		= mdmcpq.inf
-AddReg		= LowerFilterAddReg
-
 [AltusMetrum.Install.NT]
 include		= mdmcpq.inf
 CopyFiles	= FakeModemCopyFileSection
@@ -97,3 +77,12 @@ HKR,, Properties, 1, C0,01,00,00, 00,00,00,00, FF,00,00,00, 07,00,00,00, 0F,00,0
 
 [Uninstall.AddReg]
 HKLM,Software\Microsoft\Windows\CurrentVersion\Uninstall\%TeleMetrum%,DisplayName,,"%TeleMetrum%"
+
+[Strings]
+Mfg		= "altusmetrum.org"
+AltusMetrum	= "AltusMetrum"
+TeleMetrum	= "TeleMetrum"
+TeleDongle	= "TeleDongle"
+TeleTerra	= "TeleTerra"
+DriverName	= "Altus Metrum Device Driver"
+
-- 
2.30.2