Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed secondary_tvout to tvout: singlehead cards with TVout exist as well. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17382 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen 2006-05-09 08:21:10 +00:00
parent f197302867
commit a147b615de
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/add-ons/accelerants/matrox/ProposeDisplayMode.c
View File

@ -392,7 +392,7 @@ status_t PROPOSE_DISPLAY_MODE(display_mode *target, const display_mode *low, con
//fixme: in theory singlehead cards can do TVout as well (if MAVEN mounted)
if (target->flags & DUALHEAD_CAPABLE)
{
if (si->ps.secondary_tvout &&
if (si->ps.tvout &&
(target->timing.h_display <= 1024) &&
(target->timing.v_display <= 768))
{
@ -405,7 +405,7 @@ status_t PROPOSE_DISPLAY_MODE(display_mode *target, const display_mode *low, con
/* G450/G550 can only do secondary TVout in Video modes (no Desktop modes!) */
if ((target->flags & DUALHEAD_CAPABLE) && (target->flags & TV_VIDEO))
{
if (si->ps.secondary_tvout &&
if (si->ps.tvout &&
(target->timing.h_display <= 1024) && /* Hscaling option exists */
(target->timing.v_display <= 576)) /* Vscaling option lacks */
{

2
src/add-ons/accelerants/matrox/SetDisplayMode.c
View File

@ -300,7 +300,7 @@ status_t SET_DISPLAY_MODE(display_mode *mode_to_set)
if (!(target2.flags & TV_BITS)) result = g400_crtc2_set_timing(target2);
/* TVout support: setup CRTC2 and it's pixelclock */
if (si->ps.secondary_tvout && (target2.flags & TV_BITS)) maventv_init(target2);
if (si->ps.tvout && (target2.flags & TV_BITS)) maventv_init(target2);
}
else /* single head mode */
{

8
src/add-ons/accelerants/matrox/engine/mga_general.c
View File

@ -506,7 +506,7 @@ status_t g400_general_powerup()
if (si->settings.usebios || (result != B_OK)) return gx00_general_bios_to_powergraphics();
/* reset MAVEN so we know the sync polarity is at reset situation (Hpos, Vpos) */
if (si->ps.secondary_tvout)
if (si->ps.tvout)
{
ACCW(RST, 0x00000002);
snooze(1000);
@ -619,7 +619,7 @@ status_t g450_general_powerup()
/* check output connector setup */
if (si->ps.primary_dvi && si->ps.secondary_head &&
si->ps.secondary_tvout && (i2c_sec_tv_adapter() != B_OK))
si->ps.tvout && (i2c_sec_tv_adapter() != B_OK))
{
/* signal CRTC2 DPMS which connector to program or readout */
si->crossed_conns = true;
@ -761,7 +761,7 @@ status_t gx50_general_output_select()
if ((si->ps.card_type != G450) && (si->ps.card_type != G550)) return B_ERROR;
/* choose primary analog outputconnector */
if (si->ps.primary_dvi && si->ps.secondary_head && si->ps.secondary_tvout)
if (si->ps.primary_dvi && si->ps.secondary_head && si->ps.tvout)
{
if (i2c_sec_tv_adapter() == B_OK)
{
@ -888,7 +888,7 @@ status_t gx00_general_bios_to_powergraphics()
case G400:
case G400MAX:
/* reset MAVEN so we know the sync polarity is at reset situation (Hpos, Vpos) */
if (si->ps.secondary_tvout)
if (si->ps.tvout)
{
ACCW(RST, 0x00000002);
snooze(1000);

16
src/add-ons/accelerants/matrox/engine/mga_info.c
View File

@ -142,7 +142,7 @@ status_t pins1_read(uint8 *pins, uint8 length)
si->ps.v5_mem_type = 0;
//bools:
si->ps.secondary_head = false;
si->ps.secondary_tvout = false;
si->ps.tvout = false;
si->ps.primary_dvi = false;
si->ps.secondary_dvi = false;
si->ps.sdram = true;
@ -244,7 +244,7 @@ status_t pins3_read(uint8 *pins, uint8 length)
si->ps.v3_option2_reg = pins[58];
/* for cards using this version of PINS both functions are in maven */
si->ps.secondary_tvout = !(pins[59] & 0x01);
si->ps.tvout = !(pins[59] & 0x01);
/* G200 and earlier cards are always singlehead cards */
si->ps.secondary_head = false;
if (si->ps.card_type >= G400) si->ps.secondary_head = !(pins[59] & 0x01);
@ -400,7 +400,7 @@ status_t pins4_read(uint8 *pins, uint8 length)
si->ps.option_reg |= (rfhcnt << 15);
/* for cards using this version of PINS both functions are in maven */
si->ps.secondary_tvout = !(pins[91] & 0x01);
si->ps.tvout = !(pins[91] & 0x01);
/* G200 and earlier cards are always singlehead cards */
si->ps.secondary_head = false;
if (si->ps.card_type >= G400) si->ps.secondary_head = !(pins[91] & 0x01);
@ -524,7 +524,7 @@ status_t pins5_read(uint8 *pins, uint8 length)
si->ps.memrdbk_reg = (pins[91] << 24) | (pins[90] << 16) | (pins[89] << 8) | pins [88];
si->ps.secondary_head = (pins[117] & 0x70);
si->ps.secondary_tvout = (pins[117] & 0x40);
si->ps.tvout = (pins[117] & 0x40);
si->ps.primary_dvi = (pins[117] & 0x02);
si->ps.secondary_dvi = (pins[117] & 0x20);
@ -573,14 +573,14 @@ void fake_pins(void)
}
/* find out if the card has a maven */
si->ps.secondary_tvout = false;
si->ps.tvout = false;
si->ps.secondary_head = false;
/* only do I2C probe if the card has a chance */
if (si->ps.card_type >= G100)
{
if (i2c_maven_probe() == B_OK)
{
si->ps.secondary_tvout = true;
si->ps.tvout = true;
/* G200 and earlier cards are always singlehead cards */
if (si->ps.card_type >= G400) si->ps.secondary_head = true;
}
@ -949,8 +949,8 @@ void dump_pins(void)
LOG(2,("max_dac2_clock_32dh: %dMhz\n", si->ps.max_dac2_clock_32dh));
LOG(2,("secondary_head: "));
if (si->ps.secondary_head) LOG(2,("present\n")); else LOG(2,("absent\n"));
LOG(2,("secondary_tvout: "));
if (si->ps.secondary_tvout) LOG(2,("present\n")); else LOG(2,("absent\n"));
LOG(2,("tvout: "));
if (si->ps.tvout) LOG(2,("present\n")); else LOG(2,("absent\n"));
LOG(2,("primary_dvi: "));
if (si->ps.primary_dvi) LOG(2,("present\n")); else LOG(2,("absent\n"));
LOG(2,("secondary_dvi: "));