[openfirmware] [commit] r2084 - dev

[repository service]

Author: wmb
Date: Fri Dec 17 20:44:49 2010
New Revision: 2084
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2084

Log:
OLPC trac #10558 - test-all was skipping mouse and keyboard.  Root cause was misspelling of "reg" property (bogus trailing space) introduced by svn 1992.
Also fixed the mouse driver so it works with the AVC Sentelic touchpads.

Modified:
   dev/pckbd.fth
   dev/ps2mouse.fth

Modified: dev/pckbd.fth
==============================================================================
--- dev/pckbd.fth	Fri Dec 17 05:47:37 2010	(r2083)
+++ dev/pckbd.fth	Fri Dec 17 20:44:49 2010	(r2084)
@@ -6,7 +6,7 @@
 hex
 headerless
 
-my-space " reg " integer-property
+my-space " reg" integer-property
 " keyboard"  device-name
 
 " pnpPNP,303" " compatible" string-property

Modified: dev/ps2mouse.fth
==============================================================================
--- dev/ps2mouse.fth	Fri Dec 17 05:47:37 2010	(r2083)
+++ dev/ps2mouse.fth	Fri Dec 17 20:44:49 2010	(r2084)
@@ -4,7 +4,7 @@
 " mouse"          device-name
 " mouse"          device-type
 " pnpPNP,f03" " compatible" string-property
-my-space " reg " integer-property
+my-space " reg" integer-property
 
 headerless
 : get-data  ( -- byte )  " get-data" $call-parent  ;
@@ -316,6 +316,9 @@
    then                                   ( id )
    ]unlock                                ( id )
 
+   \ Map the Sentelic ID into the mouse ID
+   dup 4 =  if  drop 0  then
+
    \ The mouse ID is supposed to be zero.
    \ If the ID is still non-zero, read the second ID byte and give up
    dup  if  clear-out-buf  then           ( error? )