summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/alpha/conf.c5
-rw-r--r--sys/arch/arm/arm/conf.c5
-rw-r--r--sys/arch/hppa/hppa/conf.c5
-rw-r--r--sys/arch/hppa64/hppa64/conf.c5
-rw-r--r--sys/arch/i386/i386/conf.c5
-rw-r--r--sys/arch/landisk/landisk/conf.c5
-rw-r--r--sys/arch/macppc/macppc/conf.c5
-rw-r--r--sys/arch/sgi/sgi/conf.c5
-rw-r--r--sys/arch/socppc/socppc/conf.c5
-rw-r--r--sys/arch/sparc64/sparc64/conf.c5
10 files changed, 30 insertions, 20 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 044e6550370..a594c47cb20 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.56 2008/04/08 14:31:54 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.57 2008/06/12 20:03:48 mglocker Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -91,6 +91,7 @@ cdev_decl(mm);
#include "scc.h"
cdev_decl(scc);
#include "audio.h"
+#include "video.h"
#include "com.h"
cdev_decl(com);
#include "wsdisplay.h"
@@ -180,7 +181,7 @@ struct cdevsw cdevsw[] =
cdev_midi_init(NMIDI,midi), /* 41: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 42: sequencer I/O */
cdev_disk_init(NRAID,raid), /* 43: RAIDframe disk driver */
- cdev_notdef(), /* 44 */
+ cdev_video_init(NVIDEO,video), /* 44: generic video I/O */
cdev_usb_init(NUSB,usb), /* 45: USB controller */
cdev_usbdev_init(NUHID,uhid), /* 46: USB generic HID */
cdev_ulpt_init(NULPT,ulpt), /* 47: USB printer */
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 8a591bb9bf0..6a1a53f3fa0 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.18 2008/05/14 20:49:48 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.19 2008/06/12 20:03:48 mglocker Exp $ */
/* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */
/*
@@ -119,6 +119,7 @@ cdev_decl(pci);
* Audio devices
*/
#include "audio.h"
+#include "video.h"
#include "midi.h"
#include "sequencer.h"
@@ -325,7 +326,7 @@ struct cdevsw cdevsw[] = {
cdev_lkm_init(NLKM,lkm), /* 35: loadable module driver */
cdev_audio_init(NAUDIO,audio), /* 36: generic audio I/O */
cdev_hotplug_init(NHOTPLUG,hotplug), /* 37: devices hot plugging*/
- cdev_notdef(), /* 38: removed cpu device */
+ cdev_video_init(NVIDEO,video), /* 38: generic video I/O */
cdev_lkm_dummy(), /* 39: reserved */
cdev_random_init(1,random), /* 40: random generator */
cdev_lkm_dummy(), /* 41: reserved */
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index e426108bcad..a1177b9bd89 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.43 2008/05/14 20:49:48 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.44 2008/06/12 20:03:48 mglocker Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -81,6 +81,7 @@ struct bdevsw bdevsw[] =
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#include "audio.h"
+#include "video.h"
#include "bio.h"
#include "pty.h"
#include "wsdisplay.h"
@@ -166,7 +167,7 @@ struct cdevsw cdevsw[] =
#else
cdev_notdef(),
#endif
- cdev_notdef(), /* 33: ALTQ (deprecated) */
+ cdev_video_init(NVIDEO,video), /* 33: generic video I/O */
cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */
cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */
cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */
diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c
index f048e474a2d..260cc685219 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.9 2008/05/14 20:49:48 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.10 2008/06/12 20:03:48 mglocker Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -82,6 +82,7 @@ struct bdevsw bdevsw[] =
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#include "audio.h"
+#include "video.h"
#include "bio.h"
#include "pty.h"
#include "wsdisplay.h"
@@ -158,7 +159,7 @@ struct cdevsw cdevsw[] =
#else
cdev_notdef(),
#endif
- cdev_notdef(), /* 33: ALTQ (deprecated) */
+ cdev_video_init(NVIDEO,video), /* 33: generic video I/O */
cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */
cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */
cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 816bbed733b..0194ccecc87 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.125 2008/05/21 18:49:47 kettenis Exp $ */
+/* $OpenBSD: conf.c,v 1.126 2008/06/12 20:03:48 mglocker Exp $ */
/* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */
/*
@@ -146,6 +146,7 @@ cdev_decl(cy);
cdev_decl(mcd);
#include "tun.h"
#include "audio.h"
+#include "video.h"
#include "midi.h"
#include "sequencer.h"
cdev_decl(music);
@@ -256,7 +257,7 @@ struct cdevsw cdevsw[] =
#else
cdev_notdef(), /* 43 */
#endif
- cdev_notdef(), /* 44 */
+ cdev_video_init(NVIDEO,video), /* 44: generic video I/O */
cdev_random_init(1,random), /* 45: random data source */
cdev_ocis_init(NPCTR,pctr), /* 46: pentium performance counters */
cdev_disk_init(NRD,rd), /* 47: ram disk driver */
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index fd0500d8361..b597ea28d21 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.8 2008/05/14 20:49:48 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.9 2008/06/12 20:03:48 mglocker Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -118,6 +118,7 @@ cdev_decl(pci);
* Audio devices
*/
#include "audio.h"
+#include "video.h"
#include "midi.h"
#include "sequencer.h"
@@ -361,7 +362,7 @@ struct cdevsw cdevsw[] = {
cdev_lkm_dummy(), /* 74: reserved */
cdev_lkm_dummy(), /* 75: reserved */
cdev_lkm_dummy(), /* 76: reserved */
- cdev_notdef(), /* 77: removed device */
+ cdev_video_init(NVIDEO,video), /* 77: generic video I/O */
cdev_notdef(), /* 78: removed device */
cdev_notdef(), /* 79: removed device */
cdev_notdef(), /* 80: removed device */
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 13a557e1da2..5e877e0bf11 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.36 2008/05/14 20:49:48 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.37 2008/06/12 20:03:48 mglocker Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -131,6 +131,7 @@ cdev_decl(pci);
#endif
#include "audio.h"
+#include "video.h"
#include "pf.h"
@@ -188,7 +189,7 @@ struct cdevsw cdevsw[] = {
cdev_ss_init(NSS,ss), /* 42: SCSI scanner */
cdev_ksyms_init(NKSYMS,ksyms), /* 43: Kernel symbols device */
cdev_audio_init(NAUDIO,audio), /* 44: generic audio I/O */
- cdev_notdef(), /* 45 */
+ cdev_video_init(NVIDEO,video), /* 45: generic video I/O */
cdev_notdef(), /* 46 */
cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
cdev_notdef(), /* 48 */
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index e52432986e9..4c3df61e564 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.15 2008/05/14 20:49:48 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.16 2008/06/12 20:03:48 mglocker Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -109,6 +109,7 @@ cdev_decl(lpt);
#include "uk.h"
cdev_decl(wd);
#include "audio.h"
+#include "video.h"
#ifdef XFS
#include <xfs/nxfs.h>
cdev_decl(xfs_dev);
@@ -178,7 +179,7 @@ cdev_wsdisplay_init(NWSDISPLAY, wsdisplay), /* 25: */
cdev_notdef(), /* 42: */
cdev_notdef(), /* 33: */
cdev_audio_init(NAUDIO,audio), /* 44: /dev/audio */
- cdev_notdef(), /* 45: */
+ cdev_video_init(NVIDEO,video), /* 45: generic video I/O */
cdev_notdef(), /* 46: */
cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
cdev_notdef(), /* 48: */
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index d94a1e02374..28b71ce9889 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.3 2008/05/14 20:49:48 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.4 2008/06/12 20:03:48 mglocker Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -50,6 +50,7 @@ cdev_decl(wd);
#include "vnd.h"
#include "ccd.h"
#include "raid.h"
+#include "video.h"
struct bdevsw bdevsw[] = {
bdev_disk_init(NWD,wd), /* 0: ST506/ESDI/IDE disk */
@@ -147,7 +148,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 41 */
cdev_notdef(), /* 42 */
cdev_ksyms_init(NKSYMS,ksyms), /* 43: Kernel symbols device */
- cdev_notdef(), /* 44 */
+ cdev_video_init(NVIDEO,video), /* 44: generic video I/O */
cdev_notdef(), /* 45 */
cdev_notdef(), /* 46 */
cdev_notdef(), /* 47 */
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 36e5f816987..a4fc477ece2 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.46 2008/04/08 14:31:54 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.47 2008/06/12 20:03:48 mglocker Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -56,6 +56,7 @@
#include "bpfilter.h"
#include "tun.h"
#include "audio.h"
+#include "video.h"
#include "vnd.h"
#include "ccd.h"
#include "ch.h"
@@ -193,7 +194,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 41 */
cdev_notdef(), /* 42: SMD disk */
cdev_svr4_net_init(NSVR4_NET,svr4_net), /* 43: svr4 net pseudo-device */
- cdev_notdef(), /* 44 */
+ cdev_video_init(NVIDEO,video), /* 44: generic video I/O */
cdev_notdef(), /* 45 */
cdev_notdef(), /* 46 */
cdev_notdef(), /* 47 */