r1423 - in cpu/x86/pc: . olpc/via

Author: wmb
Date: 2009-10-16 01:43:00 +0200 (Fri, 16 Oct 2009)
New Revision: 1423

Modified:
   cpu/x86/pc/biosints.fth
   cpu/x86/pc/olpc/via/addrs.fth
   cpu/x86/pc/olpc/via/fw.bth
   cpu/x86/pc/olpc/via/probemem.fth
Log:
OLPC trac 9486 - Added SMI and BIOS interrupt handling to XO-1.5 build.

Modified: cpu/x86/pc/biosints.fth
===================================================================
--- cpu/x86/pc/biosints.fth	2009-10-15 23:40:38 UTC (rev 1422)
+++ cpu/x86/pc/biosints.fth	2009-10-15 23:43:00 UTC (rev 1423)
@@ -481,15 +481,7 @@
    show-reads?  if  dup .  cr  then
 ;

-0 value entry-count
-: ?hack
-   entry-count dup 1+ to entry-count  1 =  if
-      hack-fix-mode
-   then
-;
-
 : bios-write-sectors  ( adr sector# #sectors -- #read )
-\   ?hack
    noshow

\ ." Write " 2 pick . over . dup .  ." -- "

Modified: cpu/x86/pc/olpc/via/addrs.fth
===================================================================
--- cpu/x86/pc/olpc/via/addrs.fth	2009-10-15 23:40:38 UTC (rev 1422)
+++ cpu/x86/pc/olpc/via/addrs.fth	2009-10-15 23:43:00 UTC (rev 1423)
@@ -77,7 +77,8 @@
 h# fd000 constant ssdt-adr

h# ffc00 constant smbios-adr
-h# fff00 constant wake-adr
+h# fff00 constant wake-adr   \ Needs to be at least h# 32 bytes - used in acpi.fth
+h# fff40 constant rm-buf     \ 8-byte buffer used by BIOS INT 15 AH=C0 for returning config info

h#  3e.0000 constant inflate-base
 h#  30.0000 constant workspace

Modified: cpu/x86/pc/olpc/via/fw.bth
===================================================================
--- cpu/x86/pc/olpc/via/fw.bth	2009-10-15 23:40:38 UTC (rev 1422)
+++ cpu/x86/pc/olpc/via/fw.bth	2009-10-15 23:43:00 UTC (rev 1423)
@@ -360,10 +360,10 @@

fload ${BP}/cpu/x86/pc/olpc/via/smbios.fth

-[ifdef] Later
-fload ${BP}/dev/geode/smi.fth
+fload ${BP}/dev/via/smi.fth
 \ fload ${BP}/cpu/x86/pc/biosload/rmenter.fth
 fload ${BP}/cpu/x86/pc/biosints.fth
+[ifdef] Later
 fload ${BP}/cpu/x86/pc/olpc/biosresume.fth
 [then]

Modified: cpu/x86/pc/olpc/via/probemem.fth
===================================================================
--- cpu/x86/pc/olpc/via/probemem.fth	2009-10-15 23:40:38 UTC (rev 1422)
+++ cpu/x86/pc/olpc/via/probemem.fth	2009-10-15 23:43:00 UTC (rev 1423)
@@ -12,6 +12,14 @@
 \ Excludes RAM assigned to the frame buffer and used by OFW page tables
 : system-ram  ( -- offset )  mem-info-pa 4 + l@  ;

+: fbphys  ( -- adr )
+   h# 6d h# 3c4 pc! h# 3c5 pc@   ( low )
+   h# 6e h# 3c4 pc! h# 3c5 pc@   ( low high )
+   bwjoin d# 21 lshift
+;
+
+: fbsize  ( -- n )  total-ram fbphys -  ;
+
 dev /memory

\ Excludes RAM already used for page tables