OpenBIOS January 2008

openbios@openbios.org

11 participants
52 discussions

by svn＠openbios.org

Author: wmb Date: 2008-01-28 05:19:49 +0100 (Mon, 28 Jan 2008) New Revision: 794 Modified: cpu/x86/pc/biosload/callbios.fth cpu/x86/pc/biosload/fw.bth cpu/x86/pc/biosload/rmenter.fth Log: BIOSload version - checkpoint of BIOS gateway code. Modified: cpu/x86/pc/biosload/callbios.fth =================================================================== --- cpu/x86/pc/biosload/callbios.fth 2008-01-28 04:18:50 UTC (rev 793) +++ cpu/x86/pc/biosload/callbios.fth 2008-01-28 04:19:49 UTC (rev 794) @@ -9,42 +9,41 @@ \ We assume that we can use memory from h# 200 to h# 3ff -\ Bounce buffer at h# 90000 - h# 8 constant rm-code-desc h# 18 constant rm-data-desc h# 20 constant pm-code-desc h# 28 constant pm-data-desc -h# 002 constant rm-flagval \ Flags for IRET +h# 002 constant bios-flagval \ Flags for IRET \ Low-memory addresses -h# 200 constant rm-go \ Real mode enter code -h# 280 constant rm-return \ Real mode return code -h# 300 constant rm-idt \ For loading RM IDT with LIDT -h# 308 constant rm-sp \ For loading RM SP with LSS +h# 200 constant 'bios-call \ Real mode enter code +h# 280 constant 'bios-ret \ Real mode return code +h# 300 constant 'bios-idt \ For loading RM IDT with LIDT +h# 308 constant 'bios-sp \ For loading RM SP with LSS h# 30c constant pm-sp-save \ Save/restore area for PM SP h# 310 constant pm-gdt-save \ For loading PM GDT with LGDT h# 318 constant pm-idt-save \ For loading PM IDT with LIDT -h# 3c0 constant rm-regs \ Real-mode register buffer (in/out) -rm-regs constant rm-gs -rm-gs wa1+ constant rm-fs -rm-fs wa1+ constant rm-es -rm-es wa1+ constant rm-ds -rm-ds wa1+ constant rm-di -rm-di la1+ constant rm-si -rm-si la1+ constant rm-bp -rm-bp la1+ constant rm-xx \ Would be stack pointer -rm-xx la1+ constant rm-bx -rm-bx la1+ constant rm-dx -rm-dx la1+ constant rm-cx -rm-cx la1+ constant rm-ax -rm-ax la1+ constant rm-flags -rm-flags la1+ constant rm-target \ Full pointer for RM call target address -rm-target la1+ constant rm-retloc \ Full pointer to rm-return -rm-retloc la1+ constant rm-rflags \ Flags in case of return via IRET -label rmint-enter +h# 3c0 constant bios-regs \ Real-mode register buffer (in/out) +bios-regs constant bios-gs +bios-gs wa1+ constant bios-fs +bios-fs wa1+ constant bios-es +bios-es wa1+ constant bios-ds +bios-ds wa1+ constant bios-di \ offset decimal 8 +bios-di la1+ constant bios-si +bios-si la1+ constant bios-bp +bios-bp la1+ constant bios-xx \ Would be stack pointer +bios-xx la1+ constant bios-bx +bios-bx la1+ constant bios-dx +bios-dx la1+ constant bios-cx +bios-cx la1+ constant bios-ax +bios-ax la1+ constant bios-flags \ offset decimal 40 +bios-flags la1+ constant bios-target \ Full pointer for RM call target address +bios-target la1+ constant bios-retloc \ Full pointer to 'bios-ret +bios-retloc la1+ constant bios-rflags \ Flags in case of return via IRET + +label bios-call real-mode \ This must be copied to low memory @@ -54,25 +53,25 @@ pm-gdt-save #) sgdt \ So we can get back pm-idt-save #) sidt \ So we can get back - rm-idt #) lidt + 'bios-idt #) lidt cr0 ax mov h# fe # al and ax cr0 mov \ Enter real mode - here 5 + rmint-enter - rm-go + 0 #) far jmp \ Jump to set cs + here 5 + bios-call - 'bios-call + 0 #) far jmp \ Jump to set cs \ Now we are running in real mode; fix segments again cs ax mov ax ds mov ax es mov ax fs mov ax gs mov - rm-sp #) sp lss + 'bios-sp #) sp lss - \ Load the 16-bit registers from the rm-regs area + \ Load the 16-bit registers from the bios-regs area gs pop fs pop es pop ds pop op: popa op: popf far ret \ Now we are running the real-mode target code end-code -here rmint-enter - constant /rmint-enter +here bios-call - constant /bios-call -label rmint-exit - rm-target # sp mov \ Set the stack pointer to the top of the rm reg area +label bios-ret + bios-target # sp mov \ Set the stack pointer to the top of the rm reg area \ Copy the real-mode registers to the buffer op: pushf op: pusha ds push es push fs push gs push @@ -83,7 +82,7 @@ op: pm-gdt-save #) lgdt cr0 ax mov 1 # al or ax cr0 mov - here 5 + rmint-exit - rm-return + pm-code-desc #) far jmp + here 5 + bios-ret - 'bios-ret + pm-code-desc #) far jmp protected-mode @@ -94,10 +93,10 @@ popf popa c; -here rmint-exit - constant /rmint-exit +here bios-ret - constant /bios-ret \ Must set up the registers area with register values and the target address -code rm-call ( -- ) +code }bios ( -- ) pusha pushf @@ -105,108 +104,130 @@ cld cli sp sp xor - rm-go rm-code-desc #) far jmp + 'bios-call rm-code-desc #) far jmp c; : >seg:off ( linear -- offset segment ) lwsplit d# 12 lshift ; : seg:off! ( linear adr -- ) >r >seg:off r@ 2+ w! r> w! ; +: seg:off> ( offset segment -- linear ) 4 lshift + ; +: seg:off@ ( adr -- linear ) dup w@ swap wa1+ w@ seg:off> ; 0 value bios-prepped? : ?prep-bios-call ( -- ) bios-prepped? if exit then true to bios-prepped? - rmint-enter rm-go /rmint-enter move - rmint-exit rm-return /rmint-exit move - h# ffff rm-idt w! - 0 rm-idt 2+ l! - rm-regs rm-sp seg:off! \ Setup real-mode full pointer for lss - rm-return rm-retloc seg:off! \ Setup return address full pointer - rm-flagval rm-retloc 4 + w! \ Flags for return + bios-call 'bios-call /bios-call move + bios-ret 'bios-ret /bios-ret move + h# ffff 'bios-idt w! + 0 'bios-idt 2+ l! + bios-regs 'bios-sp seg:off! \ Setup real-mode full pointer for lss + 'bios-ret bios-retloc seg:off! \ Setup return address full pointer + bios-flagval bios-retloc 4 + w! \ Flags for return ; -: dr - ." ax: " rm-ax ? 2 spaces - ." bx: " rm-bx ? 2 spaces - ." cx: " rm-cx ? 2 spaces - ." dx: " rm-dx ? 2 spaces - ." bp: " rm-bp ? 2 spaces - ." si: " rm-si ? 2 spaces - ." di: " rm-di ? 2 spaces +: .bios-regs + ." ax: " bios-ax ? 2 spaces + ." bx: " bios-bx ? 2 spaces + ." cx: " bios-cx ? 2 spaces + ." dx: " bios-dx ? 2 spaces + ." bp: " bios-bp ? 2 spaces + ." si: " bios-si ? 2 spaces + ." di: " bios-di ? 2 spaces + cr + ." ds: " bios-ds w@ . 2 spaces + ." es: " bios-es w@ . 2 spaces + ." fs: " bios-fs w@ . 2 spaces + ." gs: " bios-gs w@ . 2 spaces + ." flags: " bios-flags ? + cr ; -: { ( int# -- ) ?prep-bios-call rm-regs d# 44 erase 4 * @ rm-target ! ; -: } rm-call ; +: bios{ ( int# -- ) ?prep-bios-call bios-regs d# 44 erase 4 * @ bios-target ! ; -: ax rm-ax ! ; -: ah rm-ax 1+ c! ; -: al rm-ax c! ; -: bx rm-bx l! ; -: cx rm-cx l! ; -: dx rm-dx l! ; -: cf@ rm-flags @ 1 and ; -: es:di >seg:off rm-es w! rm-di l! ; +: ax bios-ax ! ; +: ah bios-ax 1+ c! ; +: al bios-ax c! ; +: bx bios-bx l! ; +: cx bios-cx l! ; +: dx bios-dx l! ; +: cf@ bios-flags @ 1 and ; +: es:di >seg:off bios-es w! bios-di l! ; + +\ Video - INT 10 : video-mode ( mode# -- ) - d# 55 set-tick-limit h# 10 { 3 al bx } d# 10 set-tick-limit + d# 55 set-tick-limit h# 10 bios{ 3 al bx }bios d# 10 set-tick-limit ; : text-mode 3 video-mode ; : 1024x768x8 h# 105 video-mode ; : 1024x768x16 h# 116 video-mode ; -: apm-connect16 h# 15 { h# 5302 ax 0 bx } ; -: apm-power-off apm-connect16 h# 15 { h# 5307 ax 1 bx 3 cx } ; +: apm-connect16 h# 15 bios{ h# 5302 ax 0 bx }bios ; +: apm-power-off apm-connect16 h# 15 bios{ h# 5307 ax 1 bx 3 cx }bios ; + +\ Memory map - INT 15 : bios-memsize ( -- n ) - h# 15 { h# e801 ax } - rm-ax @ h# 400 * rm-bx @ h# 10000 * + h# 100000 + + h# 15 bios{ h# e801 ax }bios + bios-ax @ h# 400 * bios-bx @ h# 10000 * + h# 100000 + ; : .bios-memory-map ( -- ) 0 begin ( continuation ) - h# 15 { bx h# e820 ax h# 10000 es:di d# 20 cx " PAMS" drop @ dx } - rm-flags @ 1 and abort" Not supported" - rm-cx @ - h# 10000 rm-cx @ bounds ?do i @ 9 u.r 4 +loop cr - rm-bx @ ( continuation' ) + h# 15 bios{ bx h# e820 ax h# 10000 es:di d# 20 cx " PAMS" drop @ dx }bios + bios-flags @ 1 and abort" Not supported" + h# 10000 bios-cx @ bounds ?do i @ 9 u.r 4 +loop cr + bios-bx @ ( continuation' ) ?dup 0= until ; -: bios-config-b@ ( adr -- b ) lwsplit h# 1a { h# b108 ax bx rm-di ! } rm-cx @ ; -: bios-config-w@ ( adr -- w ) lwsplit h# 1a { h# b109 ax bx rm-di ! } rm-cx @ ; -: bios-config-l@ ( adr -- l ) lwsplit h# 1a { h# b10a ax bx rm-di ! } rm-cx @ ; -: bios-config-b! ( b adr -- ) lwsplit h# 1a { h# b10b ax bx rm-di ! rm-cx ! } ; -: bios-config-w! ( w adr -- ) lwsplit h# 1a { h# b10c ax bx rm-di ! rm-cx ! } ; -: bios-config-l! ( l adr -- ) lwsplit h# 1a { h# b10d ax bx rm-di ! rm-cx ! } ; -: disk-status ( -- stat ) h# 13 { h# 0100 ax } rm-ax @ ; + +\ PCI BIOS - INT 1A +: (bios-config@) ( adr axval -- n ) + h# 1a bios{ ax lwsplit bx bios-di ! }bios bios-cx @ +; +: (bios-config!) ( n adr axval -- ) + h# 1a bios{ ax lwsplit bx bios-di ! bios-cx ! }bios +; + +: bios-config-b@ ( adr -- b ) h# b108 (bios-config@) ; +: bios-config-w@ ( adr -- w ) h# b109 (bios-config@) ; +: bios-config-l@ ( adr -- l ) h# b10a (bios-config@) ; +: bios-config-b! ( b adr -- ) h# b10b (bios-config!) ; +: bios-config-w! ( w adr -- ) h# b10c (bios-config!) ; +: bios-config-l! ( l adr -- ) h# b10d (bios-config!) ; + +\ Disk access - INT 13 +: disk-status ( -- stat ) h# 13 bios{ h# 0100 ax }bios bios-ax @ ; + 0 value #sects 0 value #cyls 0 value #heads : get-drive-params ( -- ) - h# 13 { 8 ah h# 80 dx } - rm-flags @ 1 and if true exit then - rm-cx @ wbsplit ( cl ch ) - over h# 3f and to #sects ( cl ch ) - swap 6 rshift bwjoin 1+ to #cyls ( ) - rm-dx @ 8 rshift 1+ to #heads ( ) + h# 13 bios{ 8 ah h# 80 dx }bios + bios-flags @ 1 and if true exit then + bios-cx @ wbsplit ( cl ch ) + over h# 3f and to #sects ( cl ch ) + swap 6 rshift bwjoin 1+ to #cyls ( ) + bios-dx @ 8 rshift 1+ to #heads ( ) ; : #drive-sectors ( -- n ) - h# 13 { h# 15 ah h# 80 dx } - rm-dx @ rm-cx @ wljoin + h# 13 bios{ h# 15 ah h# 80 dx }bios + bios-dx @ bios-cx @ wljoin ; -: reset-disks ( -- ) h# 13 { 0 ah h# 80 dx } ; -: reset-hard-disks ( -- ) h# 13 { h# 0d ah h# 80 dx } ; -: do-rw ( sector1 cyl0 head0 drive0 #sectors ah-val -- ) - h# 13 { ah al ( sector1 cyl0 head0 drive0 ) - swap bwjoin dx ( sector1 cyl0 ) - wbsplit ( sector1 cyl.lo cyl.hi ) - 6 lshift rot or ( cyl.lo cyl.hi|sector ) +: reset-disks ( -- ) h# 13 bios{ 0 ah h# 80 dx }bios ; +: reset-hard-disks ( -- ) h# 13 bios{ h# 0d ah h# 80 dx }bios ; +: bios-rw ( sector1 head0 cyl0 drive0 #sectors ah-val -- ) + h# 13 bios{ ah al ( sector1 head0 cyl0 drive0 ) + rot bwjoin dx ( sector1 cyl0 ) + wbsplit ( sector1 cyl.lo cyl.hi ) + 6 lshift rot or ( cyl.lo cyl.hi|sector ) swap bwjoin cx - h# 10000 >seg:off rm-es w! bx - } + h# 10000 >seg:off bios-es w! bx + }bios ; -: read-sectors ( sector1 cyl0 head0 drive0 #sectors -- ) 2 do-rw ; -: write-sectors ( sector1 cyl0 head0 drive0 #sectors -- ) 3 do-rw ; +: bios-read-sectors ( sector1 head0 cyl0 drive0 #sectors -- ) 2 bios-rw ; +: bios-write-sectors ( sector1 head0 cyl0 drive0 #sectors -- ) 3 bios-rw ; -: lbn>sch ( lbn -- sector cyl head ) - #sects /mod swap 1+ swap ( sector rem ) - #heads /mod ( sector head cyl ) - dup #cyls > abort" LBN out of range" - swap ( sector cyl head ) +: lbn>shc ( lbn -- sector head cyl ) + #sects /mod swap 1+ swap ( sector rem ) + #heads /mod ( sector head cyl ) + dup #cyls > abort" LBN out of range" ( sector head cyl ) ; -: lbn-read-sectors ( lbn drive #sectors -- ) 2>r lbn>sch 2r> read-sectors ; -: lbn-write-sectors ( lbn drive #sectors -- ) 2>r lbn>sch 2r> write-sectors ; +: lbn-read-sectors ( lbn drive #sectors -- ) 2>r lbn>shc 2r> bios-read-sectors ; +: lbn-write-sectors ( lbn drive #sectors -- ) 2>r lbn>shc 2r> bios-write-sectors ; Modified: cpu/x86/pc/biosload/fw.bth =================================================================== --- cpu/x86/pc/biosload/fw.bth 2008-01-28 04:18:50 UTC (rev 793) +++ cpu/x86/pc/biosload/fw.bth 2008-01-28 04:19:49 UTC (rev 794) @@ -206,7 +206,7 @@ ; fload ${BP}/cpu/x86/pc/biosload/usb.fth -\ fload ${BP}/cpu/x86/pc/biosload/callbios.fth +fload ${BP}/cpu/x86/pc/biosload/callbios.fth fload ${BP}/cpu/x86/pc/biosload/rmenter.fth \ false to stand-init-debug? @@ -275,7 +275,7 @@ warning on only forth also definitions - install-alarm +\ install-alarm #line off @@ -323,6 +323,7 @@ .( Saving fw.img ...) " fw.img" RAMbase save-abs-rom cr + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: cpu/x86/pc/biosload/rmenter.fth =================================================================== --- cpu/x86/pc/biosload/rmenter.fth 2008-01-28 04:18:50 UTC (rev 793) +++ cpu/x86/pc/biosload/rmenter.fth 2008-01-28 04:19:49 UTC (rev 794) @@ -1,3 +1,4 @@ +[ifndef] >seg:off : >seg:off ( linear -- offset segment ) lwsplit d# 12 lshift ; : seg:off! ( linear adr -- ) >r >seg:off r@ wa1+ w! r> w! ; : seg:off> ( offset segment -- linear ) 4 lshift + ; @@ -2,2 +3,3 @@ : seg:off@ ( adr -- linear ) dup w@ swap wa1+ w@ seg:off> ; +[then] @@ -27,8 +29,11 @@ h# 0.0000 constant rm-base : +rm ( offset -- adr ) rm-base + ; +\ The real-mode stack pointer will start here +h# f00 +rm constant 'rm-stack +\ h# ef0 +rm constant 'rm-dispatch + \ Place for the initial registers upon entry to real mode. -\ The real-mode stack pointer will start here h# f00 +rm constant 'rm-regs \ (00) 4 * 2: GS,FS,ES,DS \ (08) 8 * 4: EDI,ESI,EBP,ESP,EBX,EDX,ECX,EAX @@ -97,8 +102,25 @@ : rm-flags! caller-regs >rm-flags w! ; : rm-set-cf rm-flags@ 1 or rm-flags! ; -: rm-clr-cf rm-flags@ 1 or rm-flags! ; +: rm-clr-cf rm-flags@ 1 invert and rm-flags! ; +true value show-rm-int? +: noshow false to show-rm-int? ; +variable save-eax +: snap-int + true to show-rm-int? caller-regs >rm-eax @ save-eax ! +; +: showint + ." INT " 'rm-int w@ . save-eax @ wbsplit ." AH " . ." AL " . cr +; +: ?showint show-rm-int? if showint then ; + +h# 80 constant /vectors + +/vectors buffer: saved-rm-vectors +/vectors buffer: saved-ofw-vectors + + \ 80ff0 is the target address of the interrupt vector \ We use different segment:offset representations of that address in \ the vector table, so the handler code can determine the vector @@ -108,13 +130,29 @@ \ ... \ ff: 80ff:0000 +: grab-rm-vector ( vector# -- ) + >r + h# ff0 r@ 4 lshift - r@ /l* w! \ Set offset + rm-base 4 rshift r@ + r> /l* wa1+ w! \ Set segment +; +: ungrab-rm-vector ( vector# -- ) + saved-rm-vectors over la+ l@ ( vector# value ) + swap /l* l! +; : make-vector-table ( -- ) - h# 100 0 do - h# ff0 i 4 lshift - i /l* w! \ Set offset - rm-base 4 rshift i + i /l* wa1+ w! \ Set segment - loop + h# 100 0 do i grab-rm-vector loop ; +label timer-off + real-mode + ax push + h# 21 # al in + 1 # al or + al h# 21 # out + ax pop + iret +end-code + label rm-to-pm real-mode @@ -205,40 +243,123 @@ end-code here rm-enter - constant /rm-enter -h# 400 buffer: saved-rm-vectors +: restore-vector ( int# -- ) + saved-rm-vectors over la+ l@ swap /l* l! +; 0 value rm-prepped? +: move-gdt ( -- ) + gdtr@ 1+ ( gdt-adr gdt-len ) + +\ dup h# 10 + alloc-mem h# f + h# f invert and ( gdt-adr gdt-len new-gdt ) + h# 900 + + swap 2dup 2>r move 2r> ( new-gdt gdt-len ) + 1- gdtr! +; +0 value kbd-ih + +: bios-vectors ( -- ) + 0 saved-ofw-vectors /vectors move + saved-rm-vectors 0 /vectors move +; +: ofw-vectors ( -- ) +\ 0 saved-ofw-vectors /vectors move + saved-ofw-vectors 0 /vectors move +; +: regs>bios ( -- ) + caller-regs bios-regs d# 40 move + rm-flags@ bios-flags l! + 'rm-int w@ /l* @ bios-target ! +; +: bios>regs ( -- ) + bios-regs caller-regs d# 40 move + bios-flags l@ rm-flags! +; +: use-bios ( -- ) + bios-vectors + ?prep-bios-call + regs>bios + }bios + bios>regs + ofw-vectors +; + : prep-rm ( -- ) rm-prepped? if exit then true to rm-prepped? fix-gdt - 0 saved-rm-vectors h# 400 move - make-vector-table + move-gdt + rm-enter 'rm-enter /rm-enter move rm-to-pm 'rm-to-pm /rm-to-pm move pm-to-rm 'pm-to-rm /pm-to-rm move + 0 saved-rm-vectors /vectors move + +[ifdef] syslinux-loaded + 7 h# 1.0004 config-w! + + h# 10 grab-rm-vector \ Video + h# 11 grab-rm-vector \ Sysinfo + h# 12 grab-rm-vector \ Low memory size + h# 13 grab-rm-vector \ Disk I/O +\ h# 15 grab-rm-vector \ Various system stuff + h# 16 grab-rm-vector \ Keyboard + h# 1a grab-rm-vector \ PCI BIOS +[else] + make-vector-table + + saved-rm-vectors 8 la+ l@ 0 8 la+ l! \ Use BIOS timer tick handler + saved-rm-vectors h# 1c la+ l@ 0 h# 1c la+ l! \ Timer handler chain +[then] + +\ \ Set up a rudimentary handler for the ISA timer +\ timer-off 'rm-timer-off /rm-timer-off move +\ 'rm-timer-off 0 8 la+ seg:off! + h# ffff 'rm-idt w! 0 'rm-idt wa1+ l! \ Limit and base + + " keyboard" open-dev to kbd-ih ; : rm-init-program ( pc -- ) prep-rm 'rm-regs h# 2e erase ( pc ) 'rm-regs h# 28 + seg:off! ( ) - 'rm-regs 'rm-sp seg:off! \ Initial stack pointer below regs + 'rm-stack 'rm-sp seg:off! \ Initial stack pointer below regs ; +: !font ( adr -- ) + >seg:off caller-regs >rm-es w! caller-regs >rm-ebp l! + h# 10 rm-cx! h# 18 rm-dx! +; : get-font ( -- ) rm-al@ h# 30 = if ." Int 10 get-font called - BH = " rm-bh@ . cr + rm-bh@ case +\ These numbers are cheats, pointing into the VIA BIOS + 2 of h# c69e0 !font endof + 3 of h# c6138 !font endof + 4 of h# c6538 !font endof + 5 of h# c69e0 !font endof + 6 of h# c77e0 !font endof + 7 of h# c77e0 !font +h# 10 ungrab-rm-vector +endof + ( default ) ." Unsupported get font - BH = " dup . cr rm-set-cf + endcase else ." Int 10 set-font called" cr then ; -: video-int ( -- ) +: set-cursor ( -- ) rm-dh@ rm-dl@ ( row column ) 2drop ; + +: video-int ( -- ) \ INT 10 rm-ah@ case h# 0 of ( rm-al@ set-video-mode ) endof \ Set mode - Should blank the screen + h# 2 of set-cursor endof h# a of rm-al@ emit endof \ Write character h# e of rm-al@ emit endof \ Write character h# 11 of get-font endof \ get or set font @@ -248,13 +369,29 @@ ( default ) ." Unimplemented video int - AH = " dup . cr rm-set-cf endcase ; -: sysinfo-int ( -- ) h# 26 rm-ax! ; +: bios-video-int debug-me use-bios ; +: sysinfo-int ( -- ) \ INT 11 + \ h# 4226 caller-regs >rm-eax ! \ to report 1 parallel and 1 serial port + h# 26 caller-regs >rm-eax ! \ 32 bits +; + 0 value disk-ih : disk-read-sectors ( adr sector# #sectors -- #read ) +noshow +\ ." Read " 2 pick . over . dup . ." -- " +\ over h# 8b74aaa = if debug-me then " read-blocks" disk-ih $call-method +\ dup . cr ; +: disk-write-sectors ( adr sector# #sectors -- #read ) +\ ." Write " 2 pick . over . dup . ." -- " +\ over h# 8b74aaa = if debug-me then + " write-blocks" disk-ih $call-method +\ dup . cr +; + 0 [if] h# 200 constant /sector : disk-seek ( sector# -- error? ) @@ -274,8 +411,9 @@ rm-dl@ h# 80 <> if rm-set-cf 7 rm-ah! true exit then disk-ih if false exit then \ " disk:0" open-dev to disk-ih - " /ide@0" open-dev to disk-ih + " /pci/ide@0" open-dev to disk-ih disk-ih dup 0= if rm-set-cf h# aa rm-ah! then + false ; : read-sectors ( -- ) check-drive if exit then @@ -292,13 +430,15 @@ \ rm-bx@ caller-regs >rm-es w@ seg:off> rm-al@ ( adr #sectors ) \ disk-read rm-al! ; +: drive-sectors ( -- n ) " #blocks" disk-ih $call-method ; : drive-params ( -- ) check-drive if exit then \ " size" disk-ih $call-method ( d.#bytes ) \ /sector um/mod nip ( #sectors ) - " #blocks" disk-ih $call-method ( #sectors ) + drive-sectors ( #sectors ) h# 3f / ( #tracks ) h# ff / 1- ( maxcyl ) \ Max 255 heads is traditional +\ dup ." MAXCYL " . cr wbsplit ( maxcyl.lo maxcyl.hi ) 3 min 6 lshift h# 3f or rm-cl! ( maxcyl.lo ) \ High cyl, max sector rm-ch! ( ) \ Low byte of max cylinder @@ -307,16 +447,33 @@ rm-clr-cf ; +: ds:si ( -- adr ) + caller-regs >rm-esi w@ caller-regs >rm-ds w@ seg:off> +; : lba-read ( -- ) check-drive if exit then - caller-regs >rm-esi w@ caller-regs >rm-ds w@ seg:off> ( packet-adr ) - >r r@ 4 + seg:off@ r@ 8 + l@ r@ 2+ w@ disk-read-sectors r> 2+ w! + ds:si ( packet-adr ) + >r r@ 4 + seg:off@ r@ 8 + l@ r@ 2+ w@ ( adr sector# #sectors ) +\ ." LBA " + disk-read-sectors r> 2+ w! \ dup 8 + l@ ( packet-adr sector# ) \ disk-seek if drop exit then ( packet-adr ) \ dup 4 + seg:off@ over 2+ w@ ( packet-adr adr #sectors ) \ disk-read \ swap 2+ w! ; +: lba-write ( -- ) + check-drive if exit then + ds:si ( packet-adr ) + >r r@ 4 + seg:off@ r@ 8 + l@ r@ 2+ w@ ( adr sector# #sectors ) +\ ." LBA " + disk-write-sectors r> 2+ w! +\ dup 8 + l@ ( packet-adr sector# ) +\ disk-seek if drop exit then ( packet-adr ) +\ dup 4 + seg:off@ over 2+ w@ ( packet-adr adr #sectors ) +\ disk-read +\ swap 2+ w! +; : check-disk-extensions ( -- ) check-drive if 0 rm-bx! exit then @@ -324,13 +481,42 @@ h# aa55 rm-bx! h# 20 rm-ah! 1 rm-cx! ; +: ext-get-drive-params ( -- ) + check-drive if exit then + 0 rm-ah! + ds:si >r ( adr ) + r@ 2 + h# 0e erase \ CHS info not valid + drive-sectors r@ h# 10 + l! 0 r@ h# 14 + l! \ Total #sectors + h# 200 r@ h# 18 + w! \ Sector len + h# 1a ( written-length ) + r@ w@ h# 1e >= if + -1 r@ h# 1a + l! \ No EDD + 4 + ( written-length' ) + then ( written-length ) + r@ w@ h# 20 >= if ( written-length ) + 0 r@ h# 1e + w! \ Ensure that device path info not interpreted + \ Don't claim these bytes + then ( written-length ) + r> w! \ Number of bytes written + rm-clr-cf +; +: get-disk-type ( -- ) + check-drive if exit then + 3 rm-ah! + drive-sectors lwsplit rm-cx! rm-dx! + rm-clr-cf +; + : disk-int ( -- ) \ INT 13 handler rm-ah@ case - h# 02 of read-sectors endof - h# 08 of drive-params endof + h# 02 of noshow read-sectors endof + h# 08 of drive-params endof + h# 15 of get-disk-type endof h# 41 of check-disk-extensions endof - h# 42 of lba-read endof + h# 42 of lba-read endof + h# 43 of lba-write endof + h# 48 of ext-get-drive-params endof ( default ) ." Unsupported disk INT 13 - AH = " dup . cr endcase ; @@ -354,11 +540,74 @@ dup h# 100.0000 min h# 10.0000 - 0 max /1k dup rm-ax! rm-cx! h# 100.0000 - 0 max d# 16 rshift dup rm-bx! rm-dx! ; +: allmem ( -- n ) + " /memory" find-package 0= abort" No /memory node" ( phandle ) + " reg" rot get-package-property abort" No available property" ( $ ) + decode-int drop get-encoded-int h# 10.0000 round-up +; + +0 [if] +Entry: + EBX Continuation value + ES:DI Address of Address Range Descriptor + ECX Length of Address Range Descriptor (=> 20 bytes) + EDX "SMAP" signature +Exit: + Carry 0 = E820 Supported + EAX "SMAP" signature + ES:DI Same value as entry + ECX Length of actual reported information in bytes + EBX Continuation value + Structure of Address Range Descriptor: + Bytes 0-3 Low 32 bits of Base Address + Bytes 4-7 High 32 bits of Base Address + Bytes 8-11 Low 32 bits of Length in bytes + Bytes 12-15 High 32 bits of Length in bytes + Bytes 16-20 Type of Address Range: + 1 = AddressRangeMemory, available to OS + 2 = AddressRangeReserved, not available + 3 = AddressRangeACPI, available to OS + 4 = AddressRangeNVS, not available to OS + Other = Not defined, not available + +d.base d.len l.type +[then] + +create memdescs + h# 0. d, h# a0000. d, 1 l, \ 0 +\ h# a0000. d, h# 60000. d, 2 l, \ 14 + h# f0000. d, h# 10000. d, 2 l, \ 14 + h# 100000. d, 0. d, 1 l, \ 28 +\ 0. d, 0. d, 2 l, \ 3c + h# ffff0000. d, h# 10000. d, 2 l, \ 40 +here memdescs - constant /memdescs + +: system-memory-map ( -- ) + caller-regs >rm-edx @ caller-regs >rm-eax ! + caller-regs >rm-ebx @ ?dup 0= if + memory-limit h# 100000 - memdescs h# 30 + l! +\ memory-limit memdescs h# 3c + l! +\ allmem memory-limit - memdescs h# 44 + l! + memdescs + then ( adr ) + + dup memdescs /memdescs + = if + drop + 0 caller-regs >rm-ecx ! + exit + then + + dup caller-regs >rm-edi w@ caller-regs >rm-es w@ seg:off> ( adr dst ) + caller-regs >rm-ecx @ move ( adr ) + caller-regs >rm-ecx @ + caller-regs >rm-ebx ! ( ) \ Continuation + rm-clr-cf +; + : bigmem-int ( -- ) rm-clr-cf rm-al@ case h# 01 of bigmem-16bit endof -\ h# 20 of system-memory-map endof + h# 20 of system-memory-map endof \ h# 81 of pm-system-memory-map endof ( default ) rm-set-cf ." Unsupported Bigmem int 15 AH=e8 AL=" dup . cr @@ -370,38 +619,94 @@ rm-set-cf h# 86 rm-ah! ; -create sysconf 8 w, h# fc c, 1 c, 0 c, h# 70 c, 0 c, 0 c, +\ System configure +create sysconf + 8 w, \ 8 bytes following + h# fc c, \ model + 1 c, \ Submodel + 0 c, \ BIOS rev + h# 74 c, \ Feature - second 8259, RTC, INT 9 calls INT 15/4F, extended BIOS area + 0 c, + 0 c, + 0 c, + 0 c, + : get-conf ( -- ) sysconf 'rm-regs 8 move 'rm-regs >seg:off 0 caller-regs >rm-es w! rm-bx! + 0 rm-ax! ; +: handle-mouse ( -- ) + rm-al@ case + 1 of rm-clr-cf endof \ Reset mouse + ( default ) ." Unsupported mouse INT 15 AH c2 AL " dup . cr rm-set-cf + endcase +; + : system-int ( -- ) \ INT 15 handler + rm-clr-cf rm-ah@ case + h# 91 of noshow 0 rm-ah! endof \ "pause" while waiting for I/O h# 53 of apm endof h# 86 of rm-dx@ rm-cx@ wljoin us endof \ Delay microseconds h# 8a of memory-limit h# 400.0000 - 0 max /1k lwsplit rm-dx! rm-ax! endof h# 88 of h# fffc rm-ax! endof \ Extended memory - at least 64 MB h# c0 of get-conf endof h# c1 of rm-set-cf h# 86 rm-ah! endof + h# c2 of handle-mouse endof h# e8 of bigmem-int endof ( default ) rm-set-cf ." Unsupported INT 15 AH=" dup . cr endcase ; -: poll-key ( -- ) - key? if - key rm-al! 0 rm-ah! \ ASCII in AL, scancode in AH +h# 4800 value the-key + +: poll-key ( -- false | scan,ascii true ) + the-key ?dup if true exit then + 0 " get-scancode" kbd-ih $call-method if ( scancode ) + dup h# 80 and if ( scancode ) + \ Discard release events and escapes (e0) + drop false ( false ) + else + dup " scancode->char" kbd-ih $call-method 0= if 0 then ( scancode ascii ) + dup h# 80 and if drop 0 then \ Don't return e.g. 9B for arrows + swap bwjoin to the-key + the-key true + then + else + false + then +; + +0 value polled? +: poll-keystroke ( -- ) + noshow + polled? 0= if ." ? " then + true to polled? + poll-key if ( scancode,ascii ) + rm-ax! rm-flags@ h# 40 invert and rm-flags! else rm-flags@ h# 40 or rm-flags! then ; +: get-keystroke ( -- ) + noshow -: keyboard-int ( -- ) \ INT 15 handler + begin poll-key until ( scancode,ascii ) + 0 to the-key + rm-ax! + + rm-al@ [char] q = if debug-me then + false to polled? +; + +: keyboard-int ( -- ) \ INT 16 handler rm-ah@ case - 1 of poll-key endof + 0 of get-keystroke endof + 1 of poll-keystroke endof 2 of 0 rm-al! endof \ Claim that no shift keys are active ( bit 7:sysrq 6:capslock 5:numlock 4:scrlock 3:ralt 2:rctrl 1:lalt 0:lctrl ) ( default ) ." Keyboard INT called with AH = " dup . cr @@ -417,9 +722,9 @@ h# 201 rm-bx! \ Version 2.1 1 rm-cl! \ Number of last PCI bus - XXX get this from PCI node ; -: pcibios ( -- ) +: pcibios ( -- ) \ INT 1a rm-clr-cf - rm-ah@ case + rm-al@ case h# 01 of pcibios-installed endof \ h# 02 of find-pci-device ( cx:devid dx:vendid si:index -> bh:bus# bl:devfn ) endof \ h# 03 of find-pci-class-code ( ecx:0,classcode si:index -> bh:bus# bl:devfn ) endof @@ -434,7 +739,7 @@ \ h# 0f of set-pci-int endof ( default ) h# 81 rm-ah! rm-set-cf - ." Unimplemented PCI BIOS INT - AH = " dup . cr + ." Unimplemented PCI BIOS INT 1a AH b1 - AL = " dup . cr endcase ; @@ -445,30 +750,28 @@ : int-1a ( -- ) rm-ah@ case - h# 0 of get-timer-ticks endof + h# 0 of get-timer-ticks noshow endof h# b1 of pcibios endof - ( default ) ." Unimplemented INT 1a - AH = " dup . rm-set-cf + ( default ) ." Unimplemented INT 1a - AH = " dup . cr rm-set-cf endcase ; -: showint - ." INT " 'rm-int w@ . ." AH " rm-ah@ . ." AL " rm-al@ . cr -; - : handle-bios-call ( -- ) + snap-int 'rm-int w@ case h# 10 of video-int endof h# 11 of sysinfo-int endof - h# 13 of disk-int endof -showint + h# 13 of noshow disk-int endof + h# 16 of keyboard-int endof + h# 15 of system-int endof h# 12 of h# a0000 /1k rm-ax! endof \ Low memory size - h# 15 of system-int endof - h# 16 of keyboard-int endof h# 1a of int-1a endof ( default ) ." Interrupt " dup . cr interact endcase + ?showint ; : rm-go ( -- ) + usb-quiet \ Load boot image at 7c00 h# 7c00 rm-init-program begin @@ -480,14 +783,14 @@ here xx - constant /xx : put-xx ( adr -- ) xx swap /xx move ; : get-mbr - " /ide@0" open-dev >r + " /pci/ide@0" open-dev >r h# 7c00 h# 3f 1 " read-blocks" r@ $call-method . r> close-dev ; : .lreg ( adr -- adr' ) 4 - dup l@ 9 u.r ; : .wreg ( adr -- adr' ) 2 - dup w@ 5 u.r ; : .caller-regs ( -- ) - ." AX CX BX DX SP BP SI DI" cr + ." AX CX DX BX SP BP SI DI" cr caller-regs >rm-eax 4 + 8 0 do .lreg loop cr cr ." DS ES FS GS PC FLAGS" cr

