mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set up the correct clock value for the selected Voodoo model.

Browse Source
This commit is contained in:
Volker Ruppert 2014-01-01 18:23:37 +00:00
parent 58470763fa
commit 98634946e6
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/iodev/display/voodoo.cc
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2012-2013 The Bochs Project
// Copyright (C) 2012-2014 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@ -77,8 +77,8 @@ bx_voodoo_c* theVoodooDevice = NULL;
#include "voodoo_types.h"
#include "voodoo_data.h"
voodoo_state *v;
#include "voodoo_main.h"
voodoo_state *v;
#include "voodoo_func.h"
// builtin configuration handling functions
@ -201,8 +201,10 @@ void bx_voodoo_c::init(void)
if (model == VOODOO_2) {
init_pci_conf(0x121a, 0x0002, 0x02, 0x038000, 0x00);
BX_VOODOO_THIS pci_conf[0x10] = 0x08;
BX_VOODOO_THIS s.clock = STD_VOODOO_1_CLOCK;
} else {
init_pci_conf(0x121a, 0x0001, 0x01, 0x000000, 0x00);
BX_VOODOO_THIS s.clock = STD_VOODOO_2_CLOCK;
}
BX_VOODOO_THIS pci_conf[0x3d] = BX_PCI_INTA;
BX_VOODOO_THIS pci_base_address[0] = 0;
@ -444,7 +446,7 @@ void bx_voodoo_c::mode_change_timer_handler(void *this_ptr)
int htotal = ((v->reg[hSync].u >> 16) & 0x3ff) + 1 + (v->reg[hSync].u & 0xff) + 1;
int vtotal = ((v->reg[vSync].u >> 16) & 0xfff) + (v->reg[vSync].u & 0xfff);
int vsync = ((v->reg[vSync].u >> 16) & 0xfff);
double hfreq = 50000000.0 / htotal; // Voodoo1 50 MHz
double hfreq = BX_VOODOO_THIS s.clock / htotal; // Voodoo1 50 MHz / Voodoo2 90 MHz
if (((v->reg[fbiInit1].u >> 20) & 3) == 1) { // VCLK div 2
hfreq /= 2;
}

3
bochs/iodev/display/voodoo.h
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2012 The Bochs Project
// Copyright (C) 2012-2014 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@ -36,6 +36,7 @@ typedef struct {
bx_bool override_on;
bx_bool screen_update_pending;
} vdraw;
double clock;
int mode_change_timer_id;
int update_timer_id;
Bit8u devfunc;

8
bochs/iodev/display/voodoo_main.h
View File

@ -52,10 +52,10 @@ enum
};
#define STD_VOODOO_1_CLOCK 50000000
#define STD_VOODOO_2_CLOCK 90000000
#define STD_VOODOO_BANSHEE_CLOCK 90000000
#define STD_VOODOO_3_CLOCK 132000000
#define STD_VOODOO_1_CLOCK 50000000.0
#define STD_VOODOO_2_CLOCK 90000000.0
#define STD_VOODOO_BANSHEE_CLOCK 90000000.0
#define STD_VOODOO_3_CLOCK 132000000.0
/***************************************************************************