diff options
Diffstat (limited to 'drivers/video/atafb.c')
-rw-r--r-- | drivers/video/atafb.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 8058572a742..018850c116c 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c | |||
@@ -841,7 +841,7 @@ static int tt_detect(void) | |||
841 | tt_dmasnd.ctrl = DMASND_CTRL_OFF; | 841 | tt_dmasnd.ctrl = DMASND_CTRL_OFF; |
842 | udelay(20); /* wait a while for things to settle down */ | 842 | udelay(20); /* wait a while for things to settle down */ |
843 | } | 843 | } |
844 | mono_moni = (mfp.par_dt_reg & 0x80) == 0; | 844 | mono_moni = (st_mfp.par_dt_reg & 0x80) == 0; |
845 | 845 | ||
846 | tt_get_par(&par); | 846 | tt_get_par(&par); |
847 | tt_encode_var(&atafb_predefined[0], &par); | 847 | tt_encode_var(&atafb_predefined[0], &par); |
@@ -2035,7 +2035,7 @@ static int stste_detect(void) | |||
2035 | tt_dmasnd.ctrl = DMASND_CTRL_OFF; | 2035 | tt_dmasnd.ctrl = DMASND_CTRL_OFF; |
2036 | udelay(20); /* wait a while for things to settle down */ | 2036 | udelay(20); /* wait a while for things to settle down */ |
2037 | } | 2037 | } |
2038 | mono_moni = (mfp.par_dt_reg & 0x80) == 0; | 2038 | mono_moni = (st_mfp.par_dt_reg & 0x80) == 0; |
2039 | 2039 | ||
2040 | stste_get_par(&par); | 2040 | stste_get_par(&par); |
2041 | stste_encode_var(&atafb_predefined[0], &par); | 2041 | stste_encode_var(&atafb_predefined[0], &par); |
@@ -2086,20 +2086,20 @@ static void st_ovsc_switch(void) | |||
2086 | return; | 2086 | return; |
2087 | local_irq_save(flags); | 2087 | local_irq_save(flags); |
2088 | 2088 | ||
2089 | mfp.tim_ct_b = 0x10; | 2089 | st_mfp.tim_ct_b = 0x10; |
2090 | mfp.active_edge |= 8; | 2090 | st_mfp.active_edge |= 8; |
2091 | mfp.tim_ct_b = 0; | 2091 | st_mfp.tim_ct_b = 0; |
2092 | mfp.tim_dt_b = 0xf0; | 2092 | st_mfp.tim_dt_b = 0xf0; |
2093 | mfp.tim_ct_b = 8; | 2093 | st_mfp.tim_ct_b = 8; |
2094 | while (mfp.tim_dt_b > 1) /* TOS does it this way, don't ask why */ | 2094 | while (st_mfp.tim_dt_b > 1) /* TOS does it this way, don't ask why */ |
2095 | ; | 2095 | ; |
2096 | new = mfp.tim_dt_b; | 2096 | new = st_mfp.tim_dt_b; |
2097 | do { | 2097 | do { |
2098 | udelay(LINE_DELAY); | 2098 | udelay(LINE_DELAY); |
2099 | old = new; | 2099 | old = new; |
2100 | new = mfp.tim_dt_b; | 2100 | new = st_mfp.tim_dt_b; |
2101 | } while (old != new); | 2101 | } while (old != new); |
2102 | mfp.tim_ct_b = 0x10; | 2102 | st_mfp.tim_ct_b = 0x10; |
2103 | udelay(SYNC_DELAY); | 2103 | udelay(SYNC_DELAY); |
2104 | 2104 | ||
2105 | if (atari_switches & ATARI_SWITCH_OVSC_IKBD) | 2105 | if (atari_switches & ATARI_SWITCH_OVSC_IKBD) |