[openfirmware] [commit] r2087 - in cpu/x86/pc/olpc: . via

[repository service]

Author: wmb
Date: Mon Dec 20 21:54:30 2010
New Revision: 2087
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2087

Log:
OLPC - factored game key button names into a separate file so the XO-1.75 implementation of game-key@ can use the symbolic names.

Added:
   cpu/x86/pc/olpc/gamekeynames.fth
Modified:
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/gamekeys.fth
   cpu/x86/pc/olpc/via/fw.bth

Modified: cpu/x86/pc/olpc/fw.bth
==============================================================================
--- cpu/x86/pc/olpc/fw.bth	Sun Dec 19 18:02:27 2010	(r2086)
+++ cpu/x86/pc/olpc/fw.bth	Mon Dec 20 21:54:30 2010	(r2087)
@@ -343,6 +343,7 @@
 \ fload ${BP}/cpu/x86/pc/olpc/carousel.fth     \ Carouseled NAND writing
 fload ${BP}/cpu/x86/pc/olpc/crypto.fth       \ Cryptographic image validation
 fload ${BP}/cpu/x86/pc/olpc/lzip.fth         \ Access zip images from memory
+fload ${BP}/cpu/x86/pc/olpc/gamekeynames.fth
 fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth
 
 : emacs  ( -- )

Added: cpu/x86/pc/olpc/gamekeynames.fth
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ cpu/x86/pc/olpc/gamekeynames.fth	Mon Dec 20 21:54:30 2010	(r2087)
@@ -0,0 +1,16 @@
+purpose: Symbolic names for game key bitmasks
+
+\ These bitmasks directly match the values returned by the EC
+\ "game-key@" command on XO-1 and XO-1.5 hardware.  For later
+\ hardware with different game key access methods, the hardware
+\ bit masks are translated into these values.
+
+h#   1 constant button-square
+h#   2 constant button-check
+h#   4 constant rocker-up
+h#   8 constant rocker-down
+h#  10 constant rocker-left
+h#  20 constant rocker-right
+h#  40 constant button-rotate
+h#  80 constant button-o
+h# 100 constant button-x

Modified: cpu/x86/pc/olpc/gamekeys.fth
==============================================================================
--- cpu/x86/pc/olpc/gamekeys.fth	Sun Dec 19 18:02:27 2010	(r2086)
+++ cpu/x86/pc/olpc/gamekeys.fth	Mon Dec 20 21:54:30 2010	(r2087)
@@ -1,15 +1,5 @@
 purpose: Access to game keys (buttons on front panel)
 
-h#   1 constant button-square
-h#   2 constant button-check
-h#   4 constant rocker-up
-h#   8 constant rocker-down
-h#  10 constant rocker-left
-h#  20 constant rocker-right
-h#  40 constant button-rotate
-h#  80 constant button-o
-h# 100 constant button-x
-
 0 value game-key-mask
 
 : show-key  ( mask x y -- )

Modified: cpu/x86/pc/olpc/via/fw.bth
==============================================================================
--- cpu/x86/pc/olpc/via/fw.bth	Sun Dec 19 18:02:27 2010	(r2086)
+++ cpu/x86/pc/olpc/via/fw.bth	Mon Dec 20 21:54:30 2010	(r2087)
@@ -382,6 +382,7 @@
 fload ${BP}/cpu/x86/pc/olpc/crypto.fth       \ Cryptographic image validation
 fload ${BP}/cpu/x86/pc/olpc/lzip.fth         \ Access zip images from memory
 
+fload ${BP}/cpu/x86/pc/olpc/gamekeynames.fth
 fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth
 
 : emacs  ( -- )