Date: Mon, 22 Oct 2018 02:36:19 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339574 - in head: share/man/man4 sys/amd64/conf sys/conf sys/dev/ncr sys/i386/conf sys/modules sys/modules/ncr Message-ID: <201810220236.w9M2aJw5044198@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Oct 22 02:36:18 2018 New Revision: 339574 URL: https://svnweb.freebsd.org/changeset/base/339574 Log: Remove the ncr(4) drive. This driver has been obsolete since the FreeBSD 4.x. It should have been removed then since the sym(4) driver had subsumed it. The driver was commented out of GENERIC in 2000. RelNotes: Yes Deleted: head/share/man/man4/ncr.4 head/sys/dev/ncr/locate.pl head/sys/dev/ncr/ncr.c head/sys/dev/ncr/ncrreg.h head/sys/modules/ncr/Makefile Modified: head/share/man/man4/Makefile head/share/man/man4/sym.4 head/sys/amd64/conf/GENERIC head/sys/conf/NOTES head/sys/conf/files head/sys/conf/options head/sys/i386/conf/GENERIC head/sys/i386/conf/PAE head/sys/modules/Makefile Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Mon Oct 22 02:36:07 2018 (r339573) +++ head/share/man/man4/Makefile Mon Oct 22 02:36:18 2018 (r339574) @@ -304,7 +304,6 @@ MAN= aac.4 \ my.4 \ nand.4 \ nandsim.4 \ - ncr.4 \ ${_ndis.4} \ net80211.4 \ netdump.4 \ Modified: head/share/man/man4/sym.4 ============================================================================== --- head/share/man/man4/sym.4 Mon Oct 22 02:36:07 2018 (r339573) +++ head/share/man/man4/sym.4 Mon Oct 22 02:36:18 2018 (r339574) @@ -159,53 +159,6 @@ permanent PCI parity errors detected. This option is supplied for convenience but it is neither recommended nor supported. .Pp -The generic -.Xr ncr 4 -driver also supports SYM53C8XX based PCI SCSI controllers, -except for the SYM53C1010, which is only supported by the -.Nm -driver. -.Pp -By default, when both the -.Xr ncr 4 -and -.Nm -drivers are configured, the -.Nm -driver takes precedence over the -.Xr ncr 4 -driver. -The user can indicate a balancing of chip types between the two drivers -by defining the -.Ar SYM_SETUP_LP_PROBE_MAP -kernel configuration option as follows: -.Bl -column "0x40" -.It Em "Bit Devices to be attached by ncr instead" -.It "0x01 53C810a, 53C860" -.It "0x02 53C825a, 53C875, 53C876, 53C885, 53C895" -.It "0x04 53C895a, 53C896, 53C897, 53C1510d" -.It "0x40 53C810, 53C815, 53C825" -.El -.Pp -For example, if -.Ar SYM_SETUP_LP_PROBE_MAP -is supplied with the value 0x41, the -.Xr ncr 4 -driver will attach to 53C810, 53C815, 53C825, 53C810a, and 53C860 based -controllers, -and the -.Nm -driver will attach to all other 53C8XX based controllers. -.Pp -When only the -.Nm -driver is configured, the -.Ar SYM_SETUP_LP_PROBE_MAP -option has no effect. -Thus, in this case, the -.Nm -driver will attach all 53C8XX based controllers present in the system. -.Pp This driver offers other options that are not currently exported to the user. They are defined and documented in the @@ -342,7 +295,6 @@ The DEC KZPCA-AA is a rebadged SYM8952U. .Sh SEE ALSO .Xr cd 4 , .Xr da 4 , -.Xr ncr 4 , .Xr sa 4 , .Xr scsi 4 , .Xr camcontrol 8 Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Mon Oct 22 02:36:07 2018 (r339573) +++ head/sys/amd64/conf/GENERIC Mon Oct 22 02:36:18 2018 (r339574) @@ -139,8 +139,7 @@ device isp # Qlogic family device mpt # LSI-Logic MPT-Fusion device mps # LSI-Logic MPT-Fusion 2 device mpr # LSI-Logic MPT-Fusion 3 -#device ncr # NCR/Symbios Logic -device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') +device sym # NCR/Symbios Logic device trm # Tekram DC395U/UW/F DC315U adapters device isci # Intel C600 SAS controller device ocs_fc # Emulex FC adapters Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Mon Oct 22 02:36:07 2018 (r339573) +++ head/sys/conf/NOTES Mon Oct 22 02:36:18 2018 (r339574) @@ -1563,7 +1563,6 @@ options TERMINAL_KERN_ATTR=(FG_LIGHTRED|BG_BLACK) # ispfw: Firmware module for Qlogic host adapters # mpt: LSI-Logic MPT/Fusion 53c1020 or 53c1030 Ultra4 # or FC9x9 Fibre Channel host adapters. -# ncr: NCR 53C810, 53C825 self-contained SCSI host adapters. # sym: Symbios/Logic 53C8XX family of PCI-SCSI I/O processors: # 53C810, 53C810A, 53C815, 53C825, 53C825A, 53C860, 53C875, # 53C876, 53C885, 53C895, 53C895A, 53C896, 53C897, 53C1510D, @@ -1592,7 +1591,6 @@ hint.isp.0.portwnn="w50000000aaaa0000" hint.isp.0.nodewnn="w50000000aaaa0001" device ispfw device mpt -device ncr device sym device trm @@ -1650,12 +1648,6 @@ options ISP_TARGET_MODE=1 # options ISP_DEFAULT_ROLES=0 -# Options used in dev/sym/ (Symbios SCSI driver). -#options SYM_SETUP_LP_PROBE_MAP #-Low Priority Probe Map (bits) - # Allows the ncr to take precedence - # 1 (1<<0) -> 810a, 860 - # 2 (1<<1) -> 825a, 875, 885, 895 - # 4 (1<<2) -> 895a, 896, 1510d #options SYM_SETUP_SCSI_DIFF #-HVD support for 825a, 875, 885 # disabled:0 (default), enabled:1 #options SYM_SETUP_PCI_PARITY #-PCI parity checking @@ -2922,11 +2914,6 @@ options MSGSSZ=16 # Size of a message segment options MSGTQL=41 # Max number of messages in system options NBUF=512 # Number of buffer headers - -options SCSI_NCR_DEBUG -options SCSI_NCR_MAX_SYNC=10000 -options SCSI_NCR_MAX_WIDE=1 -options SCSI_NCR_MYADDR=7 options SC_DEBUG_LEVEL=5 # Syscons debug level options SC_RENDER_DEBUG # syscons rendering debugging Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Mon Oct 22 02:36:07 2018 (r339573) +++ head/sys/conf/files Mon Oct 22 02:36:18 2018 (r339574) @@ -2509,7 +2509,6 @@ dev/nand/nandsim_ctrl.c optional nandsim nand dev/nand/nandsim_log.c optional nandsim nand dev/nand/nandsim_swap.c optional nandsim nand dev/nand/nfc_if.m optional nand -dev/ncr/ncr.c optional ncr pci dev/netmap/if_ptnet.c optional netmap inet dev/netmap/netmap.c optional netmap dev/netmap/netmap_freebsd.c optional netmap Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Mon Oct 22 02:36:07 2018 (r339573) +++ head/sys/conf/options Mon Oct 22 02:36:18 2018 (r339574) @@ -386,12 +386,6 @@ SYM_SETUP_PCI_PARITY opt_sym.h #-PCI parity checking SYM_SETUP_MAX_LUN opt_sym.h #-Number of LUNs supported # default:8, range:[1..64] -# Options used only in dev/ncr/* -SCSI_NCR_DEBUG opt_ncr.h -SCSI_NCR_MAX_SYNC opt_ncr.h -SCSI_NCR_MAX_WIDE opt_ncr.h -SCSI_NCR_MYADDR opt_ncr.h - # Options used only in dev/isp/* ISP_TARGET_MODE opt_isp.h ISP_FW_CRASH_DUMP opt_isp.h Modified: head/sys/i386/conf/GENERIC ============================================================================== --- head/sys/i386/conf/GENERIC Mon Oct 22 02:36:07 2018 (r339573) +++ head/sys/i386/conf/GENERIC Mon Oct 22 02:36:18 2018 (r339574) @@ -132,8 +132,7 @@ device isp # Qlogic family device mpt # LSI-Logic MPT-Fusion device mps # LSI-Logic MPT-Fusion 2 device mpr # LSI-Logic MPT-Fusion 3 -#device ncr # NCR/Symbios Logic -device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') +device sym # NCR/Symbios Logic device trm # Tekram DC395U/UW/F DC315U adapters device isci # Intel C600 SAS controller Modified: head/sys/i386/conf/PAE ============================================================================== --- head/sys/i386/conf/PAE Mon Oct 22 02:36:07 2018 (r339573) +++ head/sys/i386/conf/PAE Mon Oct 22 02:36:18 2018 (r339574) @@ -17,6 +17,5 @@ nodevice hptmv nodevice ida # The following drivers don't work with PAE enabled. -makeoptions WITHOUT_MODULES+="ncr pst" -nodevice ncr +makeoptions WITHOUT_MODULES+="pst" nodevice pst Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Mon Oct 22 02:36:07 2018 (r339573) +++ head/sys/modules/Makefile Mon Oct 22 02:36:18 2018 (r339574) @@ -266,7 +266,6 @@ SUBDIR= \ my \ ${_nandfs} \ ${_nandsim} \ - ${_ncr} \ ${_nctgpio} \ ${_ndis} \ ${_netgraph} \ @@ -751,7 +750,6 @@ _cp= cp _glxiic= glxiic _glxsb= glxsb #_ibcs2= ibcs2 -_ncr= ncr _pcfclock= pcfclock _pst= pst _sbni= sbni
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810220236.w9M2aJw5044198>