13 years

r793 - cpu/x86/pc/biosload

by svn＠openbios.org

Author: wmb Date: 2008-01-28 05:18:50 +0100 (Mon, 28 Jan 2008) New Revision: 793 Modified: cpu/x86/pc/biosload/devices.fth cpu/x86/pc/biosload/ofw.bth Log: BIOSload version - Added an optional driver for legacy VGA. Modified: cpu/x86/pc/biosload/devices.fth =================================================================== --- cpu/x86/pc/biosload/devices.fth 2008-01-28 04:17:34 UTC (rev 792) +++ cpu/x86/pc/biosload/devices.fth 2008-01-28 04:18:50 UTC (rev 793) @@ -207,6 +207,22 @@ ; [then] +[ifdef] use-vga +0 0 " i3c0" " /isa" begin-package + " vga" name + my-address my-space h# 20 reg + fload ${BP}/dev/video/common/defer.fth \ Defered words + fload ${BP}/dev/video/common/graphics.fth \ Graphics and color routines + fload ${BP}/dev/video/controlr/vga.fth \ Controller code + use-vga + fload ${BP}/dev/video/common/init.fth \ Init code + fload ${BP}/dev/video/common/display.fth \ High level interface code + fload ${BP}/dev/video/common/textmode.fth \ VGA text mode + : (map-io-regs) h# ffff0000 to io-base ; + ' (map-io-regs) to map-io-regs +end-package +[then] + [ifdef] use-ct65550 0 0 " i3b0" " /isa" begin-package fload ${BP}/dev/ct6555x/loadpkg.fth \ Video driver Modified: cpu/x86/pc/biosload/ofw.bth =================================================================== --- cpu/x86/pc/biosload/ofw.bth 2008-01-28 04:17:34 UTC (rev 792) +++ cpu/x86/pc/biosload/ofw.bth 2008-01-28 04:18:50 UTC (rev 793) @@ -133,6 +133,11 @@ " ${BP}/cpu/x86/pc/biosload/linux.fth" " linux.fth" $add-dropin " ${BP}/ofw/linux/penguin.txt" " penguin.txt" $add-dropin +[ifdef] use-vga + " ${BP}/ofw/termemu/cp881-16.obf" " font" $add-deflated-dropin +[then] + + [ifdef] grub-loaded ofd @ fsize pad ! \ file size; store in memory for convenience below h# 44 ofd @ fseek \ Seek to file size field; see elfhdr.bth

