[IBBUS] remove unused files

The patch removes ib_bus.cdf, ib_bus32.cdf and ib_bus.inx files.
They are not used anymore since ibbus is now a filter driver.
ib_bus.cdf content moved to mthca.cdf & mlx4_hca.cdf, ib_bus.inx content moved to mthca.inx & mlx4_hca.inx.

Signed-off-by: Reuven Amitai (reuven@mellanox.co.il)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1816 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/core/bus/kernel/SOURCES b/core/bus/kernel/SOURCES
index 2e58460..d10bd1f 100644 (file)
--- a/core/bus/kernel/SOURCES
+++ b/core/bus/kernel/SOURCES
@@ -2,14 +2,6 @@ TARGETNAME=ibbus
 TARGETPATH=..\..\..\bin\kernel\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=DRIVER\r
 \r
-!if $(_NT_TOOLS_VERSION) != 0x700\r
-# WDK build only - transform .inx --> .inf adding date & version stamp.\r
-# see .\makefile.inc\r
-INF_NAME=ib_bus\r
-INF_TARGET=..\..\..\bin\kernel\$(O)\$(INF_NAME).inf\r
-NTTARGETFILES=$(INF_TARGET)\r
-!endif\r
-\r
 !if $(FREEBUILD)\r
 ENABLE_EVENT_TRACING=1\r
 !else\r

diff --git a/core/bus/kernel/ib_bus.cdf b/core/bus/kernel/ib_bus.cdf
deleted file mode 100644 (file)
index ac428f1..0000000
--- a/core/bus/kernel/ib_bus.cdf
+++ /dev/null
@@ -1,18 +0,0 @@
-[CatalogHeader]\r
-Name=ib_bus.cat\r
-PublicVersion=0x0000001\r
-EncodingType=0x00010001\r
-CATATTR1=0x10010001:OSAttr:2:6.0\r
-[CatalogFiles]\r
-<hash>ib_bus.inf=ib_bus.inf\r
-<hash>ibbus.sys=ibbus.sys\r
-<hash>ibiou.sys=ibiou.sys\r
-<hash>ibal.dll=ibal.dll\r
-<hash>complib.dll=complib.dll\r
-<hash>ibald.dll=ibald.dll\r
-<hash>complibd.dll=complibd.dll\r
-<hash>cl32d.dll=cl32d.dll\r
-<hash>cl32.dll=cl32.dll\r
-<hash>ibal32d.dll=ibal32d.dll\r
-<hash>ibal32.dll=ibal32.dll\r
-\r

