diff --git a/sys/alpha/alpha/api_up1000.c b/sys/alpha/alpha/api_up1000.c index 8631b5f25ed4..509bc755555d 100644 --- a/sys/alpha/alpha/api_up1000.c +++ b/sys/alpha/alpha/api_up1000.c @@ -45,7 +45,7 @@ #include #include -#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 40608476817d..27d86c2794ed 100644 --- a/sys/alpha/alpha/dec_1000a.c +++ b/sys/alpha/alpha/dec_1000a.c @@ -91,8 +91,7 @@ #include - -#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 340274c830ec..1d406b3ce2d5 100644 --- a/sys/alpha/alpha/dec_2100_a50.c +++ b/sys/alpha/alpha/dec_2100_a50.c @@ -50,7 +50,7 @@ #include #include -#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 3bcf22f71dee..ec34c05b1b28 100644 --- a/sys/alpha/alpha/dec_2100_a500.c +++ b/sys/alpha/alpha/dec_2100_a500.c @@ -43,7 +43,7 @@ #include #include -#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 ed052fb3e644..3c9eadb801b9 100644 --- a/sys/alpha/alpha/dec_axppci_33.c +++ b/sys/alpha/alpha/dec_axppci_33.c @@ -47,7 +47,7 @@ #include #include -#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 01c3264b9701..e1dc41fe61b0 100644 --- a/sys/alpha/alpha/dec_eb164.c +++ b/sys/alpha/alpha/dec_eb164.c @@ -45,7 +45,7 @@ #include -#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 0d13a3a55259..07c3b97c8024 100644 --- a/sys/alpha/alpha/dec_eb64plus.c +++ b/sys/alpha/alpha/dec_eb64plus.c @@ -65,7 +65,7 @@ #include #include -#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 a4c63b9256a2..0cb13cec95ca 100644 --- a/sys/alpha/alpha/dec_kn20aa.c +++ b/sys/alpha/alpha/dec_kn20aa.c @@ -47,7 +47,7 @@ #include #include -#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 a7df9f521107..a9264b175df5 100644 --- a/sys/alpha/alpha/dec_kn300.c +++ b/sys/alpha/alpha/dec_kn300.c @@ -55,7 +55,7 @@ #include #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 564c3bf53f3e..62676910d030 100644 --- a/sys/alpha/alpha/dec_st550.c +++ b/sys/alpha/alpha/dec_st550.c @@ -52,7 +52,7 @@ #include #include -#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 e39c4fb59665..db118f6066e5 100644 --- a/sys/alpha/alpha/dec_st6600.c +++ b/sys/alpha/alpha/dec_st6600.c @@ -44,7 +44,7 @@ #include #include -#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 b2ec46061136..784b27d903ce 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