13 years

r792 - cpu/x86/pc/biosload

by svn＠openbios.org

Author: wmb Date: 2008-01-28 05:17:34 +0100 (Mon, 28 Jan 2008) New Revision: 792 Modified: cpu/x86/pc/biosload/usb.fth Log: BIOSload version - Removed hardcoded PCI device numbers from the USB probing code. Modified: cpu/x86/pc/biosload/usb.fth =================================================================== --- cpu/x86/pc/biosload/usb.fth 2008-01-24 23:27:35 UTC (rev 791) +++ cpu/x86/pc/biosload/usb.fth 2008-01-28 04:17:34 UTC (rev 792) @@ -12,20 +12,38 @@ r> to exit? ; +: (probe-usb2) ( -- ) + " device_type" get-property if exit then + get-encoded-string " ehci" $= if + pwd$ open-dev ?dup if close-dev then + then +; +: (show-usb2) ( -- ) + " device_type" get-property if exit then + get-encoded-string " ehci" $= if + pwd$ $nopage-show-devs + then +; +: (probe-usb1) ( -- ) + " device_type" get-property if exit then + get-encoded-string 2dup " uhci" $= >r " ohci" $= r> or if + pwd$ open-dev ?dup if close-dev then + then +; +: (show-usb1) ( -- ) + " device_type" get-property if exit then + get-encoded-string 2dup " uhci" $= >r " ohci" $= r> or if + pwd$ $nopage-show-devs + then +; : probe-usb ( -- ) ." USB2 devices:" cr - " /usb@1d,7" open-dev ?dup if close-dev then - " /usb" $nopage-show-devs + " /" ['] (probe-usb2) scan-subtree + " /" ['] (show-usb2) scan-subtree ." USB1 devices:" cr - " /usb@1d,3" open-dev ?dup if close-dev then - " /usb@1d,3" $nopage-show-devs - " /usb@1d,2" open-dev ?dup if close-dev then - " /usb@1d,2" $nopage-show-devs - " /usb@1d,1" open-dev ?dup if close-dev then - " /usb@1d,1" $nopage-show-devs - " /usb@1d,0" open-dev ?dup if close-dev then - " /usb@1d,0" $nopage-show-devs + " /" ['] (probe-usb1) scan-subtree + " /" ['] (show-usb1) scan-subtree ; alias p2 probe-usb

