Changeset 3318

Timestamp:

Sep 19, 2012 9:24:54 AM (8 months ago)

Author:

wmb

Message:

OLPC ARM - send brighter/dimmer messages to the DCON driver instead of the screen driver, now that the DCON is in its own node. This fixes Data Abort problems that happened when you typed the brightness keys.

File:

• cpu/arm/olpc/build-fw.fth (modified) (2 diffs)

cpu/arm/olpc/build-fw.fth

@@ -514 +514 @@
 ;
 
+\ idt1338 rtc and ram address map
+\     00 -> 0f  rtc
+\     10 -> 3f  cmos
+
+: >rtc  ( index -- rtc-address )  h# 3f and  h# 10 +  ;
+
+: cmos@  ( index -- data )
+   >rtc " rtc@" clock-node @  ( index adr len ih )
+   ['] $call-method catch  if  4drop 0  then
+;
+: cmos!  ( data index -- )
+   >rtc " rtc!" clock-node @  ( data index adr len ih )
+   ['] $call-method catch  if  2drop 3drop  then
+;
+
+\ cmos address map
+\     80 audio volume
+\     81 audio volume
+\     82 alternate boot
+\     83 xid
+
 fload ${BP}/cpu/arm/mmp2/clocks.fth
 fload ${BP}/cpu/arm/olpc/banner.fth
@@ -640 +661 @@
 d# 6500 constant ms-factor
 
-\ idt1338 rtc and ram address map
-\     00 -> 0f  rtc
-\     10 -> 3f  cmos
-
-: >rtc  ( index -- rtc-address )  h# 3f and  h# 10 +  ;
-
-: cmos@  ( index -- data )
-   >rtc " rtc@" clock-node @  ( index adr len ih )
-   ['] $call-method catch  if  4drop 0  then
-;
-: cmos!  ( data index -- )
-   >rtc " rtc!" clock-node @  ( data index adr len ih )
-   ['] $call-method catch  if  2drop 3drop  then
-;
-
-\ cmos address map
-\     80 audio volume
-\     81 audio volume
-\     82 alternate boot
-\     83 xid
-
-: dimmer  ( -- )  screen-ih  if  " dimmer" screen-ih $call-method  then  ;
-: brighter  ( -- )  screen-ih  if  " brighter" screen-ih $call-method  then  ;
+: dimmer  ( -- )  dcon-ih  if  " dimmer" dcon-ih $call-method  then  ;
+: brighter  ( -- )  dcon-ih  if  " brighter" dcon-ih $call-method  then  ;
 
 fload ${BP}/cpu/x86/pc/olpc/sound.fth