added 'force TV output signal type' option to nv.settings. Works OK (so implemented). Also added option to keep VGA on for a head outputting TV signals, but that's not implemented yet (always on currently). Bumped version to 0.58.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14468 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen 2005-10-22 09:56:41 +00:00
parent 718af224dd
commit 0c73ffe8e7
3 changed files with 5 additions and 6 deletions

View File

@ -4,7 +4,7 @@
Other authors:
Mark Watson,
Rudolf Cornelissen 10/2002-6/2005.
Rudolf Cornelissen 10/2002-10/2005.
*/
#define MODULE_BIT 0x00800000
@ -40,8 +40,8 @@ static status_t init_common(int the_fd) {
// LOG is now available, si !NULL
LOG(4,("init_common: logmask 0x%08x, memory %dMB, hardcursor %d, usebios %d, switchhead %d, force_pci %d\n",
si->settings.logmask, si->settings.memory, si->settings.hardcursor, si->settings.usebios, si->settings.switchhead, si->settings.force_pci));
LOG(4,("init_common: dumprom %d, unhide_fw %d, pgm_panel %d, dma_acc %d\n",
si->settings.dumprom, si->settings.unhide_fw, si->settings.pgm_panel, si->settings.dma_acc));
LOG(4,("init_common: dumprom %d, unhide_fw %d, pgm_panel %d, dma_acc %d, tv_output %d, vga_on_tv %d\n",
si->settings.dumprom, si->settings.unhide_fw, si->settings.pgm_panel, si->settings.dma_acc, si->settings.tv_output, si->settings.vga_on_tv));
/*Check for R4.5.0 and if it is running, use work around*/
{

View File

@ -1781,8 +1781,7 @@ status_t BT_setmode(display_mode target)
}
/* setup output signal routing and flickerfilter */
//fixme: add output force settings in nv.settings, defaulting to autodetect.
BT_setup_output(monstat, 0, ffilter);
BT_setup_output(monstat, (uint8)(si->settings.tv_output), ffilter);
/* update the GPU CRTC timing for the requested mode */
BT_update_mode_for_gpu(&tv_target, tvmode);

View File

@ -91,7 +91,7 @@ status_t nv_general_powerup()
{
status_t status;
LOG(1,("POWERUP: Haiku nVidia Accelerant 0.57 running.\n"));
LOG(1,("POWERUP: Haiku nVidia Accelerant 0.58 running.\n"));
/* log VBLANK INT usability status */
if (si->ps.int_assigned)