13 years

r791 - cpu/x86/pc/olpc

by svn＠openbios.org

Author: wmb Date: 2008-01-25 00:27:35 +0100 (Fri, 25 Jan 2008) New Revision: 791 Modified: cpu/x86/pc/olpc/verify.bth Log: OLPC build - verify md5sum for wireless firmware. Modified: cpu/x86/pc/olpc/verify.bth =================================================================== --- cpu/x86/pc/olpc/verify.bth 2008-01-24 23:25:58 UTC (rev 790) +++ cpu/x86/pc/olpc/verify.bth 2008-01-24 23:27:35 UTC (rev 791) @@ -10,8 +10,14 @@ " wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fs.public -O fs.public" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/lease.public -O lease.public" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/developer.public -O developer.public" expand$ $sh -" wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img…" expand$ $sh +" md5sum -b bios_verify-${CRYPTO_VERSION}.img | cmp - bios_verify-${CRYPTO_VERSION}.img.md5" expand$ $sh + +" mv bios_verify-${CRYPTO_VERSION}.img verify.img" expand$ $sh +" rm bios_verify-${CRYPTO_VERSION}.img.md5" expand$ $sh + \ This forces the creation of an verify.log file, so we don't re-fetch writing verify.version " ${CRYPTO_VERSION}"n" expand$ ofd @ fputs

