June 2010 - openfirmware - mail.coreboot.org

[commit] r1848 - cpu/x86/pc/olpc/via
by repository service June 30, 2010

June 30, 2010

Author: wmb Date: Thu Jul 1 00:03:13 2010 New Revision: 1848 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1848 Log: OLPC XO-1.5 - SMBIOS - changed OEM name from OLPC to QUANTACOMPUTER to make Windows activation happier. Modified: cpu/x86/pc/olpc/via/smbios.fth Modified: cpu/x86/pc/olpc/via/smbios.fth ============================================================================== --- cpu/x86/pc/olpc/via/smbios.fth Tue Jun 29 10:55:37 2010 (r1847) +++ cpu/x86/pc/olpc/via/smbios.fth Thu Jul 1 00:03:13 2010 (r1848) @@ -394,7 +394,7 @@ pad h# 30 -leading -trailing ; -: +OLPC ( adr -- adr' ) " OLPC" +smbios$ ; +: +OEM ( adr -- adr' ) " QUANTACOMPUTER" +smbios$ ; : setup-smbios ( -- ) 0 to #smbios-tables 0 to portinfo# @@ -405,7 +405,7 @@ bios-info copy-smbios-table ( adr ) test-name$ +smbios$ test-version$ +smbios$ -\ +OLPC +\ +OEM \ fw-version$ +smbios$ fw-date$ +smbios$ end-smbios-table @@ -413,7 +413,7 @@ dup >r ( adr r: adr ) system-info copy-smbios-table ( adr r: adr ) get-uuid r> 8 + swap move ( adr ) - +OLPC + +OEM " XO" +smbios$ " 1.5" +smbios$ \ Version " SN" get-tag$ +smbios$ @@ -428,7 +428,7 @@ \ XXX might need to amend the security status field system-enclosure copy-smbios-table ( adr ) - +OLPC + +OEM " 1.5" +smbios$ \ Version end-smbios-table

1 0

[commit] r1847 - cpu/x86/pc/olpc/via
by repository service June 29, 2010

June 29, 2010

