summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason <[email protected]>2023-01-03 13:07:39 -0800
committerGitHub <[email protected]>2023-01-03 13:07:39 -0800
commit7092f6df0e6e86f16dc4e7a11ea8eefbdb1c6da8 (patch)
tree623c6a81035fbea1054ee12bba12a0b31737daab
parented2dc1c4cd26fca2453916d9322b672eb82f0258 (diff)
Remove IA64 support from more samples (#816)
Co-authored-by: Jason Knichel <[email protected]>
-rw-r--r--general/toaster/toastpkg/inf/autorun.inf3
-rw-r--r--general/toaster/toastpkg/inf/toastpkg.inf11
-rw-r--r--general/toaster/toastpkg/toastcd/autorun.inf3
-rw-r--r--general/toaster/toastpkg/toastcd/toastpkg.inf11
-rw-r--r--storage/class/disk/src/diskdev.inf9
-rw-r--r--wia/microdrv/testmcro.inf11
6 files changed, 6 insertions, 42 deletions
diff --git a/general/toaster/toastpkg/inf/autorun.inf b/general/toaster/toastpkg/inf/autorun.inf
index 4c582d7b..ee67cf9a 100644
--- a/general/toaster/toastpkg/inf/autorun.inf
+++ b/general/toaster/toastpkg/inf/autorun.inf
@@ -5,9 +5,6 @@ icon=i386\toastva.exe,0
[AutoRun.i386]
open=i386\toastva.exe
-[AutoRun.ia64]
-open=ia64\toastva.exe
-
[AutoRun.amd64]
open=amd64\toastva.exe
diff --git a/general/toaster/toastpkg/inf/toastpkg.inf b/general/toaster/toastpkg/inf/toastpkg.inf
index 5068d751..f7e45bd9 100644
--- a/general/toaster/toastpkg/inf/toastpkg.inf
+++ b/general/toaster/toastpkg/inf/toastpkg.inf
@@ -16,7 +16,7 @@
; INF file for installing toaster device drivers (and, optionally, value-
; added software) via device-specific coinstaller.
; This is a mutlios INF file. Same INF file cab be used on
-; x86, ia64 and amd64 platforms.
+; x86 and amd64 platforms.
;
;--*/
[Version]
@@ -26,7 +26,6 @@ ClassGuid={B85B7C50-6A01-11d2-B841-00C04FAD5171}
Provider=%ProviderName%
DriverVer=09/21/2006,6.0.5736.1
CatalogFile.NTx86 = tostx86.cat
-CatalogFile.NTIA64 = tostia64.cat
CatalogFile.NTAMD64 = tstamd64.cat
PnpLockdown=1
@@ -49,14 +48,11 @@ HKR,,DeviceCharacteristics,0x10001,0x100 ; Use same security checks on re
;*****************************************
[Manufacturer]
-%ToastRUs%=ToastRUs,NTx86, NTia64, NTamd64
+%ToastRUs%=ToastRUs,NTx86, NTamd64
[ToastRUs.NTx86]
%ToasterDevice.DeviceDesc%=Toaster_Device, {b85b7c50-6a01-11d2-b841-00c04fad5171}\MsToaster
-[ToastRUs.NTia64]
-%ToasterDevice.DeviceDesc%=Toaster_Device, {b85b7c50-6a01-11d2-b841-00c04fad5171}\MsToaster
-
[ToastRUs.NTamd64]
%ToasterDevice.DeviceDesc%=Toaster_Device, {b85b7c50-6a01-11d2-b841-00c04fad5171}\MsToaster
@@ -106,9 +102,6 @@ OriginalInfSourcePath = %1%
[SourceDisksNames.x86]
1 = %DiskId1%, toastpkg.tag,,\i386
-[SourceDisksNames.ia64]
-1 = %DiskId1%, toastpkg.tag,,\ia64
-
[SourceDisksNames.amd64]
1 = %DiskId1%, toastpkg.tag,,\amd64
diff --git a/general/toaster/toastpkg/toastcd/autorun.inf b/general/toaster/toastpkg/toastcd/autorun.inf
index 4c582d7b..ee67cf9a 100644
--- a/general/toaster/toastpkg/toastcd/autorun.inf
+++ b/general/toaster/toastpkg/toastcd/autorun.inf
@@ -5,9 +5,6 @@ icon=i386\toastva.exe,0
[AutoRun.i386]
open=i386\toastva.exe
-[AutoRun.ia64]
-open=ia64\toastva.exe
-
[AutoRun.amd64]
open=amd64\toastva.exe
diff --git a/general/toaster/toastpkg/toastcd/toastpkg.inf b/general/toaster/toastpkg/toastcd/toastpkg.inf
index 5068d751..f7e45bd9 100644
--- a/general/toaster/toastpkg/toastcd/toastpkg.inf
+++ b/general/toaster/toastpkg/toastcd/toastpkg.inf
@@ -16,7 +16,7 @@
; INF file for installing toaster device drivers (and, optionally, value-
; added software) via device-specific coinstaller.
; This is a mutlios INF file. Same INF file cab be used on
-; x86, ia64 and amd64 platforms.
+; x86 and amd64 platforms.
;
;--*/
[Version]
@@ -26,7 +26,6 @@ ClassGuid={B85B7C50-6A01-11d2-B841-00C04FAD5171}
Provider=%ProviderName%
DriverVer=09/21/2006,6.0.5736.1
CatalogFile.NTx86 = tostx86.cat
-CatalogFile.NTIA64 = tostia64.cat
CatalogFile.NTAMD64 = tstamd64.cat
PnpLockdown=1
@@ -49,14 +48,11 @@ HKR,,DeviceCharacteristics,0x10001,0x100 ; Use same security checks on re
;*****************************************
[Manufacturer]
-%ToastRUs%=ToastRUs,NTx86, NTia64, NTamd64
+%ToastRUs%=ToastRUs,NTx86, NTamd64
[ToastRUs.NTx86]
%ToasterDevice.DeviceDesc%=Toaster_Device, {b85b7c50-6a01-11d2-b841-00c04fad5171}\MsToaster
-[ToastRUs.NTia64]
-%ToasterDevice.DeviceDesc%=Toaster_Device, {b85b7c50-6a01-11d2-b841-00c04fad5171}\MsToaster
-
[ToastRUs.NTamd64]
%ToasterDevice.DeviceDesc%=Toaster_Device, {b85b7c50-6a01-11d2-b841-00c04fad5171}\MsToaster
@@ -106,9 +102,6 @@ OriginalInfSourcePath = %1%
[SourceDisksNames.x86]
1 = %DiskId1%, toastpkg.tag,,\i386
-[SourceDisksNames.ia64]
-1 = %DiskId1%, toastpkg.tag,,\ia64
-
[SourceDisksNames.amd64]
1 = %DiskId1%, toastpkg.tag,,\amd64
diff --git a/storage/class/disk/src/diskdev.inf b/storage/class/disk/src/diskdev.inf
index 4db49829..70e8fad1 100644
--- a/storage/class/disk/src/diskdev.inf
+++ b/storage/class/disk/src/diskdev.inf
@@ -25,16 +25,12 @@ DefaultDestDir = 12
;
[Manufacturer]
-%MfgName% = Standard.Mfg, NTx86, NTia64, NTamd64
+%MfgName% = Standard.Mfg, NTx86, NTamd64
[Standard.Mfg.NTx86]
%GenDisk.DeviceDesc% = disk, GenDisk
%GenOptical.DeviceDesc% = disk, GenOptical
-[Standard.Mfg.NTia64]
-%GenDisk.DeviceDesc% = disk, GenDisk
-%GenOptical.DeviceDesc% = disk, GenOptical
-
[Standard.Mfg.NTamd64]
%GenDisk.DeviceDesc% = disk, GenDisk
%GenOptical.DeviceDesc% = disk, GenOptical
@@ -78,9 +74,6 @@ ServiceBinary = %12%\disk.sys
[SourceDisksNames.x86]
1 = %DiskId1%,,,\i386
-[SourceDisksNames.ia64]
-1 = %DiskId1%,,,\ia64
-
[SourceDisksNames.amd64]
1 = %DiskId1%,,,\amd64
diff --git a/wia/microdrv/testmcro.inf b/wia/microdrv/testmcro.inf
index 13e5b682..741c3bb4 100644
--- a/wia/microdrv/testmcro.inf
+++ b/wia/microdrv/testmcro.inf
@@ -16,11 +16,6 @@ testmcro.dll=1
[SourceDisksNames.x86]
1=%Location%,,,
-[SourceDisksFiles.ia64]
-testmcro.dll=1
-[SourceDisksNames.ia64]
-1=%Location%,,,
-
[SourceDisksFiles.amd64]
testmcro.dll=1
[SourceDisksNames.amd64]
@@ -31,7 +26,7 @@ testmcro.dll=1
DefaultDestDir=11
[Manufacturer]
-%ManufacturerName%=Models, NTx86, NTamd64, NTia64
+%ManufacturerName%=Models, NTx86, NTamd64
; This is the models section for the x86 driver
[Models.NTx86]
@@ -41,10 +36,6 @@ DefaultDestDir=11
[Models.NTamd64]
%WIASample.DeviceDesc% = WIASample.Scanner, PnPIDInformation
-; This is the models section for the ia64 driver
-[Models.NTia64]
-%WIASample.DeviceDesc% = WIASample.Scanner, PnPIDInformation
-
[WIASample.Scanner]
Include=sti.inf
Needs=STI.SerialSection, STI.MICRODRIVERSection