From 8b6661b126d65e1e6be9c505085ca230e7f42f01 Mon Sep 17 00:00:00 2001 From: andre Date: Tue, 2 Nov 2004 20:57:20 +0000 Subject: Reduce annoying SCSI probing delay from 15 to 5 seconds in all GENRIC kernels. Discussed on: -current --- sys/alpha/conf/GENERIC | 2 +- sys/amd64/conf/GENERIC | 2 +- sys/arm/conf/IQ31244 | 2 +- sys/arm/conf/SIMICS | 2 +- sys/conf/NOTES | 2 +- sys/i386/conf/GENERIC | 2 +- sys/powerpc/conf/GENERIC | 2 +- sys/sparc64/conf/GENERIC | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sys') diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index 15805ec..f1c61e6 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -66,7 +66,7 @@ options PSEUDOFS #Pseudo-filesystem framework options GEOM_GPT #GUID Partition Tables. options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 7b66937..f999461 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -48,7 +48,7 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244 index 6229f22..5a1cf00 100644 --- a/sys/arm/conf/IQ31244 +++ b/sys/arm/conf/IQ31244 @@ -50,7 +50,7 @@ options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues diff --git a/sys/arm/conf/SIMICS b/sys/arm/conf/SIMICS index 537276d..883cd24 100644 --- a/sys/arm/conf/SIMICS +++ b/sys/arm/conf/SIMICS @@ -50,7 +50,7 @@ options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI #options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 236da8b..1c1cc34 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1050,7 +1050,7 @@ options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_CDB) options CAM_MAX_HIGHPOWER=4 options SCSI_NO_SENSE_STRINGS options SCSI_NO_OP_STRINGS -options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device +options SCSI_DELAY=5000 # Be pessimistic about Joe SCSI device # Options for the CAM CDROM driver: # CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 5ad9b1d..5dcd7c1 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -49,7 +49,7 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 1a80f39..0f87d23 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -50,7 +50,7 @@ options PSEUDOFS #Pseudo-filesystem framework options GEOM_GPT #GUID Partition Tables. options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Keep this for a while -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index f24a998..924354b 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -52,7 +52,7 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Keep this for a while -options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues -- cgit v1.1