13 years, 1 month

r790 - cpu/x86

by svn＠openbios.org

Author: wmb Date: 2008-01-25 00:25:58 +0100 (Fri, 25 Jan 2008) New Revision: 790 Modified: cpu/x86/disassem.fth Log: x86 disassembler - fixed formatting bug with [reg+offset] for negative offsets. Modified: cpu/x86/disassem.fth =================================================================== --- cpu/x86/disassem.fth 2008-01-24 09:50:52 UTC (rev 789) +++ cpu/x86/disassem.fth 2008-01-24 23:25:58 UTC (rev 790) @@ -56,12 +56,16 @@ : ?+ ( -- ) ea-text c@ 1 > if " +" $add-text then ; +: ?- ( -- ) + ea-text c@ 1 > if " -" $add-text then +; : get-disp ( mod -- adr len ) case 0 of " " exit endof - 1 of op8@ bext dup 0>= if ?+ then endof - 2 of ?+ adv@ wext endof + 1 of op8@ bext endof + 2 of adv@ wext endof endcase + dup 0>= if ?+ else ?- negate then (u.) disp-buf pack count ; \ Used when "w" field contains 0

13 years, 1 month

r789 - dev/olpc/keyboard

by svn＠openbios.org

Author: wmb Date: 2008-01-24 10:50:52 +0100 (Thu, 24 Jan 2008) New Revision: 789 Modified: dev/olpc/keyboard/selftest.fth Log: OLPC keyboard selftest - Added game key display and timeout after 20 seconds of inactivity. Modified: dev/olpc/keyboard/selftest.fth =================================================================== --- dev/olpc/keyboard/selftest.fth 2008-01-24 05:43:01 UTC (rev 788) +++ dev/olpc/keyboard/selftest.fth 2008-01-24 09:50:52 UTC (rev 789) @@ -32,9 +32,12 @@ d# 70 constant single-key-h d# 105 constant shift-key-w d# 540 constant space-key-w +d# 400 constant top-row-offset +d# 40 constant button-w +d# 40 constant button-h : key-adr ( i -- adr ) /key * keys + ; -: top-key-row ( -- ) row-gap to key-y key-gap to key-x ; +: top-key-row ( -- ) top-row-offset to key-y key-gap to key-x ; : next-key-row ( -- ) key-y single-key-h + row-gap + to key-y key-gap to key-x @@ -59,6 +62,7 @@ r> ++key-x add-key-gap ; +: make-button ( x y -- ) button-w button-h (make-key) ; : make-keys ( -- ) 0 to #keys @@ -85,6 +89,17 @@ 3 0 do make-single-key loop make-space-key 5 0 do make-single-key loop + + d# 80 d# 30 make-button \ Rocker up 65 + d# 30 d# 80 make-button \ Rocker left 67 + d# 130 d# 80 make-button \ Rocker right 68 + d# 80 d# 130 make-button \ Rocker down 66 + d# 80 d# 230 make-button \ Rotate 69 + + d# 1080 d# 30 make-button \ O e0 65 + d# 1030 d# 80 make-button \ square e0 67 + d# 1130 d# 80 make-button \ check e0 68 + d# 1080 d# 130 make-button \ X e0 66 ; 0 [if] @@ -146,8 +161,8 @@ ( 48 ) 96 c, 101 c, 105 c, 92 c, 97 c, 102 c, 106 c, 93 c, ( 50 ) 98 c, 103 c, 99 c, 104 c, 0 c, 0 c, 45 c, 122 c, ( 58 ) 123 c, 59 c, 0 c, 0 c, 133 c, 0 c, 0 c, 0 c, \ scan h# 59 is Fn - ibm# d# 59 -( 60 ) 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, -( 68 ) 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 135 c, 0 c, +( 60 ) 0 c, 0 c, 0 c, 0 c, 0 c, 150 c, 153 c, 151 c, \ 66-68 are left rocker +( 68 ) 152 c, 154 c, 0 c, 0 c, 0 c, 0 c, 135 c, 0 c, \ 69 is rotate ( 70 ) 0 c, 0 c, 0 c, 56 c, 0 c, 0 c, 0 c, 0 c, ( 78 ) 0 c, 130 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, @@ -215,6 +230,10 @@ h# 56 of d# 61 endof \ Fn space h# 5c of d# 128 endof \ F grab + h# 65 of d# 156 endof \ Button O + h# 66 of d# 159 endof \ Button X + h# 67 of d# 157 endof \ Button square + h# 68 of d# 158 endof \ Button check ( default ) 0 swap \ Not recognized endcase ; @@ -249,6 +268,11 @@ \ Function row - key#s 0x50 - 0x58 59 c, 127 c, 60 c, 61 c, 62 c, 128 c, 79 c, 84 c, 89 c, \ Fn, lgrab, alt, space, altgr, rgrab, left, down, right + + \ Game buttons - key#s 0x59 - 0x61 (these IBM#s are made up just for this program) + 150 c, 151 c, 152 c, 153 c, \ Rocker up, left, right, down + 154 c, \ Rotate + 156 c, 157 c, 158 c, 159 c, \ Game O, square, check, X here ibm#s - constant /ibm#s : ibm#>key# ( ibm# -- true | key# false ) @@ -350,7 +374,7 @@ : draw-keyboard ( -- ) kbd-bc fill-screen #keys 0 ?do i key-up loop - 0 d# 20 at-xy ." Press the top left key to exit" + 0 d# 13 at-xy ." X" ; false value verbose? @@ -375,10 +399,17 @@ false ; +0 value last-timestamp : selftest-keys ( -- ) false to esc? + get-msecs to last-timestamp begin - get-data? if process-raw else false then ( exit? ) + get-data? if + process-raw + get-msecs to last-timestamp + else + get-msecs last-timestamp - d# 20,000 >= + then ( exit? ) until ; @@ -388,11 +419,9 @@ open 0= if true exit then make-keys cursor-off draw-keyboard -\ toss-keys " translation-off" $call-parent - true to locked? + true to locked? \ Disable the keyboard alarm handler; it steals our scancodes selftest-keys false to locked? -\ " translation-on" $call-parent toss-keys cursor-on screen-ih iselect erase-screen iunselect page

