From e4a15e4d45f9dccf570704bf024e9fbdec73120e Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Tue, 15 Nov 2005 12:23:45 +0000 Subject: [PATCH] removed B_BAD_VALUE override. blocked accelerant from signalling that it's actually supporting a card (interfered with VIA driver if installed). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14941 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../accelerants/skeleton/ProposeDisplayMode.c | 12 ------------ src/add-ons/accelerants/skeleton/engine/general.c | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/add-ons/accelerants/skeleton/ProposeDisplayMode.c b/src/add-ons/accelerants/skeleton/ProposeDisplayMode.c index bfd43ff94c..018230a433 100644 --- a/src/add-ons/accelerants/skeleton/ProposeDisplayMode.c +++ b/src/add-ons/accelerants/skeleton/ProposeDisplayMode.c @@ -321,10 +321,6 @@ status_t PROPOSE_DISPLAY_MODE(display_mode *target, const display_mode *low, con { status = B_BAD_VALUE; } - else - { - status = B_OK; - } LOG(4, ("PROPOSEMODE: WARNING: horizontal timing deviates too much\n")); } @@ -346,10 +342,6 @@ status_t PROPOSE_DISPLAY_MODE(display_mode *target, const display_mode *low, con { status = B_BAD_VALUE; } - else - { - status = B_OK; - } LOG(4, ("PROPOSEMODE: WARNING: vertical timing deviates too much\n")); } @@ -374,10 +366,6 @@ status_t PROPOSE_DISPLAY_MODE(display_mode *target, const display_mode *low, con { status = B_BAD_VALUE; } - else - { - status = B_OK; - } LOG(4, ("PROPOSEMODE: WARNING: pixelclock deviates too much\n")); } diff --git a/src/add-ons/accelerants/skeleton/engine/general.c b/src/add-ons/accelerants/skeleton/engine/general.c index bf597d3eef..c825c8eb91 100644 --- a/src/add-ons/accelerants/skeleton/engine/general.c +++ b/src/add-ons/accelerants/skeleton/engine/general.c @@ -99,13 +99,13 @@ status_t eng_general_powerup() switch(CFGR(DEVID)) { /* Vendor Via */ - case 0x31221106: /* */ +/* case 0x31221106: si->ps.card_type = NV04; si->ps.card_arch = NV04A; LOG(4,("POWERUP: Detected Nvidia TNT1 (NV04)\n")); status = engxx_general_powerup(); break; - default: +*/ default: LOG(8,("POWERUP: Failed to detect valid card 0x%08x\n",CFGR(DEVID))); return B_ERROR; }