Author: jkim
Date: Mon Mar 29 22:41:30 2010
New Revision: 205865
URL: http://svn.freebsd.org/changeset/base/205865
Log:
Refine r204265. We want the standard VGA palette for packed pixel mode.
Modified:
head/sys/dev/syscons/scvidctl.c
head/sys/dev/syscons/syscons.c
Modified: head/sys/dev/syscons/scvidctl.c
==============================================================================
--- head/sys/dev/syscons/scvidctl.c Mon Mar 29 22:29:41 2010
(r205864)
+++ head/sys/dev/syscons/scvidctl.c Mon Mar 29 22:41:30 2010
(r205865)
@@ -741,7 +741,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd,
#ifndef SC_NO_PALETTE_LOADING
#ifdef SC_PIXEL_MODE
- if ((adp->va_flags & V_ADP_DAC8) != 0)
+ if (adp->va_info.vi_mem_model == V_INFO_MM_DIRECT)
vidd_load_palette(adp, scp->sc->palette2);
else
#endif
@@ -802,7 +802,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd,
if (scp == scp->sc->cur_scp) {
set_mode(scp);
#ifndef SC_NO_PALETTE_LOADING
- if ((adp->va_flags & V_ADP_DAC8) != 0)
+ if (adp->va_info.vi_mem_model == V_INFO_MM_DIRECT)
vidd_load_palette(adp, scp->sc->palette2);
else
vidd_load_palette(adp, scp->sc->palette);
Modified: head/sys/dev/syscons/syscons.c
==============================================================================
--- head/sys/dev/syscons/syscons.c Mon Mar 29 22:29:41 2010
(r205864)
+++ head/sys/dev/syscons/syscons.c Mon Mar 29 22:41:30 2010
(r205865)
@@ -2131,7 +2131,7 @@ restore_scrn_saver_mode(scr_stat *scp, i
if (set_mode(scp) == 0) {
#ifndef SC_NO_PALETTE_LOADING
#ifdef SC_PIXEL_MODE
- if ((scp->sc->adp->va_flags & V_ADP_DAC8) != 0)
+ if (scp->sc->adp->va_info.vi_mem_model == V_INFO_MM_DIRECT)
vidd_load_palette(scp->sc->adp, scp->sc->palette2);
else
#endif
@@ -2540,7 +2540,7 @@ exchange_scr(sc_softc_t *sc)
#ifndef SC_NO_PALETTE_LOADING
if (ISGRAPHSC(sc->old_scp)) {
#ifdef SC_PIXEL_MODE
- if ((sc->adp->va_flags & V_ADP_DAC8) != 0)
+ if (sc->adp->va_info.vi_mem_model == V_INFO_MM_DIRECT)
vidd_load_palette(sc->adp, sc->palette2);
else
#endif
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