13 years, 1 month

r788 - dev/olpc/keyboard

by svn＠openbios.org

Author: wmb Date: 2008-01-24 06:43:01 +0100 (Thu, 24 Jan 2008) New Revision: 788 Modified: dev/olpc/keyboard/selftest.fth Log: OLPC keyboard selftest - Changed from scanset 2 to scanset 1, so that game key reports, which are always in scanset 1, don't confuse the up/down handler. Modified: dev/olpc/keyboard/selftest.fth =================================================================== --- dev/olpc/keyboard/selftest.fth 2008-01-22 08:59:25 UTC (rev 787) +++ dev/olpc/keyboard/selftest.fth 2008-01-24 05:43:01 UTC (rev 788) @@ -87,13 +87,202 @@ 5 0 do make-single-key loop ; -\ Keyboard top row: key entries 0-0x18 -\ next row: key entries 0x19-0x26 -\ next row: key entries 0x27-0x31 -\ next row: key entries 0x35-0x41 -\ next row: key entries 0x42-0x4f -\ next row: key entries 0x50-0x58 +0 [if] +hex +\ This is indexed by the IBM key number (the physical key number as +\ shown on language-independent drawings of the keyboard layout since +\ the original IBM documentation). The values are scanset1 codes. +create (ibm#>scan1) +\ 0 1 3 3 4 5 6 7 8 9 + 00 c, 29 c, 02 c, 03 c, 04 c, 05 c, 06 c, 07 c, 08 c, 09 c, \ + 0a c, 0b c, 0c c, 0d c, 00 c, 0e c, 0f c, 10 c, 11 c, 12 c, \ 1x + 13 c, 14 c, 15 c, 16 c, 17 c, 18 c, 19 c, 1a c, 1b c, 2b c, \ 2x + 3a c, 1e c, 1f c, 20 c, 21 c, 22 c, 23 c, 24 c, 25 c, 26 c, \ 3x + 27 c, 28 c, 00 c, 1c c, 2a c, 56 c, 2c c, 2d c, 2e c, 2f c, \ 4x + 30 c, 31 c, 32 c, 33 c, 34 c, 35 c, 73 c, 36 c, 1d c, 00 c, \ 5x + 38 c, 39 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, \ 6x + 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, \ 7x + 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, \ 8x + 45 c, 47 c, 4B c, 4F c, 00 c, 00 c, 48 c, 4C c, 50 c, 52 c, \ 9x + 37 c, 49 c, 4D c, 51 c, 53 c, 4A c, 4E c, 00 c, 1c c, 00 c, \ 1 + 01 c, 00 c, 3b c, 3c c, 3d c, 3e c, 3f c, 40 c, 41 c, 42 c, \ 11x + 43 c, 44 c, 57 c, 58 c, 00 c, 46 c, 00 c, 00 c, 00 c, 00 c, \ 12x + 79 c, 00 c, 00 c, 5c c, 73 c, 6e c, 00 c, 00 c, 00 c, 00 c, \ 13x (analog intermediates) + 00 c, 00 c, 00 c, 00 c, 00 c, \ 14x +\ A program to invert the table above. We used the inverted form. +h# 80 buffer: sc1 +: invert-ibm ( -- ) + sc1 h# 80 erase + d# 145 0 do + (ibm#>scan1) i + c@ ?dup if i swap sc1 + c! then + loop + + h# 80 0 do + ." ( " i 2 u.r ." ) " + i 8 bounds do + sc1 i + c@ push-decimal 3 u.r pop-base ." c, " + loop + cr + 8 +loop +; +[then] + +\ This table is indexed by the (unescaped) scanset1 code, giving +\ an IBM physical key number. + +decimal +create (scan1>ibm#) +\ 0/8 1/9 2/a 3/b 4/c 5/d 6/e 7/f +( 0 ) 0 c, 110 c, 2 c, 3 c, 4 c, 5 c, 6 c, 7 c, \ 01 is esc +( 8 ) 8 c, 9 c, 10 c, 11 c, 12 c, 13 c, 15 c, 16 c, +( 10 ) 17 c, 18 c, 19 c, 20 c, 21 c, 22 c, 23 c, 24 c, +( 18 ) 25 c, 26 c, 27 c, 28 c, 43 c, 58 c, 31 c, 32 c, \ 1d is ctrl, 1c is Enter +( 20 ) 33 c, 34 c, 35 c, 36 c, 37 c, 38 c, 39 c, 40 c, +( 28 ) 41 c, 1 c, 44 c, 29 c, 46 c, 47 c, 48 c, 49 c, +( 30 ) 50 c, 51 c, 52 c, 53 c, 54 c, 55 c, 57 c, 100 c, +( 38 ) 60 c, 61 c, 30 c, 112 c, 113 c, 114 c, 115 c, 116 c, +( 40 ) 117 c, 118 c, 119 c, 120 c, 121 c, 90 c, 125 c, 91 c, +( 48 ) 96 c, 101 c, 105 c, 92 c, 97 c, 102 c, 106 c, 93 c, +( 50 ) 98 c, 103 c, 99 c, 104 c, 0 c, 0 c, 45 c, 122 c, +( 58 ) 123 c, 59 c, 0 c, 0 c, 133 c, 0 c, 0 c, 0 c, \ scan h# 59 is Fn - ibm# d# 59 +( 60 ) 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, +( 68 ) 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 135 c, 0 c, +( 70 ) 0 c, 0 c, 0 c, 56 c, 0 c, 0 c, 0 c, 0 c, +( 78 ) 0 c, 130 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, + +\ This should be a lookup table. It would be smaller that way +: e0-scan1>ibm# ( scancode -- ibm# ) + case + h# 38 of d# 62 endof \ R ALT + +\ For a standard PC keyboard +\ h# 1c of d# 64 endof \ Numeric enter +\ h# 1d of d# 64 endof \ R CTRL +\ h# 52 of d# 75 endof \ Insert +\ h# 53 of d# 76 endof \ Delete +\ h# 47 of d# 80 endof \ Home +\ h# 4f of d# 81 endof \ End +\ h# 49 of d# 85 endof \ PageUp +\ h# 51 of d# 86 endof \ PageDown + + h# 3b of d# 112 endof \ Fn 1 + h# 3c of d# 113 endof \ Fn 2 + h# 3d of d# 114 endof \ Fn 3 + h# 3e of d# 115 endof \ Fn 4 + h# 3f of d# 116 endof \ Fn 5 + h# 40 of d# 117 endof \ Fn 6 + h# 41 of d# 118 endof \ Fn 7 + h# 42 of d# 119 endof \ Fn 8 + h# 43 of d# 120 endof \ Fn 9 + h# 44 of d# 121 endof \ Fn 10 + h# 57 of d# 122 endof \ Fn 11 + h# 58 of d# 123 endof \ Fn 12 + + h# 4b of d# 79 endof \ Left Arrow + h# 48 of d# 83 endof \ Up Arrow + h# 50 of d# 84 endof \ Down Arrow + h# 4d of d# 89 endof \ Right Arrow + +\ OLPC-specific + h# 47 of d# 79 endof \ Home + h# 4f of d# 89 endof \ End + h# 49 of d# 83 endof \ PageUp + h# 51 of d# 84 endof \ PageDown + h# 78 of d# 135 endof \ Fn View Source + h# 79 of d# 135 endof \ View Source + h# 77 of d# 136 endof \ Fn 1.5 + h# 76 of d# 137 endof \ Fn 2.5 + h# 75 of d# 138 endof \ Fn 3.5 + h# 74 of d# 139 endof \ Fn 5.5 + h# 73 of d# 140 endof \ Fn 6.5 + h# 72 of d# 141 endof \ Fn 7.5 + h# 71 of d# 142 endof \ Fn 9.5 + h# 70 of d# 143 endof \ Fn 10.5 + h# 6f of d# 144 endof \ Fn 11.5 + + h# 64 of d# 145 endof \ Fn Chat + h# 6e of d# 145 endof \ Chat + + h# 01 of d# 110 endof \ Fn Esc + h# 5a of d# 129 endof \ Fn Frame + h# 5d of d# 129 endof \ Frame + h# 53 of d# 15 endof \ Fn Erase + h# 52 of d# 57 endof \ Fn R-shift + h# 7e of d# 56 endof \ Language + + h# 5b of d# 127 endof \ L grab + h# 56 of d# 61 endof \ Fn space + h# 5c of d# 128 endof \ F grab + + ( default ) 0 swap \ Not recognized + endcase +; + +: scan1>ibm# ( scancode1 esc? -- ibm# ) + if e0-scan1>ibm# else (scan1>ibm#) + c@ then +; + +\ "key#" is a physical location on the screen +\ "ibm#" is the key number as shown on the original IBM PC documents +\ These keynum values are from the ALPS spec "CL1-matrix-20060920.pdf" +decimal +create ibm#s + \ Top row, key#s 0x00-0x18 + 110 c, 135 c, \ ESC, view source + 112 c, 136 c, 113 c, 137 c, 114 c, 138 c, 115 c, \ Left bar + 116 c, 139 c, 117 c, 140 c, 118 c, 141 c, 119 c, \ Middle bar + 120 c, 142 c, 121 c, 143 c, 122 c, 144 c, 123 c, \ Right bar + 145 c, 129 c, \ chat, frame + + \ Number row - key#s 0x19-0x26 + 1 c, 2 c, 3 c, 4 c, 5 c, 6 c, 7 c, 8 c, 9 c, 10 c, 11 c, 12 c, 13 c, 15 c, + + \ Top alpha row - key#s 0x27-0x34 + 16 c, 17 c, 18 c, 19 c, 20 c, 21 c, 22 c, 23 c, 24 c, 25 c, 26 c, 27 c, 28 c, 43 c, \ tab, chars, enter + + \ Middle alpha row - key#s 0x35-0x41 + 58 c, 31 c, 32 c, 33 c, 34 c, 35 c, 36 c, 37 c, 38 c, 39 c, 40 c, 41 c, 29 c, \ ctrl, chars + + \ Bottom alpha row - key#s 0x42-0x4f + 44 c, 46 c, 47 c, 48 c, 49 c, 50 c, 51 c, 52 c, 53 c, 54 c, 55 c, 57 c, 83 c, 56 c, \ shift, chars, shift, up, times + + \ Function row - key#s 0x50 - 0x58 + 59 c, 127 c, 60 c, 61 c, 62 c, 128 c, 79 c, 84 c, 89 c, \ Fn, lgrab, alt, space, altgr, rgrab, left, down, right +here ibm#s - constant /ibm#s + +: ibm#>key# ( ibm# -- true | key# false ) + /ibm#s 0 ?do ( ibm# ) + dup ibm#s i + c@ = if + drop i false unloop exit + then + loop ( ibm# ) + drop true +; + +0 [if] +\ This is a program to invert the ibm#s table +d# 145 buffer: sc2 +: invert-key ( -- ) + sc2 d# 145 erase + h# 59 0 do + i ibm#s i + c@ sc2 + c! + loop + + d# 145 0 do + ." ( " i push-decimal 3 u.r pop-base ." ) " + i d# 10 bounds do + sc2 i + c@ push-hex 2 u.r pop-base ." c, " + loop + cr + d# 10 +loop +; +[then] + +0 [if] +\ These are maps from scanset 2 to key position numbers. +\ They are no longer used +hex create raw-scancode ( -0 ) -1 c, 10 c, 0d c, 09 c, 06 c, 02 c, 04 c, 16 c, ( 08 ) -1 c, 12 c, 0f c, 0b c, 08 c, 27 c, 19 c, 50 c, @@ -131,13 +320,20 @@ ( 78 ) 14 c, -1 c, 57 c, -1 c, -1 c, 4e c, -1 c, -1 c, raw-scancode value cur-sc-table +[then] h# 07ff constant pressed-key-color h# 001f constant idle-key-color h# ffff constant kbd-bc -: scancode->key ( scancode -- key# ) cur-sc-table + c@ ; +0 value esc? +: scan1->key# ( scancode -- true | key# false ) + esc? scan1>ibm# + ?dup 0= if true exit then + ibm#>key# +; + : draw-key ( key# color -- ) swap key-adr >r @@ -158,33 +354,31 @@ ; false value verbose? -false value exit-selftest? -false value up-key? -: process-raw ( scan-code -- ) +: process-raw ( scan-code -- exit? ) verbose? if dup u. then - dup h# f0 = if - true to up-key? drop - else dup h# e0 = if - e0-scancode to cur-sc-table drop + true to esc? else - scancode->key dup h# ff = if - drop - else - up-key? if dup 0= to exit-selftest? key-up else key-down then + dup h# 7f and scan1->key# if ( scan ) + drop ( ) + else ( scan key# ) + swap h# 80 and if ( key# ) + dup key-up ( key# ) + 0= if true exit then ( ) + else ( key# ) + key-down ( ) + then ( ) then - false to up-key? - raw-scancode to cur-sc-table - then then + false to esc? + then + false ; : selftest-keys ( -- ) - raw-scancode to cur-sc-table - false to exit-selftest? false to up-key? + false to esc? begin - get-data? if process-raw then - exit-selftest? + get-data? if process-raw else false then ( exit? ) until ; @@ -194,9 +388,12 @@ open 0= if true exit then make-keys cursor-off draw-keyboard - toss-keys " translation-off" $call-parent +\ toss-keys " translation-off" $call-parent + true to locked? selftest-keys - " translation-on" $call-parent toss-keys cursor-on + false to locked? +\ " translation-on" $call-parent toss-keys + cursor-on screen-ih iselect erase-screen iunselect page close

