[openfirmware] [commit] r2081 - in dev: . pci

[repository service]

Author: wmb
Date: Thu Dec 16 20:13:57 2010
New Revision: 2081
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2081

Log:
OLPC trac #10547 - mouse driver was broken due to bad syntax for the unit address.

Modified:
   dev/i8042.fth
   dev/pci/isakbd.fth

Modified: dev/i8042.fth
==============================================================================
--- dev/i8042.fth	Thu Dec 16 07:40:34 2010	(r2080)
+++ dev/i8042.fth	Thu Dec 16 20:13:57 2010	(r2081)
@@ -33,7 +33,13 @@
 
 \ 0 means the keyboard port, 1 means the aux port
 : encode-unit  ( n -- adr len )  if  " aux"  else  " kbd"  then  ;
-: decode-unit  ( adr len -- n )  " aux"  $=  0=  if  0  else  1  then  ;
+: decode-unit  ( adr len -- n )
+   2dup  $number  if                        ( adr len )
+      " aux"  $=  0=  if  0  else  1  then  ( n )
+   else                                     ( adr len n )
+      nip nip                               ( n )
+   then
+;
 
 \ Queues for distributing bytes sent from the two devices
 d# 100 constant /q

Modified: dev/pci/isakbd.fth
==============================================================================
--- dev/pci/isakbd.fth	Thu Dec 16 07:40:34 2010	(r2080)
+++ dev/pci/isakbd.fth	Thu Dec 16 20:13:57 2010	(r2081)
@@ -12,7 +12,7 @@
    finish-device
 
    new-device
-   " "  " 1" set-args
+   " "  " aux" set-args
    fload ${BP}/dev/ps2mouse.fth
 \   d# 12 encode-int  3 encode-int encode+  " interrupts" property
    finish-device