Add support for ahd/ahc register pretty printing in diagnostics.

This feature can be disabled via the AHD/AHC_REG_PRETTY_PRINT kernel
option.

The ahc driver now uses the same debug options mechanism as ahd:
AHC_DEBUG 	- Compile in debugging code
AHC_DEBUG_OPTS	- String of debug options as listed in aic7xxx.h

2 files changed, 35 insertions, 12 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 2e46913..1f3e83a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -4,21 +4,27 @@
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
-aicasm				optional ahc				   \
+aicasm				optional ahc ahd			   \
 	dependency 	"$S/dev/aic7xxx/aicasm/*.[chyl]"		   \
 	compile-with	"${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
 	no-obj no-implicit-rule						   \
-	clean		"aicasm aicasm_gram.c aicasm_scan.c y.tab.h"
-aic7xxx_{seq,reg}.h		optional ahc				   \
-	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h $S/dev/aic7xxx/aic7xxx.seq"   \
+	clean		"aicasm* y.tab.h"
+aic7xxx_{seq.h,reg.h,reg_print.c}       optional ahc                       \
+        compile-with    "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq"   \
 	no-obj no-implicit-rule before-depend				   \
-	clean		"aic7xxx_seq.h aic7xxx_reg.h"			   \
+	clean		"aic7xxx_seq.h aic7xxx_reg.h aic7xxx_reg_print.c"			   \
 	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
-aic79xx_{seq,reg}.h		optional ahd pci			   \
-	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h $S/dev/aic7xxx/aic79xx.seq"   \
+aic7xxx_reg_print.o		optional ahc ahc_reg_pretty_print	   \
+	compile-with	"${NORMAL_C}"					   \
+	no-implicit-rule local
+aic79xx_{seq.h,reg.h,reg_print.c}	optional ahd pci		   \
+	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq"   \
 	no-obj no-implicit-rule before-depend				   \
-	clean		"aic79xx_seq.h aic79xx_reg.h"			   \
-	dependency	"$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+        clean           "aic79xx_seq.h aic79xx_reg.h aic79xx_reg_print.c"  \
+        dependency      "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+aic79xx_reg_print.o		optional ahd pci ahd_reg_pretty_print	   \
+	compile-with	"${NORMAL_C}"					   \
+	no-implicit-rule local
 kern/device_if.m		standard
 kern/bus_if.m			standard
 kern/clock_if.m			optional genclock
diff --git a/sys/conf/options b/sys/conf/options
index 09b50f6..ab059cd 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -50,13 +50,30 @@ AHC_TMODE_ENABLE	opt_aic7xxx.h	# Bitmap of units to enable
 AHC_DUMP_EEPROM		opt_aic7xxx.h	# Dump the contents of our
 					# configuration prom.
 
-AHC_DEBUG_SEQUENCER	opt_aic7xxx.h	# Enable diagnostic sequencer code
+AHC_DEBUG		opt_aic7xxx.h	# Compile in Aic7xxx Debugging code.
+
+AHC_DEBUG_OPTS		opt_aic7xxx.h	# Aic7xxx driver debugging options.
+					# See sys/dev/aic7xxx/aic7xxx.h
+
+AHC_REG_PRETTY_PRINT    opt_aic7xxx.h	# Print register bitfields in debug
+					# output.  Adds ~128k to driver.
 
 # Adaptec aic79xx SCSI controller options
-AHD_DEBUG		opt_aic79xx.h	# Compile in aic79xx debugging code.
+AHD_DEBUG		opt_aic79xx.h	# Compile in Aic79xx Debugging code.
 
 AHD_DEBUG_OPTS		opt_aic79xx.h	# Aic79xx driver debugging options.
-					# See sys/dev/aic79xx/aic79xx.h
+					# See sys/dev/aic7xxx/aic79xx.h   
+
+AHD_TMODE_ENABLE	opt_aic79xx.h	# Bitmap of units to enable
+					# targetmode operations.
+
+AHD_DUMP_EEPROM		opt_aic79xx.h	# Dump the contents of our  
+					# configuration prom.
+
+AHD_DEBUG_SEQUENCER	opt_aic79xx.h	# Enable diagnostic sequencer code
+
+AHD_REG_PRETTY_PRINT	opt_aic79xx.h	# Print register bitfields in debug
+					# output.  Adds ~215k to driver.
 
 ADW_ALLOW_MEMIO		opt_adw.h	# Allow PCI devices to use memory
 					# mapped I/O