summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2002-08-22 19:52:16 +0000
committerpeter <peter@FreeBSD.org>2002-08-22 19:52:16 +0000
commit4fd36731e0f32bd089f6de3bfb1e433b9aa9fbf2 (patch)
treeb21028c799dc22e5c5755f4bc06591ddc3a2a73a
parent481161e70bea24f6fe0424c70a894bbf911fcdce (diff)
downloadFreeBSD-src-4fd36731e0f32bd089f6de3bfb1e433b9aa9fbf2.zip
FreeBSD-src-4fd36731e0f32bd089f6de3bfb1e433b9aa9fbf2.tar.gz
Many of the alpha low level console drivers still have bogus compile time
dependencies on syscons. Bandaid for now.
Diffstat
-rw-r--r--sys/alpha/alpha/api_up1000.c4
-rw-r--r--sys/alpha/alpha/dec_1000a.c5
-rw-r--r--sys/alpha/alpha/dec_2100_a50.c4
-rw-r--r--sys/alpha/alpha/dec_2100_a500.c4
-rw-r--r--sys/alpha/alpha/dec_axppci_33.c4
-rw-r--r--sys/alpha/alpha/dec_eb164.c4
-rw-r--r--sys/alpha/alpha/dec_eb64plus.c4
-rw-r--r--sys/alpha/alpha/dec_kn20aa.c4
-rw-r--r--sys/alpha/alpha/dec_kn300.c4
-rw-r--r--sys/alpha/alpha/dec_st550.c4
-rw-r--r--sys/alpha/alpha/dec_st6600.c4
-rw-r--r--sys/conf/options.alpha1
12 files changed, 23 insertions, 23 deletions
diff --git a/sys/alpha/alpha/api_up1000.c b/sys/alpha/alpha/api_up1000.c
index 8631b5f..509bc75 100644
--- a/sys/alpha/alpha/api_up1000.c
+++ b/sys/alpha/alpha/api_up1000.c
@@ -45,7 +45,7 @@
#include <alpha/pci/irongatereg.h>
#include <alpha/pci/irongatevar.h>
-#include "sc.h"
+#include "opt_dev_sc.h"
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
@@ -109,7 +109,7 @@ api_up1000_cons_init()
case 3:
/* display console ... */
/* XXX */
-#if NSC > 0
+#ifdef DEV_SC
sccnattach();
#else
panic("not configured to use display && keyboard console");
diff --git a/sys/alpha/alpha/dec_1000a.c b/sys/alpha/alpha/dec_1000a.c
index 4060847..27d86c2 100644
--- a/sys/alpha/alpha/dec_1000a.c
+++ b/sys/alpha/alpha/dec_1000a.c
@@ -91,8 +91,7 @@
#include <pci/pcivar.h>
-
-#include "sc.h"
+#include "opt_dev_sc.h"
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
@@ -219,7 +218,7 @@ dec_1000a_cons_init()
case 3:
/* display console ... */
/* XXX */
-#if NSC > 0
+#ifdef DEV_SC
sccnattach();
#else
panic("not configured to use display && keyboard console");
diff --git a/sys/alpha/alpha/dec_2100_a50.c b/sys/alpha/alpha/dec_2100_a50.c
index 340274c..1d406b3 100644
--- a/sys/alpha/alpha/dec_2100_a50.c
+++ b/sys/alpha/alpha/dec_2100_a50.c
@@ -50,7 +50,7 @@
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
-#include "sc.h"
+#include "opt_dev_sc.h"
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
#endif
@@ -140,7 +140,7 @@ dec_2100_a50_cons_init()
case 3:
/* display console ... */
/* XXX */
-#if NSC > 0
+#ifdef DEV_SC
sccnattach();
#else
panic("not configured to use display && keyboard console");
diff --git a/sys/alpha/alpha/dec_2100_a500.c b/sys/alpha/alpha/dec_2100_a500.c
index 3bcf22f..ec34c05 100644
--- a/sys/alpha/alpha/dec_2100_a500.c
+++ b/sys/alpha/alpha/dec_2100_a500.c
@@ -43,7 +43,7 @@
#include <alpha/pci/t2var.h>
#include <alpha/pci/t2reg.h>
-#include "sc.h"
+#include "opt_dev_sc.h"
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
#endif
@@ -125,7 +125,7 @@ dec_2100_a500_cons_init()
case 3:
/* display console ... */
/* XXX */
-#if NSC > 0
+#ifdef DEV_SC
sccnattach();
#else
panic("not configured to use display && keyboard console");
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index ed052fb..3c9eadb 100644
--- a/sys/alpha/alpha/dec_axppci_33.c
+++ b/sys/alpha/alpha/dec_axppci_33.c
@@ -47,7 +47,7 @@
#include <pci/pcivar.h>
#include <alpha/pci/lcavar.h>
-#include "sc.h"
+#include "opt_dev_sc.h"
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
#endif
@@ -151,7 +151,7 @@ dec_axppci_33_cons_init()
case 3:
/* display console ... */
/* XXX */
-#if NSC > 0
+#ifdef DEV_SC
sccnattach();
#else
panic("not configured to use display && keyboard console");
diff --git a/sys/alpha/alpha/dec_eb164.c b/sys/alpha/alpha/dec_eb164.c
index 01c3264..e1dc41f 100644
--- a/sys/alpha/alpha/dec_eb164.c
+++ b/sys/alpha/alpha/dec_eb164.c
@@ -45,7 +45,7 @@
#include <alpha/pci/ciavar.h>
-#include "sc.h"
+#include "opt_dev_sc.h"
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
@@ -128,7 +128,7 @@ dec_eb164_cons_init()
case 3:
/* display console ... */
/* XXX */
-#if NSC > 0
+#ifdef DEV_SC
sccnattach();
#else
panic("not configured to use display && keyboard console");
diff --git a/sys/alpha/alpha/dec_eb64plus.c b/sys/alpha/alpha/dec_eb64plus.c
index 0d13a3a..07c3b97 100644
--- a/sys/alpha/alpha/dec_eb64plus.c
+++ b/sys/alpha/alpha/dec_eb64plus.c
@@ -65,7 +65,7 @@
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
-#include "sc.h"
+#include "opt_dev_sc.h"
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
@@ -153,7 +153,7 @@ dec_eb64plus_cons_init()
}
case 3:
-#if NSC > 0
+#ifdef DEV_SC
/* graphics adapter console */
sccnattach();
#else
diff --git a/sys/alpha/alpha/dec_kn20aa.c b/sys/alpha/alpha/dec_kn20aa.c
index a4c63b9..0cb13ce 100644
--- a/sys/alpha/alpha/dec_kn20aa.c
+++ b/sys/alpha/alpha/dec_kn20aa.c
@@ -47,7 +47,7 @@
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
-#include "sc.h"
+#include "opt_dev_sc.h"
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
@@ -131,7 +131,7 @@ dec_kn20aa_cons_init()
case 3:
/* display console ... */
/* XXX */
-#if NSC > 0
+#ifdef DEV_SC
sccnattach();
#else
panic("not configured to use display && keyboard console");
diff --git a/sys/alpha/alpha/dec_kn300.c b/sys/alpha/alpha/dec_kn300.c
index a7df9f5..a9264b1 100644
--- a/sys/alpha/alpha/dec_kn300.c
+++ b/sys/alpha/alpha/dec_kn300.c
@@ -55,7 +55,7 @@
#include <alpha/pci/pci_kn300.h>
#endif
-#include "sc.h"
+#include "opt_dev_sc.h"
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
@@ -126,7 +126,7 @@ dec_kn300_cons_init()
break;
case 3:
-#if NSC > 0
+#ifdef DEV_SC
sccnattach();
#else
panic("not configured to use display && keyboard console");
diff --git a/sys/alpha/alpha/dec_st550.c b/sys/alpha/alpha/dec_st550.c
index 564c3bf..6267691 100644
--- a/sys/alpha/alpha/dec_st550.c
+++ b/sys/alpha/alpha/dec_st550.c
@@ -52,7 +52,7 @@
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
-#include "sc.h"
+#include "opt_dev_sc.h"
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
@@ -128,7 +128,7 @@ st550_cons_init()
case 3:
/* display console ... */
/* XXX */
-#if NSC > 0
+#ifdef DEV_SC
sccnattach();
#else
panic("not configured to use display && keyboard console");
diff --git a/sys/alpha/alpha/dec_st6600.c b/sys/alpha/alpha/dec_st6600.c
index e39c4fb..db118f6 100644
--- a/sys/alpha/alpha/dec_st6600.c
+++ b/sys/alpha/alpha/dec_st6600.c
@@ -44,7 +44,7 @@
#include <pci/pcivar.h>
#include <alpha/pci/tsunamivar.h>
-#include "sc.h"
+#include "opt_dev_sc.h"
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
@@ -113,7 +113,7 @@ st6600_cons_init()
case 3:
/* display console ... */
/* XXX */
-#if NSC > 0
+#ifdef DEV_SC
sccnattach();
#else
panic("not configured to use display && keyboard console");
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index b2ec460..784b27d 100644
--- a/sys/conf/options.alpha
+++ b/sys/conf/options.alpha
@@ -45,6 +45,7 @@ SC_NORM_REV_ATTR opt_syscons.h
SC_PIXEL_MODE opt_syscons.h
SC_RENDER_DEBUG opt_syscons.h
SC_TWOBUTTON_MOUSE opt_syscons.h
+DEV_SC
VGA_ALT_SEQACCESS opt_vga.h
VGA_DEBUG opt_vga.h
OpenPOWER on IntegriCloud