diff --git a/core/bus/kernel/ib_bus.inx b/core/bus/kernel/ib_bus.inx
deleted file mode 100644 (file)
index 09a30c0..0000000
--- a/core/bus/kernel/ib_bus.inx
+++ /dev/null
@@ -1,217 +0,0 @@
-; OpenIB InfiniBand Bus Driver.\r
-; Copyright 2005 SilverStorm Technologies all Rights Reserved.\r
-; Copyright 2006 Mellanox Technologies all Rights Reserved.\r
-\r
-[Version]\r
-Signature="$Windows NT$"\r
-Class=System\r
-ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318}\r
-Provider=%OPENIB%\r
-DriverVer=03/08/2006,1.0.0000.614\r
-CatalogFile=ib_bus.cat\r
-\r
-; ================= Device Install section =====================\r
-\r
-; 64-bit platforms also copy 32-bit user-mode binaries.\r
-[DestinationDirs]\r
-DefaultDestDir=%DIRID_DRIVERS%\r
-Ibbus.UMCopyFiles=%DIRID_SYSTEM%\r
-Ibbus.WOW64CopyFiles=%DIRID_SYSTEM_X86%\r
-\r
-[SourceDisksNames.x86]\r
-1=%DiskId%,,,""\r
-\r
-[SourceDisksNames.amd64]\r
-1=%DiskId%,,,""\r
-\r
-[SourceDisksNames.ia64]\r
-1=%DiskId%,,,""\r
-\r
-[SourceDisksFiles.x86]\r
-ibbus.sys=1\r
-ibiou.sys=1\r
-ibal.dll=1\r
-complib.dll=1\r
-ibald.dll=1\r
-complibd.dll=1\r
-\r
-[SourceDisksFiles.amd64]\r
-ibbus.sys=1\r
-ibiou.sys=1\r
-ibal.dll=1\r
-complib.dll=1\r
-ibald.dll=1\r
-complibd.dll=1\r
-cl32d.dll=1\r
-cl32.dll=1\r
-ibal32d.dll=1\r
-ibal32.dll=1\r
-\r
-[SourceDisksFiles.ia64]\r
-ibbus.sys=1\r
-ibiou.sys=1\r
-ibal.dll=1\r
-complib.dll=1\r
-ibald.dll=1\r
-complibd.dll=1\r
-cl32d.dll=1\r
-cl32.dll=1\r
-ibal32d.dll=1\r
-ibal32.dll=1\r
-\r
-[Manufacturer]\r
-%OPENIB% = Ibbus.DeviceSection,ntx86,ntamd64,ntia64\r
-%SST% = SST.DeviceSection,ntx86,ntamd64,ntia64\r
-\r
-[Ibbus.DeviceSection]\r
-; empty since we don't support W9x/Me\r
-\r
-[Ibbus.DeviceSection.ntx86]\r
-%Ibbus.DeviceDesc% = Ibbus.DDInstall,{94f41ced-78eb-407c-b5df-958040af0fd8}\r
-%Iou.DeviceDesc% = Iou.DDInstall,IBA\IB_IOU\r
-\r
-[Ibbus.DeviceSection.ntamd64]\r
-%Ibbus.DeviceDesc% = Ibbus.DDInstall,{94f41ced-78eb-407c-b5df-958040af0fd8}\r
-%Iou.DeviceDesc% = Iou.DDInstall,IBA\IB_IOU\r
-\r
-[Ibbus.DeviceSection.ntia64]\r
-%Ibbus.DeviceDesc% = Ibbus.DDInstall,{94f41ced-78eb-407c-b5df-958040af0fd8}\r
-%Iou.DeviceDesc% = Iou.DDInstall,IBA\IB_IOU\r
-\r
-[SST.DeviceSection]\r
-; empty since we don't support W9x/Me\r
-\r
-[SST.DeviceSection.ntx86]\r
-%VFx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0060,IBA\V00066aP0010\r
-%VEx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0058\r
-%FVIC.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00dd\r
-%EVIC.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00de\r
-%BC2FC.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00e0\r
-%BC2GE.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00e1\r
-\r
-[SST.DeviceSection.ntamd64]\r
-%VFx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0060,IBA\V00066aP0010\r
-%VEx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0058\r
-%FVIC.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00dd\r
-%EVIC.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00de\r
-%BC2FC.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00e0\r
-%BC2GE.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00e1\r
-\r
-[SST.DeviceSection.ntia64]\r
-%VFx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0060,IBA\V00066aP0010\r
-%VEx.DeviceDesc% = Iou.DDInstall,IBA\V00066aP0058\r
-%FVIC.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00dd\r
-%EVIC.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00de\r
-%BC2FC.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00e0\r
-%BC2GE.DeviceDesc% = Iou.DDInstall,IBA\V00066aP00e1\r
-\r
-[Ibbus.DDInstall.ntx86]\r
-CopyFiles = Ibbus.CopyFiles\r
-CopyFiles = Ibbus.UMCopyFiles\r
-\r
-[Ibbus.DDInstall.ntamd64]\r
-CopyFiles = Ibbus.CopyFiles\r
-CopyFiles = Ibbus.UMCopyFiles\r
-CopyFiles = Ibbus.WOW64CopyFiles\r
-\r
-[Ibbus.DDInstall.ntia64]\r
-CopyFiles = Ibbus.CopyFiles\r
-CopyFiles = Ibbus.UMCopyFiles\r
-CopyFiles = Ibbus.WOW64CopyFiles\r
-\r
-[Ibbus.DDInstall.ntx86.Services]\r
-AddService = ibbus,%SPSVCINST_ASSOCSERVICE%,Ibbus.ServiceInstall\r
-\r
-[Ibbus.DDInstall.ntamd64.Services]\r
-AddService = ibbus,%SPSVCINST_ASSOCSERVICE%,Ibbus.ServiceInstall\r
-\r
-[Ibbus.DDInstall.ntia64.Services]\r
-AddService = ibbus,%SPSVCINST_ASSOCSERVICE%,Ibbus.ServiceInstall\r
-\r
-[Iou.DDInstall.nt]\r
-CopyFiles = Iou.CopyFiles\r
-\r
-[Iou.DDInstall.nt.Services]\r
-AddService = ibiou,%SPSVCINST_ASSOCSERVICE%,Iou.ServiceInstall\r
-\r
-[Ibbus.CopyFiles]\r
-ibbus.sys\r
-\r
-[Ibbus.UMCopyFiles]\r
-complib.dll,,,2\r
-ibal.dll,,,2\r
-complibd.dll,,,2\r
-ibald.dll,,,2\r
-\r
-[Ibbus.WOW64CopyFiles]\r
-complib.dll,cl32.dll,,2\r
-ibal.dll,ibal32.dll,,2\r
-complibd.dll,cl32d.dll,,2\r
-ibald.dll,ibal32d.dll,,2\r
-\r
-[Iou.CopyFiles]\r
-ibiou.sys\r
-\r
-;\r
-; ============= Service Install section ==============\r
-;\r
-\r
-[Ibbus.ServiceInstall]\r
-DisplayName     = %Ibbus.ServiceDesc%\r
-ServiceType     = %SERVICE_KERNEL_DRIVER%\r
-StartType       = %SERVICE_DEMAND_START%\r
-ErrorControl    = %SERVICE_ERROR_NORMAL%\r
-ServiceBinary   = %12%\ibbus.sys\r
-LoadOrderGroup  = extended base\r
-AddReg          = Ibbus.ParamsReg\r
-Dependencies   = mthca\r
-\r
-[Iou.ServiceInstall]\r
-DisplayName            = %Iou.ServiceDesc%\r
-ServiceType     = %SERVICE_KERNEL_DRIVER%\r
-StartType       = %SERVICE_DEMAND_START%\r
-ErrorControl    = %SERVICE_ERROR_NORMAL%\r
-ServiceBinary   = %12%\ibiou.sys\r
-AddReg          = Iou.ParamsReg\r
-\r
-[Ibbus.ParamsReg]\r
-HKR,"Parameters","DebugFlags",%REG_DWORD%,0x80000000\r
-HKR,"Parameters","ReportPortNIC",%REG_DWORD%,1\r
-HKR,"Parameters","IbalDebugLevel",%REG_DWORD%,2\r
-HKR,"Parameters","IbalDebugFlags",%REG_DWORD%,0x00ffffff\r
-HKR,"Parameters","SmiPollInterval",%REG_DWORD_NO_CLOBBER%,20000\r
-HKR,"Parameters","IocQueryTimeout",%REG_DWORD_NO_CLOBBER%,250\r
-HKR,"Parameters","IocQueryRetries",%REG_DWORD_NO_CLOBBER%,4\r
-HKR,"Parameters","IocPollInterval",%REG_DWORD_NO_CLOBBER%,30000\r
-HKR,"Parameters","PartitionKey",%REG_SZ%,""\r
-\r
-[Iou.ParamsReg]\r
-HKR,"Parameters","DebugLevel",%REG_DWORD%,2\r
-HKR,"Parameters","DebugFlags",%REG_DWORD%,0x00ffffff\r
-\r
-[Strings]\r
-OPENIB = "OpenIB Alliance"\r
-SST = "SilverStorm Technologies"\r
-Ibbus.DeviceDesc = "InfiniBand Fabric"\r
-VFx.DeviceDesc = "SilverStorm VFx"\r
-VEx.DeviceDesc = "SilverStorm VEx"\r
-FVIC.DeviceDesc = "SilverStorm FVIC"\r
-EVIC.DeviceDesc = "SilverStorm EVIC"\r
-BC2FC.DeviceDesc = "QLogic InfiniBand Fibre Channel Bridge Module"\r
-BC2GE.DeviceDesc = "QLogic InfiniBand Ethernet Bridge Module"\r
-\r
-Iou.DeviceDesc = "InfiniBand I/O Unit"\r
-Ibbus.ServiceDesc = "OpenIB InfiniBand Bus Driver"\r
-Ibal.ServiceDesc = "OpenIB InfiniBand Access Layer"\r
-Iou.ServiceDesc = "OpenIB InfiniBand  I/O Unit Driver"\r
-DiskId = "OpenIB InfiniBand Access Layer installation disk"\r
-SPSVCINST_NULL = 0x0\r
-SPSVCINST_ASSOCSERVICE = 0x00000002\r
-SERVICE_KERNEL_DRIVER  = 1\r
-SERVICE_DEMAND_START   = 3\r
-SERVICE_ERROR_NORMAL   = 1\r
-REG_DWORD              = 0x00010001\r
-REG_DWORD_NO_CLOBBER   = 0x00010003\r
-DIRID_SYSTEM           = 11\r
-DIRID_DRIVERS          = 12\r
-DIRID_SYSTEM_X86       = 16425\r

