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 7cf51212175fe32b09e981daebbbdcdeb9844362..0e9859675a54146477525f74af29e8539294995a 100644 (file)
--- 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 0d1a553430fca2946285c54cd18b94519c0ac85b..54f8f020a473c52eac80c0705c39133d64fa3f66 100755 (executable)
--- a/telemetrum.inf
+++ b/telemetrum.inf
@@ -11,6 +11,12 @@ DriverVer    = 08/05/2010,7.1.0.0
 [Manufacturer]\r
 %Mfg% = Models, NTx86, NTamd64, NTia64\r
 \r
+[Models]\r
+%AltusMetrum% = TELEMETRUM, USB\VID_FFFE&PID_000A\r
+%TeleMetrum% = TELEMETRUM, USB\VID_FFFE&PID_000B\r
+%TeleDongle% = TELEMETRUM, USB\VID_FFFE&PID_000C\r
+%TeleTerra% = TELEMETRUM, USB\VID_FFFE&PID_000D\r
+\r
 [Models.NTx86]\r
 %AltusMetrum% = TELEMETRUM, USB\VID_FFFE&PID_000A\r
 %TeleMetrum% = TELEMETRUM, USB\VID_FFFE&PID_000B\r
@@ -33,10 +39,7 @@ DriverVer    = 08/05/2010,7.1.0.0
 DefaultDestDir=12\r
 \r
 [ControlFlags]\r
-ExcludeFromSelect=USB\VID_FFFE&PID_000A\r
-ExcludeFromSelect=USB\VID_FFFE&PID_000B\r
-ExcludeFromSelect=USB\VID_FFFE&PID_000C\r
-ExcludeFromSelect=USB\VID_FFFE&PID_000D\r
+ExcludeFromSelect=*\r
 \r
 [Strings]\r
 Mfg = "altusmetrum.org"\r
@@ -45,32 +48,29 @@ TeleMetrum = "TeleMetrum"
 TeleDongle = "TeleDongle"\r
 TeleTerra = "TeleTerra"\r
 \r
-\r
 ;----------------------------------------------------------------------------\r
 ; Installation sections\r
 ;----------------------------------------------------------------------------\r
 \r
-[TELEMETRUM.NT]\r
+[TELEMETRUM]\r
 include=mdmcpq.inf\r
 CopyFiles=FakeModemCopyFileSection\r
 AddReg = All, mfglt, Modem.AddReg, VerboseResultCodes, Uninstall.AddReg\r
 \r
-[TELEMETRUM.NT.HW]\r
+[TELEMETRUM.HW]\r
 Include=mdmcpq.inf\r
 AddReg=LowerFilterAddReg\r
 \r
-[TELEMETRUM.NT.Services]\r
+[TELEMETRUM.Services]\r
 Include=mdmcpq.inf\r
 AddService=usbser, 0x00000000, LowerFilter_Service_Inst\r
 \r
-\r
 ;----------------------------------------------------------------------------\r
 ; AddReg sections\r
 ;----------------------------------------------------------------------------\r
 [Modem.AddReg]\r
 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\r
 \r
-\r
 ;----------------------------------------------------------------------------\r
 ; Common Registry Sections\r
 ;\r