svn commit: r203685 - in head/sys: conf dev/aic7xxx

[Bruce Cran]

Author: brucec
Date: Mon Feb  8 20:57:42 2010
New Revision: 203685
URL: http://svn.freebsd.org/changeset/base/203685

Log:
  Document the usfs driver and the NO_SYSCTL_DESCR option, and update the comment for umass.
  Don't include the sysctl description variables in aic7xxx when NO_SYSCTL_DESCR is used.
  
  Approved by:	rrs (mentor)

Modified:
  head/sys/conf/NOTES
  head/sys/dev/aic7xxx/aic79xx_osm.c

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Mon Feb  8 20:53:29 2010	(r203684)
+++ head/sys/conf/NOTES	Mon Feb  8 20:57:42 2010	(r203685)
@@ -386,6 +386,11 @@ options 	KDTRACE_HOOKS
 options 	SYSCTL_DEBUG
 
 #
+# NO_SYSCTL_DESCR omits the sysctl node descriptions to save space in the
+# resulting kernel.
+options		NO_SYSCTL_DESCR
+
+#
 # DEBUG_MEMGUARD builds and enables memguard(9), a replacement allocator
 # for the kernel used to detect modify-after-free scenarios.  See the
 # memguard(9) man page for more information on usage.
@@ -2596,8 +2601,10 @@ device		uhid
 device		ukbd
 # USB printer
 device		ulpt
-# USB Iomega Zip 100 Drive (Requires scbus and da)
+# USB mass storage driver (Requires scbus and da)
 device		umass
+# USB mass storage driver for device-side mode
+device		usfs
 # USB support for Belkin F5U109 and Magic Control Technology serial adapters
 device		umct
 # USB modem support

Modified: head/sys/dev/aic7xxx/aic79xx_osm.c
==============================================================================
--- head/sys/dev/aic7xxx/aic79xx_osm.c	Mon Feb  8 20:53:29 2010	(r203684)
+++ head/sys/dev/aic7xxx/aic79xx_osm.c	Mon Feb  8 20:57:42 2010	(r203685)
@@ -83,11 +83,13 @@ static const char *ahd_sysctl_node_eleme
 	"debug"
 };
 
+#ifndef NO_SYSCTL_DESCR
 static const char *ahd_sysctl_node_descriptions[] = {
 	"root error collection for aic79xx controllers",
 	"summary collection for aic79xx controllers",
 	"debug collection for aic79xx controllers"
 };
+#endif
 
 static const char *ahd_sysctl_errors_elements[] = {
 	"Cerrors",
@@ -95,11 +97,13 @@ static const char *ahd_sysctl_errors_ele
 	"Ferrors"
 };
 
+#ifndef NO_SYSCTL_DESCR
 static const char *ahd_sysctl_errors_descriptions[] = {
 	"Correctable errors",
 	"Uncorrectable errors",
 	"Fatal errors"
 };
+#endif
 
 static int
 ahd_set_debugcounters(SYSCTL_HANDLER_ARGS)