Author: wmb Date: Tue Jun 29 10:55:37 2010 New Revision: 1847 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1847 Log: OLPC XO-1.5 - fixed typo in previous DSDT checkin. Modified: cpu/x86/pc/olpc/via/dsdt.dsl Modified: cpu/x86/pc/olpc/via/dsdt.dsl ============================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl Mon Jun 28 10:27:16 2010 (r1846) +++ cpu/x86/pc/olpc/via/dsdt.dsl Tue Jun 29 10:55:37 2010 (r1847) @@ -2055,7 +2055,7 @@ } } - Device(HPET) [ + Device(HPET) { Name(_HID,EISAID("PNP0103")) Name(_UID, 0) Name(_CRS,ResourceTemplate() {

1 0

[commit] r1846 - cpu/x86/pc/olpc/via
by repository service June 28, 2010

June 28, 2010

Author: wmb Date: Mon Jun 28 10:27:16 2010 New Revision: 1846 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1846 Log: XO-1.5 - added HPET node to ACPI DSDT. Modified: cpu/x86/pc/olpc/via/dsdt.dsl Modified: cpu/x86/pc/olpc/via/dsdt.dsl ============================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl Mon Jun 28 07:09:09 2010 (r1845) +++ cpu/x86/pc/olpc/via/dsdt.dsl Mon Jun 28 10:27:16 2010 (r1846) @@ -2055,6 +2055,14 @@ } } + Device(HPET) [ + Name(_HID,EISAID("PNP0103")) + Name(_UID, 0) + Name(_CRS,ResourceTemplate() { + Memory32Fixed(ReadWrite, 0xfed00000, 0x00000400, MEM0) + }) + } + Device(RMSC) { // all "PNP0C02" devices- pieces that don't fit anywhere else Name(_HID,EISAID("PNP0C02")) // Generic motherboard devices Name (_UID, 0x13) @@ -2089,7 +2097,6 @@ IO(Decode16, 0, 0, 0, 0, IO1) // SPI Memory Map IO Base Memory32Fixed(ReadWrite, 0x00000000, 0x00000000, MEM0) - Memory32Fixed(ReadWrite, 0xfed00000, 0x00001000) // HPET MMIO Memory32Fixed(ReadWrite, 0xfed30000, 0x00001000) // SPI MMIO })

1 0

[commit] r1845 - cpu/x86/pc/olpc/via
by repository service June 28, 2010

June 28, 2010

Author: wmb Date: Mon Jun 28 07:09:09 2010 New Revision: 1845 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1845 Log: XO-1.5 Q3A41 Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Sun Jun 27 19:25:50 2010 (r1844) +++ cpu/x86/pc/olpc/via/fw-version.fth Mon Jun 28 07:09:09 2010 (r1845) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 40c +macro: FW_MINOR 41

1 0

[commit] r1844 - dev/hdaudio
by repository service June 27, 2010

June 27, 2010

Author: wmb Date: Sun Jun 27 19:25:50 2010 New Revision: 1844 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1844 Log: HDaudio driver - completed the list of HDaudio configuration default field values and changed some names for clarity. Modified: dev/hdaudio/config.fth dev/hdaudio/start-cx2058x.fth Modified: dev/hdaudio/config.fth ============================================================================== --- dev/hdaudio/config.fth Sun Jun 27 19:20:23 2010 (r1843) +++ dev/hdaudio/config.fth Sun Jun 27 19:25:50 2010 (r1844) @@ -3,26 +3,72 @@ : config( ( -- null-config-default ) 0 ; -: 1/8" ( u -- u ) h# 10000 or ; -: oanalog ( u -- u ) h# 70000 or ; \ other analog -: overrd ( u -- u ) h# 100 or ; \ override -: black ( u -- u ) h# 1000 or ; -: green ( u -- u ) h# 4000 or ; -: pink ( u -- u ) h# 9000 or ; -: hp-out ( u -- u ) h# 200000 or ; -: spdiff-out ( u -- u ) h# 400000 or ; -: mic-in ( u -- u ) h# a00000 or ; -: line-in ( u -- u ) h# 800000 or ; -: line-out ( u -- u ) ; -: speaker ( u -- u ) h# 100000 or ; -: top ( u -- u ) h# 5000000 or ; -: right ( u -- u ) h# 4000000 or ; -: left ( u -- u ) h# 3000000 or ; -: front ( u -- u ) h# 2000000 or ; -: internal ( u -- u ) h# 10000000 or ; -: jack ( u -- u ) h# 00000000 or ; -: unused ( u -- u ) h# 40000000 or ; -: builtin ( u -- u ) h# 80000000 or ; +\ Connection types + : 1/8" ( u -- u ) h# 10000 or ; +\ : 1/4" ( u -- u ) h# 20000 or ; +\ : atapi ( u -- u ) h# 30000 or ; +\ : rca ( u -- u ) h# 40000 or ; +\ : optical ( u -- u ) h# 50000 or ; +\ : other-digital ( u -- u ) h# 60000 or ; + : other-analog ( u -- u ) h# 70000 or ; +\ : din ( u -- u ) h# 80000 or ; +\ : xlr ( u -- u ) h# 90000 or ; +\ : rj-11 ( u -- u ) h# a0000 or ; +\ : combination ( u -- u ) h# b0000 or ; +\ : other ( u -- u ) h# f0000 or ; + +\ Misc + : no-detect ( u -- u ) h# 100 or ; \ override jack presence detection + +\ Colors +\ : unknown ( u -- u ) h# 0000 or ; +\ : black ( u -- u ) h# 1000 or ; +\ : grey ( u -- u ) h# 2000 or ; +\ : blue ( u -- u ) h# 3000 or ; + : green ( u -- u ) h# 4000 or ; +\ : read ( u -- u ) h# 5000 or ; +\ : orange ( u -- u ) h# 6000 or ; +\ : yellow ( u -- u ) h# 7000 or ; +\ : purple ( u -- u ) h# 8000 or ; + : pink ( u -- u ) h# 9000 or ; +\ : white ( u -- u ) h# e000 or ; +\ : other-color ( u -- u ) h# f000 or ; + +\ Device + : line-out ( u -- u ) h# 000000 or ; + : speaker ( u -- u ) h# 100000 or ; + : hp-out ( u -- u ) h# 200000 or ; +\ : cd-in ( u -- u ) h# 300000 or ; +\ : spdif-out ( u -- u ) h# 400000 or ; +\ : other-digital-out ( u -- u ) h# 500000 or ; +\ : modem-line ( u -- u ) h# 600000 or ; +\ : modem-handset ( u -- u ) h# 700000 or ; +\ : line-in ( u -- u ) h# 800000 or ; +\ : aux ( u -- u ) h# 900000 or ; + : mic-in ( u -- u ) h# a00000 or ; +\ : telephony ( u -- u ) h# b00000 or ; +\ : spdif-in ( u -- u ) h# c00000 or ; +\ : other-digital-in ( u -- u ) h# e00000 or ; +\ : other-device ( u -- u ) h# f00000 or ; + +\ : rear ( u -- u ) h# 1000000 or ; + : front ( u -- u ) h# 2000000 or ; + : left ( u -- u ) h# 3000000 or ; + : right ( u -- u ) h# 4000000 or ; + : top ( u -- u ) h# 5000000 or ; +\ : bottom ( u -- u ) h# 6000000 or ; +\ : rear-panel ( u -- u ) h# 7000000 or ; +\ : drive-bay ( u -- u ) h# 8000000 or ; +\ : riser ( u -- u ) h# 17000000 or ; +\ : hdmi ( u -- u ) h# 18000000 or ; +\ : atapi-loc ( u -- u ) h# 19000000 or ; +\ : lid-inside ( u -- u ) h# 37000000 or ; +\ : lid-outside ( u -- u ) h# 38000000 or ; + +: jack ( u -- u ) h# 00000000 or ; +: internal ( u -- u ) h# 10000000 or ; +: unused ( u -- u ) h# 40000000 or ; +: builtin ( u -- u ) h# 80000000 or ; \ LICENSE_BEGIN \ Copyright (c) 2009 Luke Gorrie <luke(a)bup.co.nz> Modified: dev/hdaudio/start-cx2058x.fth ============================================================================== --- dev/hdaudio/start-cx2058x.fth Sun Jun 27 19:20:23 2010 (r1843) +++ dev/hdaudio/start-cx2058x.fth Sun Jun 27 19:25:50 2010 (r1844) @@ -60,17 +60,17 @@ porta config( 1/8" green left hp-out jack )config porta config( 1/8" green left hp-out jack )config portb config( 1/8" pink left mic-in jack )config - portc config( builtin internal top mic-in overrd oanalog )config - portd config( unused line-out overrd )config - porte config( unused line-out overrd )config - portf config( unused line-out overrd )config - portg config( builtin internal front speaker overrd oanalog )config - porth config( unused line-out overrd )config - porti config( unused line-out overrd )config - portj config( unused line-out overrd )config + portc config( builtin internal top mic-in no-detect other-analog )config + portd config( unused line-out no-detect )config + porte config( unused line-out no-detect )config + portf config( unused line-out no-detect )config + portg config( builtin internal front speaker no-detect other-analog )config + porth config( unused line-out no-detect )config + porti config( unused line-out no-detect )config + portj config( unused line-out no-detect )config vendor \ Vendor node - portk config( unused line-out overrd )config \ Luna + portk config( unused line-out no-detect )config \ Codec registers 21000 place-verb \ Undocumented register

1 0

[commit] r1843 - cpu/x86/pc/olpc/via
by repository service June 27, 2010

June 27, 2010

Author: wmb Date: Sun Jun 27 19:20:23 2010 New Revision: 1843 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1843 Log: XO-1.5 ACPI DSDT - Recent checkin broke compilation due to typo. Modified: cpu/x86/pc/olpc/via/dsdt.dsl Modified: cpu/x86/pc/olpc/via/dsdt.dsl ============================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl Sat Jun 26 11:29:40 2010 (r1842) +++ cpu/x86/pc/olpc/via/dsdt.dsl Sun Jun 27 19:20:23 2010 (r1843) @@ -40,16 +40,16 @@ "$Id$" }) -OperationRegion (SMIR, SystemIO, 0x042f, 0x01) -Field (SMIR, ByteAcc, NoLock, Preserve) -{ - SMIE, 8 -} -Method (FRTH, 1, NotSerialized) -{ - Store(Arg0, SMIE) - // Type "resume" at the OK prompt to return -} +// OperationRegion (SMIR, SystemIO, 0x042f, 0x01) +// Field (SMIR, ByteAcc, NoLock, Preserve) +// { +// SMIE, 8 +// } +// Method (FRTH, 1, NotSerialized) +// { +// Store(Arg0, SMIE) +// // Type "resume" at the OK prompt to return +// } OperationRegion (UART, SystemIO, 0x03f8, 0x08) @@ -2089,8 +2089,8 @@ IO(Decode16, 0, 0, 0, 0, IO1) // SPI Memory Map IO Base Memory32Fixed(ReadWrite, 0x00000000, 0x00000000, MEM0) - Memory32Fixed(ReadWrite, 0xfed00000, 0x00001000, MEM0) // HPET MMIO - Memory32Fixed(ReadWrite, 0xfed30000, 0x00001000, MEM0) // SPI MMIP + Memory32Fixed(ReadWrite, 0xfed00000, 0x00001000) // HPET MMIO + Memory32Fixed(ReadWrite, 0xfed30000, 0x00001000) // SPI MMIO }) Method(_CRS, 0)

1 0

[commit] r1842 - cpu/x86/pc/olpc/via
by repository service June 26, 2010

June 26, 2010

Author: wmb Date: Sat Jun 26 11:29:40 2010 New Revision: 1842 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1842 Log: OLPC XO-1.5 - commented out some test code that accidentally got incorporated in dsdt.dsl during the last checkin. Modified: cpu/x86/pc/olpc/via/dsdt.dsl Modified: cpu/x86/pc/olpc/via/dsdt.dsl ============================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl Sat Jun 26 11:27:11 2010 (r1841) +++ cpu/x86/pc/olpc/via/dsdt.dsl Sat Jun 26 11:29:40 2010 (r1842) @@ -301,7 +301,7 @@ // Method(_WAK, 1, Serialized) { - FRTH(2) +// FRTH(2) Notify(\_SB.PCI0.USB1, 0x00) Notify(\_SB.PCI0.USB2, 0x00) Notify(\_SB.PCI0.USB3, 0x00) @@ -381,7 +381,7 @@ Store (Zero, GS04) // Clear EXTSMI# Status, why? } Sleep(0x64) - FRTH(One) +// FRTH(One) Return (0x00) }

1 0

[commit] r1841 - cpu/x86/pc/olpc/via dev/hdaudio
by repository service June 26, 2010

June 26, 2010

Author: wmb Date: Sat Jun 26 11:27:11 2010 New Revision: 1841 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1841 Log: OLPC XO-1.5 - tweaks to ACPI DSDT and HDAudio configuration reporting to make Windows happy. Thanks to Luna. Modified: cpu/x86/pc/olpc/via/dsdt.dsl dev/hdaudio/config.fth dev/hdaudio/cx2058x-nodes.fth dev/hdaudio/start-cx2058x.fth Modified: cpu/x86/pc/olpc/via/dsdt.dsl ============================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl Fri Jun 25 09:06:37 2010 (r1840) +++ cpu/x86/pc/olpc/via/dsdt.dsl Sat Jun 26 11:27:11 2010 (r1841) @@ -40,6 +40,17 @@ "$Id$" }) +OperationRegion (SMIR, SystemIO, 0x042f, 0x01) +Field (SMIR, ByteAcc, NoLock, Preserve) +{ + SMIE, 8 +} +Method (FRTH, 1, NotSerialized) +{ + Store(Arg0, SMIE) + // Type "resume" at the OK prompt to return +} + OperationRegion (UART, SystemIO, 0x03f8, 0x08) // set to 1 to enable debug output @@ -290,6 +301,7 @@ // Method(_WAK, 1, Serialized) { + FRTH(2) Notify(\_SB.PCI0.USB1, 0x00) Notify(\_SB.PCI0.USB2, 0x00) Notify(\_SB.PCI0.USB3, 0x00) @@ -369,6 +381,7 @@ Store (Zero, GS04) // Clear EXTSMI# Status, why? } Sleep(0x64) + FRTH(One) Return (0x00) } @@ -2066,6 +2079,7 @@ IO(Decode16,0xE0,0xE0,0x00,0x10) IO(Decode16,0x380,0x380,0x00,0x8) // Additional EC port IO(Decode16,0x3E0,0x3E0,0x00,0x8) + IO(Decode16,0x3F8,0x3F8,0x00,0x8) // UART // Reserve 4D0 and 4D1 for IRQ edge/level control port IO(Decode16, 0x4D0,0x4D0,0x00,0x2) @@ -2075,6 +2089,8 @@ IO(Decode16, 0, 0, 0, 0, IO1) // SPI Memory Map IO Base Memory32Fixed(ReadWrite, 0x00000000, 0x00000000, MEM0) + Memory32Fixed(ReadWrite, 0xfed00000, 0x00001000, MEM0) // HPET MMIO + Memory32Fixed(ReadWrite, 0xfed30000, 0x00001000, MEM0) // SPI MMIP }) Method(_CRS, 0) Modified: dev/hdaudio/config.fth ============================================================================== --- dev/hdaudio/config.fth Fri Jun 25 09:06:37 2010 (r1840) +++ dev/hdaudio/config.fth Sat Jun 26 11:27:11 2010 (r1841) @@ -4,6 +4,9 @@ : config( ( -- null-config-default ) 0 ; : 1/8" ( u -- u ) h# 10000 or ; +: oanalog ( u -- u ) h# 70000 or ; \ other analog +: overrd ( u -- u ) h# 100 or ; \ override +: black ( u -- u ) h# 1000 or ; : green ( u -- u ) h# 4000 or ; : pink ( u -- u ) h# 9000 or ; : hp-out ( u -- u ) h# 200000 or ; @@ -12,6 +15,8 @@ : line-in ( u -- u ) h# 800000 or ; : line-out ( u -- u ) ; : speaker ( u -- u ) h# 100000 or ; +: top ( u -- u ) h# 5000000 or ; +: right ( u -- u ) h# 4000000 or ; : left ( u -- u ) h# 3000000 or ; : front ( u -- u ) h# 2000000 or ; : internal ( u -- u ) h# 10000000 or ; Modified: dev/hdaudio/cx2058x-nodes.fth ============================================================================== --- dev/hdaudio/cx2058x-nodes.fth Fri Jun 25 09:06:37 2010 (r1840) +++ dev/hdaudio/cx2058x-nodes.fth Sat Jun 26 11:27:11 2010 (r1841) @@ -15,8 +15,9 @@ : portg ( -- ) h# 1f set-node ; \ Port G - speaker driver : porth ( -- ) h# 20 set-node ; \ Port H - S/PDIF out : porti ( -- ) h# 22 set-node ; \ Port I - S/PDIF out -: portj ( -- ) h# 23 set-node ; \ Digital mic +: portj ( -- ) h# 23 set-node ; \ Digital mic 1/2 : vendor ( -- ) h# 25 set-node ; \ Vendor-specific controls +: portk ( -- ) h# 27 set-node ; \ Port K - Dig Mic 3/4 \ LICENSE_BEGIN \ Copyright (c) 2009 Luke Gorrie <luke(a)bup.co.nz> Modified: dev/hdaudio/start-cx2058x.fth ============================================================================== --- dev/hdaudio/start-cx2058x.fth Fri Jun 25 09:06:37 2010 (r1840) +++ dev/hdaudio/start-cx2058x.fth Sat Jun 26 11:27:11 2010 (r1841) @@ -60,16 +60,17 @@ porta config( 1/8" green left hp-out jack )config porta config( 1/8" green left hp-out jack )config portb config( 1/8" pink left mic-in jack )config - portc config( builtin internal front mic-in )config - portd config( unused line-out )config - porte config( unused line-out )config - portf config( 1/8" pink left line-in jack )config - portg config( builtin internal front speaker )config - porth config( unused spdiff-out )config - porti config( unused spdiff-out )config - portj config( unused mic-in )config + portc config( builtin internal top mic-in overrd oanalog )config + portd config( unused line-out overrd )config + porte config( unused line-out overrd )config + portf config( unused line-out overrd )config + portg config( builtin internal front speaker overrd oanalog )config + porth config( unused line-out overrd )config + porti config( unused line-out overrd )config + portj config( unused line-out overrd )config vendor \ Vendor node + portk config( unused line-out overrd )config \ Luna \ Codec registers 21000 place-verb \ Undocumented register @@ -91,12 +92,12 @@ 31000 place-verb \ Undocumented register 32000 place-verb \ Undocumented register 33000 place-verb \ Undocumented register - 34001 place-verb \ Maximum output power for speaker - see Class-DSpeakerPower.pdf + 34003 place-verb \ Maximum output power for speaker - see Class-DSpeakerPower.pdf 35000 place-verb \ Undocumented register 3600A place-verb \ Undocumented register 37000 place-verb \ Undocumented register - 38021 place-verb \ over-current / short-circuit protection, 2.6A threshold - 390C5 place-verb \ temperature protection at 79.5C + 38022 place-verb \ over-current / short-circuit protection, 2.6A threshold + 39057 place-verb \ temperature protection at 79.5C 3A000 place-verb \ Undocumented register \ Digital registers 41541 place-verb \ Undocumented register @@ -112,7 +113,7 @@ afg \ Audio Function Group node - 71C01 place-verb \ Undocumented register + 71C00 place-verb \ Undocumented register 71D00 place-verb \ SPDIF OFF BUT Int-Mic on \ Undocumented register 71E00 place-verb \ Undocumented register 71F00 place-verb \ disable software GSMark protection

1 0

[commit] r1834 - forth/lib
by repository service June 25, 2010

June 25, 2010

Author: wmb Date: Fri Jun 25 01:25:15 2010 New Revision: 1834 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1834 Log: Checked in queue.fth . Added: forth/lib/queue.fth Added: forth/lib/queue.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ forth/lib/queue.fth Fri Jun 25 01:25:15 2010 (r1834) @@ -0,0 +1,69 @@ +\ See license at end of file +purpose: Character queue + +struct ( queue ) + /l field >qbase + /l field >qsize + /l field >qgetp + /l field >qputp +constant /queue + +: clearq ( q -- ) dup >qbase l@ swap 2dup >qgetp l! >qputp l! ; +: makeq ( size -- q ) + /queue alloc-mem ( size q ) + swap 1+ over >qsize l! ( q ) + dup >qsize l@ alloc-mem over >qbase l! dup clearq +; +: decqp ( q ptr -- q ptr' ) + over >qbase l@ over = if over >qsize l@ + then 1- +; +: putq ( char q -- ) + dup >qputp l@ decqp ( char q putptr ) + begin over >qgetp l@ over = while pause repeat ( char q putptr ) + rot over c! ( q putptr ) + swap >qputp l! ( ) +; +: getq ( q -- char ) + dup >qgetp @ ( q getptr ) + begin over >qputp l@ over = while pause repeat ( q getptr ) + decqp ( q getptr ) + dup c@ -rot ( char q getptr ) + swap >qgetp l! ( char ) +; +: qempty? ( q -- flag ) dup >qgetp l@ swap >qputp @ = ; +: qfull? ( q -- flag ) dup >qputp l@ decqp swap >qgetp @ = ; +: qlen ( q -- len ) + dup >qgetp l@ over >qputp l@ - ( q len ) + dup 0< if over >qsize l@ + then ( q len' ) + nip ( len ) +; +: q#open ( q -- n ) dup >qsize l@ 1- swap qlen - ; +\ 10 makeq constant q1 +\ : .q ( q -- ) +\ dup >qbase l@ . dup >qsize l@ . dup >qgetp l@ . dup >qputp l@ . cr +\ drop +\ ; + +\ LICENSE_BEGIN +\ Copyright (c) 2010 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

3 2

[commit] r1840 - forth/lib
by repository service June 25, 2010

June 25, 2010

Author: wmb Date: Fri Jun 25 09:06:37 2010 New Revision: 1840 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1840 Log: queue.fth - changed "l@/!" to "@/!" for portability to 64-bit systems. Modified: forth/lib/queue.fth Modified: forth/lib/queue.fth ============================================================================== --- forth/lib/queue.fth Fri Jun 25 06:03:56 2010 (r1839) +++ forth/lib/queue.fth Fri Jun 25 09:06:37 2010 (r1840) @@ -2,45 +2,45 @@ purpose: Character queue struct ( queue ) - /l field >qbase - /l field >qsize - /l field >qgetp - /l field >qputp + /n field >qbase + /n field >qsize + /n field >qgetp + /n field >qputp constant /queue -: clearq ( q -- ) dup >qbase l@ swap 2dup >qgetp l! >qputp l! ; +: clearq ( q -- ) dup >qbase @ swap 2dup >qgetp ! >qputp ! ; : makeq ( size -- q ) /queue alloc-mem ( size q ) - swap 1+ over >qsize l! ( q ) - dup >qsize l@ alloc-mem over >qbase l! dup clearq + swap 1+ over >qsize ! ( q ) + dup >qsize @ alloc-mem over >qbase ! dup clearq ; : decqp ( q ptr -- q ptr' ) - over >qbase l@ over = if over >qsize l@ + then 1- + over >qbase @ over = if over >qsize @ + then 1- ; : putq ( char q -- ) - dup >qputp l@ decqp ( char q putptr ) - begin over >qgetp l@ over = while pause repeat ( char q putptr ) - rot over c! ( q putptr ) - swap >qputp l! ( ) + dup >qputp @ decqp ( char q putptr ) + begin over >qgetp @ over = while pause repeat ( char q putptr ) + rot over c! ( q putptr ) + swap >qputp ! ( ) ; : getq ( q -- char ) - dup >qgetp @ ( q getptr ) - begin over >qputp l@ over = while pause repeat ( q getptr ) - decqp ( q getptr ) - dup c@ -rot ( char q getptr ) - swap >qgetp l! ( char ) + dup >qgetp @ ( q getptr ) + begin over >qputp @ over = while pause repeat ( q getptr ) + decqp ( q getptr ) + dup c@ -rot ( char q getptr ) + swap >qgetp ! ( char ) ; -: qempty? ( q -- flag ) dup >qgetp l@ swap >qputp @ = ; -: qfull? ( q -- flag ) dup >qputp l@ decqp swap >qgetp @ = ; +: qempty? ( q -- flag ) dup >qgetp @ swap >qputp @ = ; +: qfull? ( q -- flag ) dup >qputp @ decqp swap >qgetp @ = ; : qlen ( q -- len ) - dup >qgetp l@ over >qputp l@ - ( q len ) - dup 0< if over >qsize l@ + then ( q len' ) + dup >qgetp @ over >qputp @ - ( q len ) + dup 0< if over >qsize @ + then ( q len' ) nip ( len ) ; -: q#open ( q -- n ) dup >qsize l@ 1- swap qlen - ; +: q#open ( q -- n ) dup >qsize @ 1- swap qlen - ; \ 10 makeq constant q1 \ : .q ( q -- ) -\ dup >qbase l@ . dup >qsize l@ . dup >qgetp l@ . dup >qputp l@ . cr +\ dup >qbase @ . dup >qsize @ . dup >qgetp @ . dup >qputp @ . cr \ drop \ ;

1 0