From: Keith Packard <keithp@keithp.com>
Date: Sun, 28 Nov 2010 06:35:18 +0000 (-0800)
Subject: windows: try harder to get windows install to work
X-Git-Tag: 0.8~7
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=641c5373724d34c3adfcf42420a528d6bba736b9

windows: try harder to get windows install to work

Add devIDs to .nsi file. Fix install section name mapping from the
hot-plug info.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/altos-windows.nsi b/altosui/altos-windows.nsi
index 7cf51212..0e985967 100644
--- a/altosui/altos-windows.nsi
+++ b/altosui/altos-windows.nsi
@@ -31,15 +31,34 @@ UninstPage instfiles
 ; And the stuff to install
 
 Section "Install Driver" InstDriver
+
 	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000A
+	Pop $0
+	DetailPrint "InitDriverSetup: $0"
+	InstDrv::DeleteOemInfFiles /NOUNLOAD
+	InstDrv::CreateDevice /NOUNLOAD
+
 	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000B
+	Pop $0
+	DetailPrint "InitDriverSetup: $0"
+	InstDrv::DeleteOemInfFiles /NOUNLOAD
+	InstDrv::CreateDevice /NOUNLOAD
+
 	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000C
-	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000D
 	Pop $0
 	DetailPrint "InitDriverSetup: $0"
+	InstDrv::DeleteOemInfFiles /NOUNLOAD
+	InstDrv::CreateDevice /NOUNLOAD
 
+	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} USB\VID_FFFE&PID_000D
+	Pop $0
+	DetailPrint "InitDriverSetup: $0"
 	InstDrv::DeleteOemInfFiles /NOUNLOAD
 	InstDrv::CreateDevice /NOUNLOAD
+
+	SetOutPath $WINDIR\Inf
+	File "../telemetrum.inf"
+
 	SetOutPath $TEMP
 	File "../telemetrum.inf"
 	InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf"
diff --git a/telemetrum.inf b/telemetrum.inf
index 0d1a5534..54f8f020 100755
--- a/telemetrum.inf
+++ b/telemetrum.inf
@@ -11,6 +11,12 @@ DriverVer	= 08/05/2010,7.1.0.0
 [Manufacturer]
 %Mfg% = Models, NTx86, NTamd64, NTia64
 
+[Models]
+%AltusMetrum% = TELEMETRUM, USB\VID_FFFE&PID_000A
+%TeleMetrum% = TELEMETRUM, USB\VID_FFFE&PID_000B
+%TeleDongle% = TELEMETRUM, USB\VID_FFFE&PID_000C
+%TeleTerra% = TELEMETRUM, USB\VID_FFFE&PID_000D
+
 [Models.NTx86]
 %AltusMetrum% = TELEMETRUM, USB\VID_FFFE&PID_000A
 %TeleMetrum% = TELEMETRUM, USB\VID_FFFE&PID_000B
@@ -33,10 +39,7 @@ DriverVer	= 08/05/2010,7.1.0.0
 DefaultDestDir=12
 
 [ControlFlags]
-ExcludeFromSelect=USB\VID_FFFE&PID_000A
-ExcludeFromSelect=USB\VID_FFFE&PID_000B
-ExcludeFromSelect=USB\VID_FFFE&PID_000C
-ExcludeFromSelect=USB\VID_FFFE&PID_000D
+ExcludeFromSelect=*
 
 [Strings]
 Mfg = "altusmetrum.org"
@@ -45,32 +48,29 @@ TeleMetrum = "TeleMetrum"
 TeleDongle = "TeleDongle"
 TeleTerra = "TeleTerra"
 
-
 ;----------------------------------------------------------------------------
 ; Installation sections
 ;----------------------------------------------------------------------------
 
-[TELEMETRUM.NT]
+[TELEMETRUM]
 include=mdmcpq.inf
 CopyFiles=FakeModemCopyFileSection
 AddReg = All, mfglt, Modem.AddReg, VerboseResultCodes, Uninstall.AddReg
 
-[TELEMETRUM.NT.HW]
+[TELEMETRUM.HW]
 Include=mdmcpq.inf
 AddReg=LowerFilterAddReg
 
-[TELEMETRUM.NT.Services]
+[TELEMETRUM.Services]
 Include=mdmcpq.inf
 AddService=usbser, 0x00000000, LowerFilter_Service_Inst
 
-
 ;----------------------------------------------------------------------------
 ; AddReg sections
 ;----------------------------------------------------------------------------
 [Modem.AddReg]
 HKR,, Properties, 1, C0,01,00,00, 00,00,00,00, FF,00,00,00, 07,00,00,00, 0F,00,00,00, F7,0F,00,00, 00,84,03,00, C0,DA,00,00
 
-
 ;----------------------------------------------------------------------------
 ; Common Registry Sections
 ;