Scrap DEC Alpha support.
authorSascha Wildner <swildner@dragonflybsd.org>
Fri, 28 Jan 2005 21:08:38 +0000 (21:08 +0000)
committerSascha Wildner <swildner@dragonflybsd.org>
Fri, 28 Jan 2005 21:08:38 +0000 (21:08 +0000)
sys/dev/misc/syscons/scterm-sc.c
sys/dev/misc/syscons/scvgarndr.c
sys/dev/misc/syscons/syscons.c
sys/dev/misc/syscons/syscons.h

index 66f46b6..5aea241 100644 (file)
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/syscons/scterm-sc.c,v 1.4.2.10 2001/06/11 09:05:39 phk Exp $
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/syscons/scterm-sc.c,v 1.4.2.10 2001/06/11 09:05:39 phk Exp $
- * $DragonFly: src/sys/dev/misc/syscons/scterm-sc.c,v 1.4 2003/08/07 21:16:59 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/scterm-sc.c,v 1.5 2005/01/28 21:08:38 swildner Exp $
  */
 
 #include "opt_syscons.h"
  */
 
 #include "opt_syscons.h"
@@ -173,22 +173,10 @@ static void
 scterm_scan_esc(scr_stat *scp, term_stat *tcp, u_char c)
 {
        static u_char ansi_col[16] = {
 scterm_scan_esc(scr_stat *scp, term_stat *tcp, u_char c)
 {
        static u_char ansi_col[16] = {
-#ifdef __alpha__
-               /*
-                * DEC is evil.  They switch the red and blue attributes in
-                * the palette in the system console.  As a simple work-around,
-                * re-map the ANSI colors appropriately.
-                */
-               FG_BLACK,     FG_BLUE,         FG_GREEN,      FG_CYAN,
-               FG_RED,       FG_MAGENTA,      FG_BROWN,      FG_LIGHTGREY,
-               FG_DARKGREY,  FG_LIGHTBLUE,    FG_LIGHTGREEN, FG_LIGHTCYAN,
-               FG_LIGHTRED,  FG_LIGHTMAGENTA, FG_YELLOW,     FG_WHITE
-#else
                FG_BLACK,     FG_RED,          FG_GREEN,      FG_BROWN,
                FG_BLUE,      FG_MAGENTA,      FG_CYAN,       FG_LIGHTGREY,
                FG_DARKGREY,  FG_LIGHTRED,     FG_LIGHTGREEN, FG_YELLOW,
                FG_LIGHTBLUE, FG_LIGHTMAGENTA, FG_LIGHTCYAN,  FG_WHITE
                FG_BLACK,     FG_RED,          FG_GREEN,      FG_BROWN,
                FG_BLUE,      FG_MAGENTA,      FG_CYAN,       FG_LIGHTGREY,
                FG_DARKGREY,  FG_LIGHTRED,     FG_LIGHTGREEN, FG_YELLOW,
                FG_LIGHTBLUE, FG_LIGHTMAGENTA, FG_LIGHTCYAN,  FG_WHITE
-#endif
        };
        sc_softc_t *sc;
        int i, n;
        };
        sc_softc_t *sc;
        int i, n;
index e25f79d..543f860 100644 (file)
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/syscons/scvgarndr.c,v 1.5.2.3 2001/07/28 12:51:47 yokota Exp $
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/syscons/scvgarndr.c,v 1.5.2.3 2001/07/28 12:51:47 yokota Exp $
- * $DragonFly: src/sys/dev/misc/syscons/scvgarndr.c,v 1.6 2004/09/04 12:03:14 eirikn Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/scvgarndr.c,v 1.7 2005/01/28 21:08:38 swildner Exp $
  */
 
 #include "opt_syscons.h"
  */
 
 #include "opt_syscons.h"
@@ -1034,9 +1034,6 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y)
 #ifdef __i386__
                        *(u_char *)p &= m >> 8;
                        *(u_char *)(p + 1) &= m;
 #ifdef __i386__
                        *(u_char *)p &= m >> 8;
                        *(u_char *)(p + 1) &= m;
-#elif defined(__alpha__)
-                       writeb(p, readb(p) & (m >> 8));
-                       writeb(p + 1, readb(p + 1) & (m >> 8));
 #endif
                        p += line_width;
                }
 #endif
                        p += line_width;
                }
@@ -1046,8 +1043,6 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y)
                        m = ~(mouse_and_mask[j] >> xoff);
 #ifdef __i386__
                        *(u_char *)p &= m;
                        m = ~(mouse_and_mask[j] >> xoff);
 #ifdef __i386__
                        *(u_char *)p &= m;
-#elif defined(__alpha__)
-                       writeb(p, readb(p) & (m >> 8));
 #endif
                        p += line_width;
                }
 #endif
                        p += line_width;
                }
@@ -1060,9 +1055,6 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y)
 #ifdef __i386__
                        *(u_char *)p &= m >> 8;
                        *(u_char *)(p + 1) &= m;
 #ifdef __i386__
                        *(u_char *)p &= m >> 8;
                        *(u_char *)(p + 1) &= m;
-#elif defined(__alpha__)
-                       writeb(p, readb(p) & (m >> 8));
-                       writeb(p + 1, readb(p + 1) & (m >> 8));
 #endif
                        p += line_width;
                }
 #endif
                        p += line_width;
                }
