[openfirmware] [commit] r3318 - cpu/arm/olpc
repository service
svn at openfirmware.info
Wed Sep 19 09:24:54 CEST 2012
Author: wmb
Date: Wed Sep 19 09:24:54 2012
New Revision: 3318
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3318
Log:
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.
Modified:
cpu/arm/olpc/build-fw.fth
Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth Wed Sep 19 09:06:03 2012 (r3317)
+++ cpu/arm/olpc/build-fw.fth Wed Sep 19 09:24:54 2012 (r3318)
@@ -513,6 +513,27 @@
then
;
+\ 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
@@ -639,29 +660,8 @@
: tsc@ ( -- d.ticks ) timer0@ u>d ;
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
fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth
More information about the openfirmware
mailing list