i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed register cloning bug in accelerant!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7137 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2004-04-01 20:07:22 +00:00
parent 60abfca048
commit f515661720
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/neomagic/InitAccelerant.c
+27 -5
View File
@@ -4,7 +4,7 @@
Other authors: Other authors:
Mark Watson, Mark Watson,
Rudolf Cornelissen 10/2002-3/2004. Rudolf Cornelissen 10/2002-4/2004.
*/ */
#define MODULE_BIT 0x00800000 #define MODULE_BIT 0x00800000
@@ -41,8 +41,27 @@ static status_t init_common(int the_fd) {
LOG(4,("init_common: logmask 0x%08x, memory %dMB, hardcursor %d, usebios %d\n", LOG(4,("init_common: logmask 0x%08x, memory %dMB, hardcursor %d, usebios %d\n",
si->settings.logmask, si->settings.memory, si->settings.hardcursor, si->settings.usebios)); si->settings.logmask, si->settings.memory, si->settings.hardcursor, si->settings.usebios));
/*Check for R4.5.0 and if it is running, use work around*/ /* clone register area(s) */
if (si->ps.card_type < NM2097)
{
/* we can't clone as no register area exists! */
LOG(2,("InitACC: Can't clone register area, integrated in framebuffer!\n"));
switch (si->ps.card_type)
{
case NM2070:
regs = (uint32 *)((uint8 *)si->framebuffer + 0x100000);
break;
case NM2090:
case NM2093:
regs = (uint32 *)((uint8 *)si->framebuffer + 0x200000);
break;
}
/* not used */
regs2 = 0;
}
else
{ {
/*Check for R4.5.0 and if it is running, use work around*/
if (si->use_clone_bugfix) if (si->use_clone_bugfix)
{ {
/*check for R4.5.0 bug and attempt to work around*/ /*check for R4.5.0 bug and attempt to work around*/
@@ -89,9 +108,12 @@ error0:
/* Clean up code shared between primary and cloned accelrants */ /* Clean up code shared between primary and cloned accelrants */
static void uninit_common(void) { static void uninit_common(void) {
/* release the memory mapped registers */ /* release the memory mapped registers if they exist */
delete_area(regs2_area); if (si->ps.card_type > NM2093)
delete_area(regs_area); {
delete_area(regs2_area);
delete_area(regs_area);
}
/* a little cheap paranoia */ /* a little cheap paranoia */
regs = 0; regs = 0;
regs2 = 0; regs2 = 0;
src/add-ons/accelerants/neomagic/engine/nm_general.c
+1 -1
View File
@@ -47,7 +47,7 @@ status_t nm_general_powerup()
{ {
status_t status; status_t status;
LOG(1,("POWERUP: Neomagic (open)BeOS Accelerant 0.06-6 running.\n")); LOG(1,("POWERUP: Neomagic (open)BeOS Accelerant 0.06-7 running.\n"));
/* detect card type and power it up */ /* detect card type and power it up */
switch(CFGR(DEVID)) switch(CFGR(DEVID))