diff options
| author | jkim <jkim@FreeBSD.org> | 2010-03-29 22:41:30 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-03-29 22:41:30 +0000 |
| commit | 5b550c005a08a17c603fa3014ddcefc9a26ff070 (patch) | |
| tree | b98d595539228646150023081630be589183af29 /sys/dev/syscons | |
| parent | 093b7d0bb13b36302fd3c2fd481a00049945e2b2 (diff) | |
| download | FreeBSD-src-5b550c005a08a17c603fa3014ddcefc9a26ff070.zip FreeBSD-src-5b550c005a08a17c603fa3014ddcefc9a26ff070.tar.gz | |
Refine r204265. We want the standard VGA palette for packed pixel mode.
Diffstat (limited to 'sys/dev/syscons')
| -rw-r--r-- | sys/dev/syscons/scvidctl.c | 4 | ||||
| -rw-r--r-- | sys/dev/syscons/syscons.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c index 0f55499..5c3dc8e 100644 --- a/sys/dev/syscons/scvidctl.c +++ b/sys/dev/syscons/scvidctl.c @@ -741,7 +741,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) #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, caddr_t data, struct thread *td) 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); diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 719935d..9128393 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -2131,7 +2131,7 @@ restore_scrn_saver_mode(scr_stat *scp, int changemode) 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 |
