Merge from trunk

2019-04-18 20:46:38 +01:00 · 2019-04-18 20:46:38 +01:00 · 50e7de5214
commit 50e7de5214
parent 4b7328f06e 0a5198828a
282 changed files with 51494 additions and 22451 deletions
--- a/src/vid_svga.h
+++ b/src/vid_svga.h
@ -63,8 +63,8 @@ typedef struct svga_t
        uint32_t ma_latch;
        int bpp;
        
-        int dispontime, dispofftime;
-        int vidtime;
+        uint64_t dispontime, dispofftime;
+        pc_timer_t timer;
        
        uint8_t scrblank;