diff --git a/core/bus/kernel/ib_bus32.cdf b/core/bus/kernel/ib_bus32.cdf
deleted file mode 100644 (file)
index de22a91..0000000
--- a/core/bus/kernel/ib_bus32.cdf
+++ /dev/null
@@ -1,13 +0,0 @@
-[CatalogHeader]\r
-Name=ib_bus.cat\r
-PublicVersion=0x0000001\r
-EncodingType=0x00010001\r
-CATATTR1=0x10010001:OSAttr:2:6.0\r
-[CatalogFiles]\r
-<hash>ib_bus.inf=ib_bus.inf\r
-<hash>ibbus.sys=ibbus.sys\r
-<hash>ibiou.sys=ibiou.sys\r
-<hash>ibal.dll=ibal.dll\r
-<hash>complib.dll=complib.dll\r
-<hash>ibald.dll=ibald.dll\r
-<hash>complibd.dll=complibd.dll\r

diff --git a/core/bus/kernel/makefile.inc b/core/bus/kernel/makefile.inc
deleted file mode 100644 (file)
index 4f29f50..0000000
--- a/core/bus/kernel/makefile.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-\r
-# Transform .inx file to .inf file adding date + major,min & svn.version stamp\r
-# Output .inf file is copied to the $(INF_TARGET) folder (commonly where .sys file resides).\r
-\r
-_LNG=$(LANGUAGE)\r
-\r
-!IF !DEFINED(_INX)\r
-_INX=.\r
-!ENDIF\r
-\r
-STAMP=stampinf -a $(_BUILDARCH)\r
-\r
-!INCLUDE mod_ver.def\r
-\r
-$(INF_TARGET) : $(_INX)\$(INF_NAME).inx\r
-    copy $(_INX)\$(@B).inx $@\r
-    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_BUILDVERSION).$(OPENIB_REV)\r