mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-24 11:29:10 +00:00
Code Issues Releases Activity

Refine r204265. We want the standard VGA palette for packed pixel mode.

Browse Source
This commit is contained in:
Jung-uk Kim 2010-03-29 22:41:30 +00:00
parent 309e3c39d2
commit 4cc5f38e97
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=205865
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/syscons/scvidctl.c
View File

@ -741,7 +741,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td)
#ifndef SC_NO_PALETTE_LOADING #ifndef SC_NO_PALETTE_LOADING
#ifdef SC_PIXEL_MODE #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); vidd_load_palette(adp, scp->sc->palette2);
else else
#endif #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) { if (scp == scp->sc->cur_scp) {
set_mode(scp); set_mode(scp);
#ifndef SC_NO_PALETTE_LOADING #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); vidd_load_palette(adp, scp->sc->palette2);
else else
vidd_load_palette(adp, scp->sc->palette); vidd_load_palette(adp, scp->sc->palette);

4
sys/dev/syscons/syscons.c
View File

@ -2131,7 +2131,7 @@ restore_scrn_saver_mode(scr_stat *scp, int changemode)
if (set_mode(scp) == 0) { if (set_mode(scp) == 0) {
#ifndef SC_NO_PALETTE_LOADING #ifndef SC_NO_PALETTE_LOADING
#ifdef SC_PIXEL_MODE #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); vidd_load_palette(scp->sc->adp, scp->sc->palette2);
else else
#endif #endif
@ -2540,7 +2540,7 @@ exchange_scr(sc_softc_t *sc)
#ifndef SC_NO_PALETTE_LOADING #ifndef SC_NO_PALETTE_LOADING
if (ISGRAPHSC(sc->old_scp)) { if (ISGRAPHSC(sc->old_scp)) {
#ifdef SC_PIXEL_MODE #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); vidd_load_palette(sc->adp, sc->palette2);
else else
#endif #endif