From 94c36e7a363b2f73bc8e215f161eadda5555d458 Mon Sep 17 00:00:00 2001
From: Romain Dolbeau <romain@dolbeau.org>
Date: Sat, 13 Nov 2021 12:41:37 +0100
Subject: [PATCH] fb stuff

---
 sbus-to-ztex-gateware-migen/cg3.fth   | 6 +++++-
 sbus-to-ztex-gateware-migen/cg6.fth   | 7 ++++++-
 sbus-to-ztex-gateware-migen/cg6_fb.py | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sbus-to-ztex-gateware-migen/cg3.fth b/sbus-to-ztex-gateware-migen/cg3.fth
index 4028487..7c9292c 100644
--- a/sbus-to-ztex-gateware-migen/cg3.fth
+++ b/sbus-to-ztex-gateware-migen/cg3.fth
@@ -105,6 +105,8 @@ headerless
 : qemu-cg3-driver-install ( -- )
   cg3-dac -1 = if
     map-regs
+	
+	fb-map
 
     \ Initial pallette taken from Sun's "Writing FCode Programs"
     h# ff h# ff h# ff h# 0  color!    \ Background white
@@ -114,7 +116,7 @@ headerless
     fb-addr to frame-buffer-adr
     default-font set-font
 
-    frame-buffer-adr encode-int " address" property
+    frame-buffer-adr encode-int " address" property \ CHECKME
 
     openbios-video-width openbios-video-height over char-width / over char-height /
     fb8-install
@@ -124,7 +126,9 @@ headerless
 : qemu-cg3-driver-remove ( -- )
   cg3-dac -1 <> if
   		  unmap-regs
+		  fb-unmap
 		  -1 to frame-buffer-adr
+		  " address" delete-attribute
   then
 ;
 
diff --git a/sbus-to-ztex-gateware-migen/cg6.fth b/sbus-to-ztex-gateware-migen/cg6.fth
index bc1810e..9be41f8 100644
--- a/sbus-to-ztex-gateware-migen/cg6.fth
+++ b/sbus-to-ztex-gateware-migen/cg6.fth
@@ -111,6 +111,7 @@ fload fbc_init.fth
 
     map-in-fbc
 	init-fbc
+	fb-map
 
     \ Initial pallette taken from Sun's "Writing FCode Programs"
     h# ff h# ff h# ff h# 0  color!    \ Background white
@@ -120,7 +121,7 @@ fload fbc_init.fth
     fb-addr to frame-buffer-adr
     default-font set-font
 
-    frame-buffer-adr encode-int " address" property
+    frame-buffer-adr encode-int " address" property \ CHECKME
 
     openbios-video-width openbios-video-height over char-width / over char-height /
     fb8-install
@@ -141,7 +142,9 @@ fload fbc_init.fth
   cg6-dac -1 <> if
   		  unmap-regs
 		  map-out-fbc
+		  fb-unmap
 		  -1 to frame-buffer-adr
+		  " address" delete-attribute
   then
 ;
 
@@ -152,6 +155,8 @@ fload fbc_init.fth
   openbios-video-height encode-int " height" property
   openbios-video-width encode-int " width" property
   line-bytes encode-int " linebytes" property
+  h# b encode-int " chiprev" property \ rev 11
+  /cg6-off-fb h# a >> encode-int " vmsize" property
 
   h# 39 encode-int 0 encode-int encode+ " intr" property
 
diff --git a/sbus-to-ztex-gateware-migen/cg6_fb.py b/sbus-to-ztex-gateware-migen/cg6_fb.py
index 329189a..7dcb3c6 100644
--- a/sbus-to-ztex-gateware-migen/cg6_fb.py
+++ b/sbus-to-ztex-gateware-migen/cg6_fb.py
@@ -181,7 +181,7 @@ class cg6(Module, AutoCSR):
                          ).Elif(bus2.cyc & bus2.stb & ~bus2.we & ~bus2.ack, #read
                                 Case(bus2.adr[0:10], {
                                     "default": [ NextValue(bus2.dat_r, 0xDEADBEEF) ],
-                                    0: [ NextValue(bus2.dat_r, 0x60500000) ], # claim revision 5
+                                    0: [ NextValue(bus2.dat_r, 0x60b00000) ], # claim revision 11 (TurboGX)
                                 }),
                                 NextValue(bus2.ack, 1),
                          ).Else(