mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 02:18:20 -07:00
Code Issues Packages Projects Releases Activity

Run PTIMER at a reasonable speed. Fix I2C register.s This means we actually for real get beyond stateGr and now try to accelerate rendering

Browse Source
This commit is contained in:
starfrost013
2024-12-31 22:03:06 +00:00
parent 486087face
commit f7ccbc4e71
7 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/nv/vid_nv.h
View File

@@ -107,10 +107,10 @@ typedef struct nv_base_s
uint32_t bar1_lfb_base; // PCI Base Address Register 1 - Linear Framebuffer (NV_BASE)
nv_bus_generation bus_generation; // current bus (see nv_bus_generation documentation)
uint32_t gpu_revision; // GPU Stepping
double pixel_clock_period; // Period in seconds for pixel clock
double pixel_clock_frequency; // Frequency used for pixel clock
rivatimer_t* pixel_clock_timer; // Timer for measuring pixel clock
bool pixel_clock_enabled; // Pixel Clock Enabled - stupid crap used to prevent us enabling the timer multiple times
double memory_clock_period; // Period in seconds for pixel clock
double memory_clock_frequency; // Source Frequency for PTIMER
rivatimer_t* memory_clock_timer; // Timer for measuring memory/gpu clock
bool memory_clock_enabled; // Memory Clock Enabled - stupid crap used to prevent us eanbling the timer multiple times
void* i2c; // I2C for monitor EDID

23
src/include/86box/nv/vid_nv3.h
View File

@@ -577,7 +577,8 @@ extern const device_config_t nv3_config[];
#define NV3_CRTC_REGISTER_RL0 0x34
#define NV3_CRTC_REGISTER_RL1 0x35
#define NV3_CRTC_REGISTER_RMA 0x38 // REAL MODE ACCESS!
#define NV3_CRTC_REGISTER_I2C 0x3F
#define NV3_CRTC_REGISTER_I2C 0x3E
#define NV3_CRTC_REGISTER_I2C_GPIO 0x3F
// where the fuck is GDC?
#define NV3_CRTC_BANKED_128K_A0000 0x00
@@ -904,7 +905,7 @@ void nv3_speed_changed(void *priv);
void nv3_force_redraw(void* priv);
// Memory Mapping
void nv3_update_mappings();
void nv3_update_mappings(); // Update memory mappings
uint8_t nv3_mmio_read8(uint32_t addr, void* priv); // Read 8-bit MMIO
uint16_t nv3_mmio_read16(uint32_t addr, void* priv); // Read 16-bit MMIO
uint32_t nv3_mmio_read32(uint32_t addr, void* priv); // Read 32-bit MMIO
@@ -917,12 +918,12 @@ void nv3_svga_out(uint16_t addr, uint8_t val, void* priv);
uint8_t nv3_pci_read(int32_t func, int32_t addr, void* priv); // Read PCI configuration registers
void nv3_pci_write(int32_t func, int32_t addr, uint8_t val, void* priv); // Write PCI configuration registers
uint8_t nv3_ramin_read8(uint32_t addr, void* priv); // Read 8-bit RAMIN
uint16_t nv3_ramin_read16(uint32_t addr, void* priv); // Read 16-bit RAMIN
uint32_t nv3_ramin_read32(uint32_t addr, void* priv); // Read 32-bit RAMIN
void nv3_ramin_write8(uint32_t addr, uint8_t val, void* priv); // Write 8-bit RAMIN
void nv3_ramin_write16(uint32_t addr, uint16_t val, void* priv); // Write 16-bit RAMIN
void nv3_ramin_write32(uint32_t addr, uint32_t val, void* priv); // Write 32-bit RAMIN
uint8_t nv3_ramin_read8(uint32_t addr, void* priv); // Read 8-bit RAMIN
uint16_t nv3_ramin_read16(uint32_t addr, void* priv); // Read 16-bit RAMIN
uint32_t nv3_ramin_read32(uint32_t addr, void* priv); // Read 32-bit RAMIN
void nv3_ramin_write8(uint32_t addr, uint8_t val, void* priv); // Write 8-bit RAMIN
void nv3_ramin_write16(uint32_t addr, uint16_t val, void* priv); // Write 16-bit RAMIN
void nv3_ramin_write32(uint32_t addr, uint32_t val, void* priv); // Write 32-bit RAMIN
// MMIO Arbitration
// Determine where the hell in this mess our reads or writes are going
@@ -1015,12 +1016,12 @@ void nv3_pbus_rma_write(uint16_t addr, uint8_t val);
void nv3_pramdac_init();
void nv3_pramdac_set_vram_clock();
void nv3_pramdac_set_pixel_clock();
void nv3_pramdac_pixel_clock_poll();
void nv3_pramdac_memory_clock_poll();
void nv3_pramdac_pixel_clock_poll(double real_time);
void nv3_pramdac_memory_clock_poll(double real_time);
// NV3 PTIMER
void nv3_ptimer_init();
void nv3_ptimer_tick();
void nv3_ptimer_tick(double real_time);
// NV3 PVIDEO
void nv3_pvideo_init();

4
src/include/86box/nv/vid_nv_rivatimer.h
View File

@@ -73,12 +73,12 @@ typedef struct rivatimer_s
} rivatimer_t;
void rivatimer_init(); // Initialise the Rivatimer.
rivatimer_t* rivatimer_create(double period, void (*callback)());
rivatimer_t* rivatimer_create(double period, void (*callback)(double real_time));
void rivatimer_destroy(rivatimer_t* rivatimer_ptr);
void rivatimer_update_all();
void rivatimer_start(rivatimer_t* rivatimer_ptr);
void rivatimer_stop(rivatimer_t* rivatimer_ptr);
double rivatimer_get_time(rivatimer_t* rivatimer_ptr);
void rivatimer_set_callback(rivatimer_t* rivatimer_ptr, void (*callback)());
void rivatimer_set_callback(rivatimer_t* rivatimer_ptr, void (*callback)(double real_time));
void rivatimer_set_period(rivatimer_t* rivatimer_ptr, double period);