@@ -1071,8 +1063,6 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y)
                        m = mouse_or_mask[j] >> xoff;
 #ifdef __i386__
                        *(u_char *)p &= m;
                        m = mouse_or_mask[j] >> xoff;
 #ifdef __i386__
                        *(u_char *)p &= m;
-#elif defined(__alpha__)
-                       writeb(p, readb(p) & (m >> 8));
 #endif
                        p += line_width;
                }
 #endif
                        p += line_width;
                }
index 84618cd..9ac9664 100644 (file)
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/syscons/syscons.c,v 1.336.2.17 2004/03/25 08:41:09 ru Exp $
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/syscons/syscons.c,v 1.336.2.17 2004/03/25 08:41:09 ru Exp $
- * $DragonFly: src/sys/dev/misc/syscons/syscons.c,v 1.13 2004/09/19 02:11:56 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/syscons.c,v 1.14 2005/01/28 21:08:38 swildner Exp $
  */
 
 #include "use_splash.h"
  */
 
 #include "use_splash.h"
@@ -191,10 +191,6 @@ static cn_putc_t   sccnputc;
 static cn_dbctl_t      sccndbctl;
 static cn_term_t       sccnterm;
 
 static cn_dbctl_t      sccndbctl;
 static cn_term_t       sccnterm;
 
-#if __alpha__
-void sccnattach(void);
-#endif
-
 CONS_DRIVER(sc, sccnprobe, sccninit, sccnterm, sccngetc, sccncheckc, sccnputc,
            sccndbctl);
 
 CONS_DRIVER(sc, sccnprobe, sccninit, sccnterm, sccngetc, sccncheckc, sccnputc,
            sccndbctl);
 
@@ -1342,15 +1338,6 @@ sccnprobe(struct consdev *cp)
     cp->cn_dev = make_dev(&sc_cdevsw, SC_CONSOLECTL,
                   UID_ROOT, GID_WHEEL, 0600, "consolectl");
 #endif /* __i386__ */
     cp->cn_dev = make_dev(&sc_cdevsw, SC_CONSOLECTL,
                   UID_ROOT, GID_WHEEL, 0600, "consolectl");
 #endif /* __i386__ */
-
-#if __alpha__
-    /*
-     * alpha use sccnattach() rather than cnprobe()/cninit()/cnterm()
-     * interface to install the console.  Always return CN_DEAD from
-     * here.
-     */
-    cp->cn_pri = CN_DEAD;
-#endif /* __alpha__ */
 }
 
 static void
 }
 
 static void
@@ -1365,10 +1352,6 @@ sccninit(struct consdev *cp)
     sc_console_unit = unit;
     sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]);
 #endif /* __i386__ */
     sc_console_unit = unit;
     sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]);
 #endif /* __i386__ */
-
-#if __alpha__
-    /* SHOULDN'T REACH HERE */
-#endif /* __alpha__ */
 }
 
 static void
 }
 
 static void
@@ -1388,45 +1371,8 @@ sccnterm(struct consdev *cp)
     sc_console_unit = -1;
     sc_console = NULL;
 #endif /* __i386__ */
     sc_console_unit = -1;
     sc_console = NULL;
 #endif /* __i386__ */
-
-#if __alpha__
-    /* do nothing XXX */
-#endif /* __alpha__ */
-}
-
-#ifdef __alpha__
-
-void
-sccnattach(void)
-{
-    static struct consdev consdev;
-    int unit;
-    int flags;
-
-    bcopy(&sc_consdev, &consdev, sizeof(sc_consdev));
-    consdev.cn_pri = sc_get_cons_priority(&unit, &flags);
-
-    /* a video card is always required */
-    if (!scvidprobe(unit, flags, TRUE))
-       consdev.cn_pri = CN_DEAD;
-
-    /* alpha doesn't allow the console being without a keyboard... Why? */
-    if (!sckbdprobe(unit, flags, TRUE))
-       consdev.cn_pri = CN_DEAD;
-
-    if (consdev.cn_pri == CN_DEAD)
-       return;
-
-    scinit(unit, flags | SC_KERNEL_CONSOLE);
-    sc_console_unit = unit;
-    sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]);
-    consdev.cn_dev = make_dev(&sc_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
-                               "ttyv%r", 0);
-    cn_tab = &consdev;
 }
 
 }
 
-#endif /* __alpha__ */
-
 static void
 sccnputc(dev_t dev, int c)
 {
 static void
 sccnputc(dev_t dev, int c)
 {
index c545bb1..7d8b194 100644 (file)
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.60.2.6 2002/09/15 22:30:45 dd Exp $
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.60.2.6 2002/09/15 22:30:45 dd Exp $
- * $DragonFly: src/sys/dev/misc/syscons/syscons.h,v 1.8 2004/09/19 02:11:56 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/syscons.h,v 1.9 2005/01/28 21:08:38 swildner Exp $
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
@@ -41,8 +41,6 @@
 #include <pc98/pc98/sc_machdep.h>
 #elif defined(__i386__)
 /* nothing for the moment */
 #include <pc98/pc98/sc_machdep.h>
 #elif defined(__i386__)
 /* nothing for the moment */
-#elif defined(__alpha__)
-/* nothing for the moment */
 #endif
 
 /* default values for configuration options */
 #endif
 
 /* default values for configuration options */