13 years, 1 month

r787 - clients/memtest86

by svn＠openbios.org

Author: wmb Date: 2008-01-22 09:59:25 +0100 (Tue, 22 Jan 2008) New Revision: 787 Modified: clients/memtest86/Makefile Log: memtest86 - Added an explicit rule for compiling random.o to fix problems when compiling on a 64-bit system. Modified: clients/memtest86/Makefile =================================================================== --- clients/memtest86/Makefile 2008-01-20 01:31:04 UTC (rev 786) +++ clients/memtest86/Makefile 2008-01-22 08:59:25 UTC (rev 787) @@ -75,6 +75,9 @@ spd.o: spd.c lib.c test.h screen_buffer.h ega.h $(CC) -c $(CCFLAGS) -fPIC spd.c +random.o: random.c + $(CC) -c $(CCFLAGS) -fPIC random.c + controller.s: controller.c defs.h config.h test.h pci.h controller.h $(CC) -S $(CCFLAGS) -fPIC controller.c

13 years, 1 month

r786 - in cpu/x86/pc: biosload olpc

by svn＠openbios.org

Author: wmb Date: 2008-01-20 02:31:04 +0100 (Sun, 20 Jan 2008) New Revision: 786 Modified: cpu/x86/pc/biosload/fw.bth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/linux.fth Log: OLPC trac 6101 - fixed bug with the loading of ELF format programs. Modified: cpu/x86/pc/biosload/fw.bth =================================================================== --- cpu/x86/pc/biosload/fw.bth 2008-01-18 18:36:36 UTC (rev 785) +++ cpu/x86/pc/biosload/fw.bth 2008-01-20 01:31:04 UTC (rev 786) @@ -145,7 +145,8 @@ fload ${BP}/ofw/elf/elf.fth fload ${BP}/ofw/elf/elfdebug.fth [ifdef] virtual-mode -: (elf-map-in) ( va size -- ) swap 1 -rot allocate-aligned drop ; +\ Depends on the assumption that physical memory is mapped 1:1 already +: (elf-map-in) ( va size -- ) 0 mem-claim drop ; ' (elf-map-in) is elf-map-in [else] ' 2drop is elf-map-in Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-01-18 18:36:36 UTC (rev 785) +++ cpu/x86/pc/olpc/fw.bth 2008-01-20 01:31:04 UTC (rev 786) @@ -179,7 +179,8 @@ fload ${BP}/ofw/elf/elf.fth fload ${BP}/ofw/elf/elfdebug.fth [ifdef] virtual-mode -: (elf-map-in) ( va size -- ) swap 1 -rot allocate-aligned drop ; +\ Depends on the assumption that physical memory is mapped 1:1 already +: (elf-map-in) ( va size -- ) 0 mem-claim drop ; ' (elf-map-in) is elf-map-in [else] ' 2drop is elf-map-in Modified: cpu/x86/pc/olpc/linux.fth =================================================================== --- cpu/x86/pc/olpc/linux.fth 2008-01-18 18:36:36 UTC (rev 785) +++ cpu/x86/pc/olpc/linux.fth 2008-01-20 01:31:04 UTC (rev 786) @@ -251,11 +251,8 @@ \ It expects that virtual = physical; we depend on the fact \ that we have low memory mapped V=P over h# 10000 = if ( vaddr size ) - 0 mem-claim drop - \ Map the frame buffer (virtual=physical) h# 910 config-l@ dup 100.0000 -1 mmu-map - exit then \ If it's not memtest, chain to the linux recognizer

13 years, 1 month

Olpc.fth testing in Qemu?

by Andreas.Trawoeger＠wgkk.at

Hi! I just recently got into writing my first olpc.fth booting script for my XO and my question is: Is there a way to do OFW testing in Qemu? There is a documentation about patching Qemu with OFW on the OpenBios.org site, but it still refers to using LinuxBios. I'm currently writing Forth using an advances method that combines cut & paste with wild guessing. So both me and my XO would be happy if I could do my tests in a virtual environtment. cu andreas

13 years, 1 month