diff --git a/src/include/86box/nv/vid_nv.h b/src/include/86box/nv/vid_nv.h index 0666d8f35..b7450338b 100644 --- a/src/include/86box/nv/vid_nv.h +++ b/src/include/86box/nv/vid_nv.h @@ -100,11 +100,9 @@ typedef struct nv_base_s 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 - //pc_timer_t pixel_clock_timer; // Pixel Clock Timer rivatimer_t* pixel_clock_timer; 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 - //pc_timer_t memory_clock_timer; // Memory Clock Timer rivatimer_t* memory_clock_timer; bool memory_clock_enabled; // Memory Clock Enabled - stupid crap used to prevent us eanbling the timer multiple times } nv_base_t; diff --git a/src/include/86box/nv/vid_nv3.h b/src/include/86box/nv/vid_nv3.h index 4a93ebddb..328d8335e 100644 --- a/src/include/86box/nv/vid_nv3.h +++ b/src/include/86box/nv/vid_nv3.h @@ -952,8 +952,8 @@ 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* priv*/); -void nv3_pramdac_memory_clock_poll(/*void* priv*/); +void nv3_pramdac_pixel_clock_poll(); +void nv3_pramdac_memory_clock_poll(); // NV3 PTIMER void nv3_ptimer_init(); diff --git a/src/video/nv/nv3/subsystems/nv3_pramdac.c b/src/video/nv/nv3/subsystems/nv3_pramdac.c index 4dabc0a47..2d4b4fbcb 100644 --- a/src/video/nv/nv3/subsystems/nv3_pramdac.c +++ b/src/video/nv/nv3/subsystems/nv3_pramdac.c @@ -50,17 +50,13 @@ void nv3_pramdac_init() // Polls the pixel clock. // This updates the 2D/3D engine PGRAPH -void nv3_pramdac_pixel_clock_poll(/*void* priv*/) +void nv3_pramdac_pixel_clock_poll() { - /* - nv3_t* nv3_poll = (nv3_t*)priv; - - timer_on_auto(&nv3_poll->nvbase.pixel_clock_timer, nv3_poll->nvbase.pixel_clock_period); - */ + // TODO: UPDATE PGRAPH! } // Polls the memory clock. -void nv3_pramdac_memory_clock_poll(/*void* priv*/) +void nv3_pramdac_memory_clock_poll() { //nv3_t* nv3_poll = (nv3_t*)priv; @@ -138,8 +134,6 @@ void nv3_pramdac_set_vram_clock() } rivatimer_set_period(nv3->nvbase.memory_clock_timer, time); - //Breaks everything? - //timer_set_delay_u64(&nv3->nvbase.memory_clock_timer, time * TIMER_USEC); // do we need to decrease } void nv3_pramdac_set_pixel_clock() @@ -188,11 +182,6 @@ void nv3_pramdac_set_pixel_clock() } rivatimer_set_period(nv3->nvbase.pixel_clock_timer, time); - - - //timer_on_auto(&nv3->nvbase.pixel_clock_timer, nv3->nvbase.pixel_clock_period); - //Breaks everything? - //timer_set_delay_u64(&nv3->nvbase.pixel_clock_timer, time * TIMER_USEC); // do we need to decrease } //