[OpenBIOS] [PATCH 1/2] tcx.fs: update reg offsets to use proper register names
Mark Cave-Ayland
mark.cave-ayland at ilande.co.uk
Sat Sep 13 12:12:30 CEST 2014
Rather than use numerical offsets, use the proper register names as used in
the QEMU TCX hardware acceleration patch.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland at ilande.co.uk>
---
openbios-devel/drivers/tcx.fs | 132 ++++++++++++++++++++---------------------
1 file changed, 66 insertions(+), 66 deletions(-)
diff --git a/openbios-devel/drivers/tcx.fs b/openbios-devel/drivers/tcx.fs
index e1ec5ad..d682e35 100644
--- a/openbios-devel/drivers/tcx.fs
+++ b/openbios-devel/drivers/tcx.fs
@@ -72,54 +72,54 @@ fcode-version3
\ Registers
\
-h# 0 constant tcx-off1
-h# 10000 constant /tcx-off1
+h# 0 constant tcx-off-rom
+h# 10000 constant /tcx-off-rom
-h# 200000 constant tcx-off-dac
-h# 4000 constant /tcx-off-dac-24
-h# 4 constant /tcx-off-dac-8
+h# 200000 constant tcx-off-cmap
+h# 4000 constant /tcx-off-cmap-24
+h# 4 constant /tcx-off-cmap-8
-h# 240000 constant tcx-off3
-h# 4000 constant /tcx-off3-24
-h# 4 constant /tcx-off3-8
+h# 240000 constant tcx-off-dhc
+h# 4000 constant /tcx-off-dhc-24
+h# 4 constant /tcx-off-dhc-8
-h# 280000 constant tcx-off4
-h# 8000 constant /tcx-off4-24
-h# 1 constant /tcx-off4-8
+h# 280000 constant tcx-off-alt
+h# 8000 constant /tcx-off-alt-24
+h# 1 constant /tcx-off-alt-8
-h# 301000 constant tcx-off5-24
-h# 300000 constant tcx-off5-8
-h# 1000 constant /tcx-off5-24
-h# 81c constant /tcx-off5-8
+h# 301000 constant tcx-off-thc-24
+h# 300000 constant tcx-off-thc-8
+h# 1000 constant /tcx-off-thc-24
+h# 81c constant /tcx-off-thc-8
-h# 700000 constant tcx-off6
-h# 1000 constant /tcx-off6
+h# 700000 constant tcx-off-tec
+h# 1000 constant /tcx-off-tec
-h# 800000 constant tcx-off-fb
-h# 100000 constant /tcx-off-fb
+h# 800000 constant tcx-off-dfb8
+h# 100000 constant /tcx-off-dfb8
-h# 2000000 constant tcx-off8
-h# 400000 constant /tcx-off8-24
-h# 1 constant /tcx-off8-8
+h# 2000000 constant tcx-off-dfb24
+h# 400000 constant /tcx-off-dfb24-24
+h# 1 constant /tcx-off-dfb24-8
-h# 4000000 constant tcx-off9
-h# 400000 constant /tcx-off9-24
-h# 1 constant /tcx-off9-8
+h# 4000000 constant tcx-off-stip
+h# 400000 constant /tcx-off-stip-24
+h# 1 constant /tcx-off-stip-8
-h# 6000000 constant tcx-off10
-h# 800000 constant /tcx-off10
+h# 6000000 constant tcx-off-blit
+h# 800000 constant /tcx-off-blit
-h# a000000 constant tcx-off11
-h# 400000 constant /tcx-off11-24
-h# 1 constant /tcx-off11-8
+h# a000000 constant tcx-off-rdfb32
+h# 400000 constant /tcx-off-rdfb32-24
+h# 1 constant /tcx-off-rdfb32-8
-h# c000000 constant tcx-off12
-h# 800000 constant /tcx-off12-24
-h# 1 constant /tcx-off12-8
+h# c000000 constant tcx-off-rstip
+h# 800000 constant /tcx-off-rstip-24
+h# 1 constant /tcx-off-rstip-8
-h# e000000 constant tcx-off13
-h# 800000 constant /tcx-off13-24
-h# 1 constant /tcx-off13-8
+h# e000000 constant tcx-off-rblit
+h# 800000 constant /tcx-off-rblit-24
+h# 1 constant /tcx-off-rblit-8
: >tcx-reg-spec ( offset size -- encoded-reg )
>r 0 my-address d+ my-space encode-phys r> encode-int encode+
@@ -127,37 +127,37 @@ h# 1 constant /tcx-off13-8
: tcx-8bit-reg
\ WARNING: order is important (at least to Solaris)
- tcx-off-fb /tcx-off-fb >tcx-reg-spec
- tcx-off8 /tcx-off8-8 >tcx-reg-spec encode+
- tcx-off9 /tcx-off9-8 >tcx-reg-spec encode+
- tcx-off10 /tcx-off10 >tcx-reg-spec encode+
- tcx-off11 /tcx-off11-8 >tcx-reg-spec encode+
- tcx-off12 /tcx-off12-8 >tcx-reg-spec encode+
- tcx-off13 /tcx-off13-8 >tcx-reg-spec encode+
- tcx-off6 /tcx-off6 >tcx-reg-spec encode+
- tcx-off-dac /tcx-off-dac-8 >tcx-reg-spec encode+
- tcx-off5-8 /tcx-off5-8 >tcx-reg-spec encode+
- tcx-off1 /tcx-off1 >tcx-reg-spec encode+
- tcx-off3 /tcx-off3-8 >tcx-reg-spec encode+
- tcx-off4 /tcx-off4-8 >tcx-reg-spec encode+
+ tcx-off-dfb8 /tcx-off-dfb8 >tcx-reg-spec
+ tcx-off-dfb24 /tcx-off-dfb24-8 >tcx-reg-spec encode+
+ tcx-off-stip /tcx-off-stip-8 >tcx-reg-spec encode+
+ tcx-off-blit /tcx-off-blit >tcx-reg-spec encode+
+ tcx-off-rdfb32 /tcx-off-rdfb32-8 >tcx-reg-spec encode+
+ tcx-off-rstip /tcx-off-rstip-8 >tcx-reg-spec encode+
+ tcx-off-rblit /tcx-off-rblit-8 >tcx-reg-spec encode+
+ tcx-off-tec /tcx-off-tec >tcx-reg-spec encode+
+ tcx-off-cmap /tcx-off-cmap-8 >tcx-reg-spec encode+
+ tcx-off-thc-8 /tcx-off-thc-8 >tcx-reg-spec encode+
+ tcx-off-rom /tcx-off-rom >tcx-reg-spec encode+
+ tcx-off-dhc /tcx-off-dhc-8 >tcx-reg-spec encode+
+ tcx-off-alt /tcx-off-alt-8 >tcx-reg-spec encode+
" reg" property
;
: tcx-24bit-reg
\ WARNING: order is important (at least to Solaris)
- tcx-off-fb /tcx-off-fb >tcx-reg-spec
- tcx-off8 /tcx-off8-24 >tcx-reg-spec encode+
- tcx-off9 /tcx-off9-24 >tcx-reg-spec encode+
- tcx-off10 /tcx-off10 >tcx-reg-spec encode+
- tcx-off11 /tcx-off11-24 >tcx-reg-spec encode+
- tcx-off12 /tcx-off12-24 >tcx-reg-spec encode+
- tcx-off13 /tcx-off13-24 >tcx-reg-spec encode+
- tcx-off6 /tcx-off6 >tcx-reg-spec encode+
- tcx-off-dac /tcx-off-dac-24 >tcx-reg-spec encode+
- tcx-off5-24 /tcx-off5-24 >tcx-reg-spec encode+
- tcx-off1 /tcx-off1 >tcx-reg-spec encode+
- tcx-off3 /tcx-off3-24 >tcx-reg-spec encode+
- tcx-off4 /tcx-off4-24 >tcx-reg-spec encode+
+ tcx-off-dfb8 /tcx-off-dfb8 >tcx-reg-spec
+ tcx-off-dfb24 /tcx-off-dfb24-24 >tcx-reg-spec encode+
+ tcx-off-stip /tcx-off-stip-24 >tcx-reg-spec encode+
+ tcx-off-blit /tcx-off-blit >tcx-reg-spec encode+
+ tcx-off-rdfb32 /tcx-off-rdfb32-24 >tcx-reg-spec encode+
+ tcx-off-rstip /tcx-off-rstip-24 >tcx-reg-spec encode+
+ tcx-off-rblit /tcx-off-rblit-24 >tcx-reg-spec encode+
+ tcx-off-tec /tcx-off-tec >tcx-reg-spec encode+
+ tcx-off-cmap /tcx-off-cmap-24 >tcx-reg-spec encode+
+ tcx-off-thc-24 /tcx-off-thc-24 >tcx-reg-spec encode+
+ tcx-off-rom /tcx-off-rom >tcx-reg-spec encode+
+ tcx-off-dhc /tcx-off-dhc-24 >tcx-reg-spec encode+
+ tcx-off-alt /tcx-off-alt-24 >tcx-reg-spec encode+
" reg" property
;
@@ -198,11 +198,11 @@ headerless
\
: dac-map
- tcx-off-dac /tcx-dac do-map-in to tcx-dac
+ tcx-off-cmap /tcx-dac do-map-in to tcx-dac
;
: fb-map
- tcx-off-fb h# c0000 do-map-in to fb-addr
+ tcx-off-dfb8 h# c0000 do-map-in to fb-addr
;
: map-regs
@@ -240,11 +240,11 @@ headerless
\ Handle differences between 8-bit/24-bit mode
depth-bits 8 = if
tcx-8bit-reg
- /tcx-off-dac-8 to /tcx-dac
+ /tcx-off-cmap-8 to /tcx-dac
" true" encode-string " tcx-8-bit" property
else
tcx-24bit-reg
- /tcx-off-dac-24 to /tcx-dac
+ /tcx-off-cmap-24 to /tcx-dac
\ Even with a 24-bit enabled TCX card, the control plane is
\ used in 8-bit mode. So force the video subsystem into 8-bit
--
1.7.10.4
More information about the OpenBIOS
mailing list