patch-2.3.99-pre4 linux/drivers/char/wd501p.h

Next file: linux/drivers/char/wdt_pci.c
Previous file: linux/drivers/char/videodev.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre3/linux/drivers/char/wd501p.h linux/drivers/char/wd501p.h
@@ -25,11 +25,21 @@
 #define WDT_COUNT1		(io+1)
 #define WDT_COUNT2		(io+2)
 #define WDT_CR			(io+3)
-#define WDT_SR			(io+4)
-#define WDT_RT			(io+5)
-#define WDT_UNUSED		(io+6)
+#define WDT_SR			(io+4)	/* Start buzzer on PCI write */
+#define WDT_RT			(io+5)	/* Stop buzzer on PCI write */
+#define WDT_BUZZER		(io+6)	/* PCI only: rd=disable, wr=enable */
 #define WDT_DC			(io+7)
 
+/* The following are only on the PCI card, they're outside of I/O space on
+ * the ISA card: */
+#define WDT_CLOCK		(io+12)	/* COUNT2: rd=16.67MHz, wr=2.0833MHz */
+/* inverted opto isolated reset output: */
+#define WDT_OPTONOTRST		(io+13)	/* wr=enable, rd=disable */
+/* opto isolated reset output: */
+#define WDT_OPTORST		(io+14)	/* wr=enable, rd=disable */
+/* programmable outputs: */
+#define WDT_PROGOUT		(io+15)	/* wr=enable, rd=disable */
+
 #define WDC_SR_WCCR		1	/* Active low */
 #define WDC_SR_TGOOD		2
 #define WDC_SR_ISOI0		4
@@ -39,6 +49,8 @@
 #define WDC_SR_PSUUNDR		64	/* Active low */
 #define WDC_SR_IRQ		128	/* Active low */
 
+#ifndef WDT_IS_PCI
+
 /*
  *	Feature Map 1 is the active high inputs not supported on your card.
  *	Feature Map 2 is the active low inputs not supported on your card.
@@ -62,6 +74,13 @@
 #endif
 
 #ifdef CONFIG_WDT_500		/* Minimal board */
+#define FEATUREMAP1		(WDC_SR_TGOOD|WDC_SR_FANGOOD)
+#define FEATUREMAP2		(WDC_SR_PSUOVER|WDC_SR_PSUUNDR)
+#define WDT_OPTION_MASK		(WDIOF_OVERHEAT)
+#endif
+
+#else
+
 #define FEATUREMAP1		(WDC_SR_TGOOD|WDC_SR_FANGOOD)
 #define FEATUREMAP2		(WDC_SR_PSUOVER|WDC_SR_PSUUNDR)
 #define WDT_OPTION_MASK		(WDIOF_OVERHEAT)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)