diff options
| author | Alex Feldman <alex@cvs.openbsd.org> | 1999-04-28 23:21:06 +0000 |
|---|---|---|
| committer | Alex Feldman <alex@cvs.openbsd.org> | 1999-04-28 23:21:06 +0000 |
| commit | 6df474471702def274bdfe8ca46455a46d4db4d4 (patch) | |
| tree | d65db14b673c824fe4fd2a93492db4dfe2a0cd4c /sys/arch/i386 | |
| parent | 73922253ce7c4f2c7b688415c6b752f9f5716a69 (diff) | |
Added wdt driver for the Industrial Computer Source PCI-WDT50x watchdog
timers.
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 35444bf47b6..ec5ce965681 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.107 1999/03/31 18:33:26 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.108 1999/04/28 23:20:58 alex Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -251,6 +251,8 @@ bktr0 at pci? dev ? function ? #joy0 at isa? port 0x201 joy* at isapnp? +#wdt0 at pci? dev ? function ? # Ind Computer Source PCI-WDT50x driver + pseudo-device pctr 1 pseudo-device sequencer 1 #pseudo-device raid 4 # RAIDframe disk driver diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 3da43ee76a4..f1fd62fb6ed 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.51 1999/01/11 14:28:57 niklas Exp $ */ +/* $OpenBSD: conf.c,v 1.52 1999/04/28 23:20:59 alex Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -131,6 +131,12 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); (dev_type_stop((*))) enodev, 0, seltrue, \ dev_init(c,n,mmap) } +/* open, close, read, ioctl */ +#define cdev_wdt_init(c, n) { \ + dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ + (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ + (dev_type_stop((*))) enodev, 0, seltrue, (dev_type_mmap((*))) enodev } + #define mmread mmrw #define mmwrite mmrw @@ -187,6 +193,8 @@ cdev_decl(xfs_dev); #endif #include "bktr.h" cdev_decl(bktr); +#include "wdt.h" +cdev_decl(wdt); #include "ksyms.h" cdev_decl(ksyms); @@ -278,6 +286,7 @@ struct cdevsw cdevsw[] = cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */ cdev_midi_init(NSEQUENCER,sequencer), /* 53: sequencer I/O */ cdev_disk_init(NRAID,raid), /* 54: RAIDframe disk driver */ + cdev_wdt_init(NWDT,wdt), /* 55: WDT50x watchdog timer */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); |