openfirmware August 2009

openfirmware@openfirmware.info

3 participants
74 discussions

r1281 - cpu/x86 dev/hdaudio
by svn＠openfirmware.info 06 Aug '09

06 Aug '09

Author: wmb Date: 2009-08-06 02:14:04 +0200 (Thu, 06 Aug 2009) New Revision: 1281 Modified: cpu/x86/firfilter.fth dev/hdaudio/core.fth Log: Use FIR upsampling filter for HD Audio. Modified: cpu/x86/firfilter.fth =================================================================== --- cpu/x86/firfilter.fth 2009-08-06 00:13:06 UTC (rev 1280) +++ cpu/x86/firfilter.fth 2009-08-06 00:14:04 UTC (rev 1281) @@ -46,7 +46,8 @@ d# 24 [sp] di mov \ Output pointer op: … [View More]

1 0

r1280 - cpu/x86/pc/olpc/via dev/ide dev/mmc/sdhci
by svn＠openfirmware.info 06 Aug '09

06 Aug '09

Author: wmb Date: 2009-08-06 02:13:06 +0200 (Thu, 06 Aug 2009) New Revision: 1280 Modified: cpu/x86/pc/olpc/via/fsupdate.fth dev/ide/idedisk.fth dev/mmc/sdhci/sdhci.fth Log: Enabled asynchronous writes for fs-update. Modified: cpu/x86/pc/olpc/via/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth 2009-08-05 20:43:52 UTC (rev 1279) +++ cpu/x86/pc/olpc/via/fsupdate.fth 2009-08-06 00:13:06 UTC (rev 1280) @@ -105,… [View More]7 +105,7 @@ : zblocks-end: ( -- ) \ Asynchronous writes -\ " write-blocks-finish" $call-nand drop + " write-blocks-finish" $call-nand drop #image-eblocks erase-gap ; @@ -176,20 +176,20 @@ r> get-zdata ( eblock# hashname$ hash$ ) - check-hash? if + check-hash? if ( eblock# hashname$ hash$ ) check-hash ( eblock# ) - else + else ( eblock# hashname$ hash$ ) 2drop 2drop ( eblock# ) then ( eblock# ) \ Asynchronous writes -\ data-buffer over nand-pages/block * nand-pages/block " write-blocks-start" $call-nand - data-buffer over nand-pages/block * nand-pages/block " write-blocks" $call-nand - swap-buffers + data-buffer over nand-pages/block * nand-pages/block " write-blocks-start" $call-nand ( eblock# ) +\ data-buffer over nand-pages/block * nand-pages/block " write-blocks" $call-nand drop ( eblock# ) + swap-buffers ( eblock# ) - dup to last-eblock# ( eblock# ) - show-written ( ) + dup to last-eblock# ( eblock# ) + show-written ( ) ; previous definitions @@ -205,7 +205,7 @@ over file ! linefeed line-delimiter c! ( fd fd' ) file ! ( fd ) - + t( also nand-commands ['] include-file catch dup if nip .error @@ -213,6 +213,7 @@ previous show-done close-nand-ihs + )t-hms ; : do-fs-update ( img$ -- ) Modified: dev/ide/idedisk.fth =================================================================== --- dev/ide/idedisk.fth 2009-08-05 20:43:52 UTC (rev 1279) +++ dev/ide/idedisk.fth 2009-08-06 00:13:06 UTC (rev 1280) @@ -63,6 +63,14 @@ : read-blocks ( addr block# #blocks -- #read ) " read-blocks" $call-parent ; : write-blocks ( addr block# #blocks -- #written ) " write-blocks" $call-parent ; +\ Stub implementation of asynchronous write interface +0 instance value #written +: write-blocks-start ( addr block# #blocks -- ) + " write-blocks" $call-parent to #written +; +: write-blocks-finish ( -- #written ) #written ; + + \ Methods used by external clients : open ( -- flag ) Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2009-08-05 20:43:52 UTC (rev 1279) +++ dev/mmc/sdhci/sdhci.fth 2009-08-06 00:13:06 UTC (rev 1280) @@ -824,8 +824,9 @@ address-shift lshift r> if read-multiple else - write-multiple true to writing? true to dma? + write-multiple true to writing? then + true to dma? ; : r/w-blocks ( addr block# #blocks in? -- actual ) [View Less]

1 0

r1279 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 05 Aug '09

05 Aug '09

Author: wmb Date: 2009-08-05 22:43:52 +0200 (Wed, 05 Aug 2009) New Revision: 1279 Modified: cpu/x86/pc/olpc/via/fw.bth Log: Via - include firfilter.fth in build, for later use by HD Audio driver. Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-08-05 20:43:13 UTC (rev 1278) +++ cpu/x86/pc/olpc/via/fw.bth 2009-08-05 20:43:52 UTC (rev 1279) @@ -344,6 +344,7 @@ fload ${BP}/cpu/x86/pc/olpc/… [View More]

1 0

r1278 - dev
by svn＠openfirmware.info 05 Aug '09

05 Aug '09

Author: wmb Date: 2009-08-05 22:43:13 +0200 (Wed, 05 Aug 2009) New Revision: 1278 Modified: dev/pckbd.fth Log: PC keyboard driver - improved retry logic for keyboard commands. Modified: dev/pckbd.fth =================================================================== --- dev/pckbd.fth 2009-08-05 20:39:38 UTC (rev 1277) +++ dev/pckbd.fth 2009-08-05 20:43:13 UTC (rev 1278) @@ -110,13 +110,48 @@ true ; -: ?ack ( response -- ) - begin h# fa <> while \ Consume stuff … [View More]

1 0

r1277 - cpu/x86/pc/olpc/via dev/mmc/sdhci
by svn＠openfirmware.info 05 Aug '09

05 Aug '09

Author: wmb Date: 2009-08-05 22:39:38 +0200 (Wed, 05 Aug 2009) New Revision: 1277 Modified: cpu/x86/pc/olpc/via/fsupdate.fth dev/mmc/sdhci/sdhci.fth dev/mmc/sdhci/sdmmc.fth Log: Via fs-update speedups from Luke Gorrie. Modified: cpu/x86/pc/olpc/via/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth 2009-08-05 20:37:27 UTC (rev 1276) +++ cpu/x86/pc/olpc/via/fsupdate.fth 2009-08-05 20:39:38 UTC (rev 1277) @@ -103,… [View More]7 +103,11 @@ get-inflater ; -: zblocks-end: ( -- ) #image-eblocks erase-gap ; +: zblocks-end: ( -- ) +\ Asynchronous writes +\ " write-blocks-finish" $call-nand drop + #image-eblocks erase-gap +; : data: ( "filename" -- ) safe-parse-word fn-buf place @@ -117,12 +121,20 @@ #image-eblocks show-writing ; +\ We simultaneously DMA one data buffer onto NAND while unpacking the +\ next block of data into another. The buffers exchange roles after +\ each block. +load-base value dma-buffer +load-base /nand-block 4 * + value data-buffer + +: swap-buffers ( -- ) data-buffer dma-buffer to data-buffer to dma-buffer ; + : get-zdata ( comprlen -- ) secure-fsupdate? if - load-base /spec-maxline fileih read-line ( len end? error? ) + data-buffer /spec-maxline fileih read-line ( len end? error? ) " Spec line read error" ?nand-abort ( len end? ) 0= " Spec line too long" ?nand-abort ( len ) - load-base swap ( adr len ) + data-buffer swap ( adr len ) source $= 0= " Spec line mismatch" ?nand-abort ( ) fileih ( ih ) @@ -130,17 +142,31 @@ source-id ( ih ) then ( ih ) - >r load-base /nand-block + over r@ fgets ( comprlen #read r: ih ) + >r data-buffer /nand-block + over r@ fgets ( comprlen #read r: ih ) <> " Short read of zdata file" ?nand-abort ( r: ih ) r> fgetc newline <> ( error? ) " Missing newline after zdata" ?nand-abort ( ) \ The "2+" skips the Zlib header - load-base /nand-block + 2+ load-base true (inflate) ( len ) + data-buffer /nand-block + 2+ data-buffer true (inflate) ( len ) /nand-block <> " Wrong expanded data length" ?nand-abort ( ) ; +false value check-hash? + +: check-hash ( -- ) + 2>r ( eblock# hashname$ r: hash$ ) + data-buffer /nand-block 2swap ( eblock# data$ hashname$ r: hash$ ) + hash ( eblock# calc-hash$ r: hash$ ) + 2r> $= 0= if ( eblock# ) + ." Bad hash for eblock# " .x cr cr + ." Your USB key may be bad. Please try a different one." cr + ." See http://wiki.laptop.org/go/Bad_hash" cr cr + abort + then ( eblock# ) +; + : zblock: ( "eblock#" "comprlen" "hashname" "hash-of-128KiB" -- ) get-hex# ( eblock# ) get-hex# >r ( eblock# r: comprlen ) @@ -150,26 +176,18 @@ r> get-zdata ( eblock# hashname$ hash$ ) - 2>r ( eblock# hashname$ r: hash$ ) - load-base /nand-block 2swap ( eblock# data$ hashname$ r: hash$ ) - hash ( eblock# calc-hash$ r: hash$ ) - - 2r> $= 0= if ( eblock# ) - ." Bad hash for eblock# " .x cr cr - ." Your USB key may be bad. Please try a different one." cr - ." See http://wiki.laptop.org/go/Bad_hash" cr cr - abort - then ( eblock# ) - - dup erase-gap ( eblock# ) + check-hash? if + check-hash ( eblock# ) + else + 2drop 2drop ( eblock# ) + then - dup /nand-block um* " seek" $call-nand ( eblock# error ) - " Bad seek" ?nand-abort ( eblock# ) + ( eblock# ) +\ Asynchronous writes +\ data-buffer over nand-pages/block * nand-pages/block " write-blocks-start" $call-nand + data-buffer over nand-pages/block * nand-pages/block " write-blocks" $call-nand + swap-buffers - load-base /nand-block " write" $call-nand ( eblock# #written ) - /nand-block <> ( eblock# error? ) - " Error writing to NAND FLASH" ?nand-abort ( eblock# ) - dup to last-eblock# ( eblock# ) show-written ( ) ; Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2009-08-05 20:37:27 UTC (rev 1276) +++ dev/mmc/sdhci/sdhci.fth 2009-08-05 20:39:38 UTC (rev 1277) @@ -798,7 +798,24 @@ : dma-alloc ( size -- vadr ) " dma-alloc" $call-parent ; : dma-free ( vadr size -- ) " dma-free" $call-parent ; -: r/w-blocks ( addr block# #blocks in? -- actual ) +0 instance value dma? + +: wait-dma-done ( -- ) + dma? if + 2 wait + dma-release + intstat-off + false to dma? + then +; + +: r/w-blocks-finish ( -- actual ) + wait-dma-done + dma-len /block / +; + +: r/w-blocks-start ( addr block# #blocks in? -- ) + wait-dma-done over 0= if 2drop 2drop 0 exit then \ Prevents hangs intstat-on >r ( addr block# #blocks r: in? ) @@ -807,14 +824,14 @@ address-shift lshift r> if read-multiple else - write-multiple true to writing? + write-multiple true to writing? true to dma? then - 2 wait - dma-release - dma-len /block / - intstat-off ; +: r/w-blocks ( addr block# #blocks in? -- actual ) + r/w-blocks-start r/w-blocks-finish +; + : r/w-ioblocks ( reg# function# inc? addr len blksz in? -- actual ) 2 pick 0= if 2drop 2drop 2drop drop 0 exit then \ Prevents hangs intstat-on @@ -844,6 +861,7 @@ ; : close ( -- ) + wait-dma-done open-count 1 = if scratch-buf d# 64 " dma-free" $call-parent then Modified: dev/mmc/sdhci/sdmmc.fth =================================================================== --- dev/mmc/sdhci/sdmmc.fth 2009-08-05 20:37:27 UTC (rev 1276) +++ dev/mmc/sdhci/sdmmc.fth 2009-08-05 20:39:38 UTC (rev 1277) @@ -31,6 +31,16 @@ false " r/w-blocks" $call-parent ; +\ Asynchronous write. Completes on the next call to +\ write-blocks-start, write-blocks-finish, or close. +\ (Don't do other read/write operations in between.) +: write-blocks-start ( adr block# #blocks -- ) + false " r/w-blocks-start" $call-parent +; +: write-blocks-finish ( -- #written ) + false " r/w-blocks-finish" $call-parent +; + : dma-alloc ( size -- vadr ) " dma-alloc" $call-parent ; : dma-free ( vadr size -- ) " dma-free" $call-parent ; [View Less]

1 0

r1276 - cpu/x86
by svn＠openfirmware.info 05 Aug '09

05 Aug '09

Author: wmb Date: 2009-08-05 22:37:27 +0200 (Wed, 05 Aug 2009) New Revision: 1276 Modified: cpu/x86/iirfilter.fth Log: IIR Filter - changed input length argument from #samples to /inbuf. Modified: cpu/x86/iirfilter.fth =================================================================== --- cpu/x86/iirfilter.fth 2009-08-05 20:36:19 UTC (rev 1275) +++ cpu/x86/iirfilter.fth 2009-08-05 20:37:27 UTC (rev 1276) @@ -274,30 +274,26 @@ \ Stride is 2 for mono, 4 for stereo \ For stereo you … [View More]

1 0

r1275 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 05 Aug '09

05 Aug '09

Author: wmb Date: 2009-08-05 22:36:19 +0200 (Wed, 05 Aug 2009) New Revision: 1275 Modified: cpu/x86/pc/olpc/via/dsdt.dsl Log: Via DSDT - wakeup changes from Paul Fox. Modified: cpu/x86/pc/olpc/via/dsdt.dsl =================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl 2009-08-05 03:25:58 UTC (rev 1274) +++ cpu/x86/pc/olpc/via/dsdt.dsl 2009-08-05 20:36:19 UTC (rev 1275) @@ -121,42 +121,44 @@ OperationRegion(\GPST, SystemIO, 0x0420, 0x2) Field(\… [View More]GPST, ByteAcc, NoLock, Preserve) { - GS00,1, - GS01,1, - GS02,1, - GS03,1, - GS04,1, - GS05,1, - GS06,1, - GS07,1, - GS08,1, - GS09,1, - GS10,1, - GS11,1, // lid - GS12,1, - GS13,1, - GS14,1, - GS15,1, + GS00,1, // GPI0 + GS01,1, // GPI1 (GPWAKE) + GS02,1, // internal KBC PME + GS03,1, // V1 Interrupt + GS04,1, // EXTSMI# + GS05,1, // PME# + GS06,1, // INTRUDER# + GS07,1, // GP3 timer timeout + GS08,1, // ring + GS09,1, // mouse controller PME + GS10,1, // thermal detect (ebook) + GS11,1, // LID# + GS12,1, // battery low + GS13,1, // HDAC wakeup + GS14,1, // USB wakeup + GS15,1, // north module SERR# } -// PMIO_RX24/5 -OperationRegion(\GPSE, SystemIO, 0x0424, 0x2) // Genernal Purpose SMI Enable +// PMIO_RX22/3 +OperationRegion(\GPSE, SystemIO, 0x0422, 0x2) // Genernal Purpose SCI Enable Field(\GPSE, ByteAcc, NoLock, Preserve) { - GPS0, 1, // GPI0 SMI Enable - GPS1, 1, // GPI1 SMI Enable + GPS0, 1, // GPI0 SCI Enable + GPWK, 1, // GPI1 SCI Enable KBCE, 1, // PS2 KB PME Enable - , 1, - EXTE, 1, // EXT SMI Enable + , 1, + EXTE, 1, // EXTSMI# Enable PME, 1, // PCI PME Enable , 2, RING, 1, // Ring Wakeup - , 2, + , 1, + THRM, 1, // Ebook/Thermal detect LID, 1, // Lid Wakeup - , 2, + , 1, // BATLOW Enable + HDA, 1, // HDA Enable USBE, 1, // USB Resume - , 1, + , 1, // NB SERR Detect } - + // PMIO_RX28/9 OperationRegion(\Glos, SystemIO, 0x0428, 0x2) // Global Status Field(\Glos, ByteAcc, NoLock, Preserve) { @@ -183,10 +185,19 @@ , 1, // , 1, // , 1, // battery low enable (0 == enable) - , 1, // therm polarity (1 == falling) + TPOL, 1, // therm polarity (1 == falling) LPOL, 1, // lid polarity (1 == falling) } +// from BIOS porting guide, section 13.2.2.4 +OperationRegion(\ENB, SystemIO, 0x048c, 0x1) // SMI enable, lid edge polarity +Field(\ENB, ByteAcc, NoLock, Preserve) { + , 3, + TENB, 1, // therm enable (1 == enabled) + , 4, + +} + OperationRegion(\Stus, SystemIO, 0x0430, 0x1) // Global Status Field(\Stus, ByteAcc, NoLock, Preserve) { PADS, 8, @@ -204,23 +215,44 @@ // Scope(\_GPE) { + Method(_L01) { + UPUT (0x31) // 1 + Notify(\_SB.PCI0.EC, 0x80) // GPWAKE, from the EC + } + Method(_L02) { + UPUT (0x33) // 3 Notify(\_SB.PCI0.VT86.PS2K, 0x02) //Internal Keyboard PME Status } Method(_L04) { + UPUT (0x34) // 4 Notify(\_SB.SLPB, 0x80) } Method(_L05) { + UPUT (0x35) // 5 Notify(\_SB.PCI0,0x2) } + Method(_L08) { // A-series EBOOK event (RING) (will go away) + UPUT (0x64) // d + Notify(\_SB.PCI0.EBKA, 0x80) + } + Method(_L09) { + UPUT (0x39) // 9 Notify(\_SB.PCI0.VT86.PS2M, 0x02) //Internal Mouse Controller PME Status } + Method(_L0A) { // EBOOK event (THRM#) + UPUT (0x65) // e + Not(TPOL, TPOL) // Flip the therm polarity bit + Notify(\_SB.PCI0.EBK, 0x80) + } + Method(_L0B) { // LID event + UPUT (0x66) // f Not(LPOL, LPOL) // Flip the lid polarity bit Notify(\_SB.PCI0.LID, 0x80) } @@ -320,27 +352,27 @@ Return (0x00) } -Method(STRC, 2) { // Compare two String - If(LNotEqual(Sizeof(Arg0), Sizeof(Arg1))) { - Return(1) - } - - Add(Sizeof(Arg0), 1, Local0) - - Name(BUF0, Buffer(Local0) {}) - Name(BUF1, Buffer(Local0) {}) - - Store(Arg0, BUF0) - Store(Arg1, BUF1) - - While(Local0) { - Decrement(Local0) - If(LNotEqual(Derefof(Index(BUF0, Local0)), Derefof(Index(BUF1, Local0)))) { - Return(1) - } - } - Return(0) // Str1 & Str2 are match -} +// Method(STRC, 2) { // Compare two String +// If(LNotEqual(Sizeof(Arg0), Sizeof(Arg1))) { +// Return(1) +// } +// +// Add(Sizeof(Arg0), 1, Local0) +// +// Name(BUF0, Buffer(Local0) {}) +// Name(BUF1, Buffer(Local0) {}) +// +// Store(Arg0, BUF0) +// Store(Arg1, BUF1) +// +// While(Local0) { +// Decrement(Local0) +// If(LNotEqual(Derefof(Index(BUF0, Local0)), Derefof(Index(BUF1, Local0)))) { +// Return(1) +// } +// } +// Return(0) // Str1 & Str2 are match +// } // // System Bus @@ -352,10 +384,8 @@ Device (SLPB) { Name (_HID, EISAID("PNP0C0E")) // Hardware Device ID SLEEPBTN - Method(_STA, 0) { - Return(0x0B) // non-present, enabled, functioning - } - + Name (_STA, 0) // not present on XO. note that there are still + // Notify() calls to SLPB -- not sure what that will do. Name(_PRW, Package(2){0x04,5}) //Internal Keyboard Controller PME Status; S5 } @@ -370,6 +400,7 @@ Method(_INI, 0) { + UPUT (0x4a) // J } Name (_S3D, 3) @@ -1160,7 +1191,7 @@ Device(PS2M) //PS2 Mouse { Name(_HID,EISAID("PNP0F13")) - Name(_STA, 0x0F) + Name(_STA, 0x0) // not present: not used on XO Name(_CRS, ResourceTemplate () { IRQNoFlags () {12} }) Name(_PRW, Package() {0x09, 0x04}) } @@ -1170,7 +1201,7 @@ Name(_HID,EISAID("PNP0303")) Name(_CID,EISAID("PNP030B")) // Microsoft reserved PNP ID - Name(_STA,0x0F) + Name(_STA,0x0) // not present: not used on XO Name (_CRS, ResourceTemplate () { @@ -1864,7 +1895,6 @@ { If (LNot (Acquire (ACMX, 5000))) { - UPUT (0x69) // i // Store (ECRD (0xFB5F), Local0) Store (ECR1 (0x2c), Local0) // CMD_READ_BATTERY_TYPE // Store (ECRD (0xF929), Local1) // FIXME -- BAT_SOC_WARNNING @@ -2255,6 +2285,57 @@ } } // Device(P2PB) + Device (EBK) { + Name (_PRW, Package (0x02) { 0x0A, 0x04 }) // Event 0A, wakes from S4 + + Method(_INI, 0) + { + UPUT (0x6b) // k + Store (One, TENB) // Enable ebook (THERM#) + Store (One, THRM) + } + + Method(EBK) { + If (TPOL) { // ebook is "open" + UPUT (0x65) // e + } Else { + UPUT (0x45) // E + } + Return(TPOL) + } + } // Device(EBK) + + // RING-based ebook support, on A-series boards + Device (EBKA) { + Name (_PRW, Package (0x02) { 0x08, 0x04 }) // Event 08, wakes from S4 + + Method(_INI, 0) + { + UPUT (0x69) // i + Store (One, RING) + } + + Method(EBK) { + If (TPOL) { // ebook is "open" + UPUT (0x65) // e + } Else { + UPUT (0x45) // E + } + Return(TPOL) + } + } // Device(EBKA) + + Device (EC) { + Name (_PRW, Package (0x02) { 0x01, 0x04 }) // Event 01, wakes from S4 + + Method(_INI, 0) + { + UPUT (0x49) // I + Store (One, GPWK) // Enable gpwake + } + + } // Device(EC) + Device (LID) { Name (_HID, EisaId ("PNP0C0D")) Name (_PRW, Package (0x02) { 0x0B, 0x04 }) // Event 0B, wakes from S4 @@ -2265,8 +2346,7 @@ } Else { UPUT (0x4c) // L } - Store (Zero, GS11) // Clear lid - Return(LPOL) + Return(LNot(LPOL)) // pgf is unclear on why this polarity is correct } } // Device(LID) [View Less]

1 0

r1274 - cpu/x86
by svn＠openfirmware.info 05 Aug '09

05 Aug '09

Author: wmb Date: 2009-08-05 05:25:58 +0200 (Wed, 05 Aug 2009) New Revision: 1274 Added: cpu/x86/firfilter.fth Log: Added firfilter.fth, an FIR upsampling filter. Added: cpu/x86/firfilter.fth =================================================================== --- cpu/x86/firfilter.fth (rev 0) +++ cpu/x86/firfilter.fth 2009-08-05 03:25:58 UTC (rev 1274) @@ -0,0 +1,156 @@ +purpose: FIR polyphase digital 6x upsampling filter + +d# 15 constant mulscale \ Bits for … [View More]fractional multipliers + +\ Upsample, expanding one input sample to #phases output samples +\ outptr - where to put the output samples; updated to the next location +\ stride - the distance between successive input samples - 2 for mono, 4 for stereo +\ inptr - pointer into array of input samples +\ weights - pointer to filter weights, sorted by phase +\ taps/phase - the number of filter taps per phase +\ #phases - the number of filter phases, equal to the upsampling ratio + +code fir-upsample ( outptr stride inptr weights taps/phase #phases -- outptr' stride ) + \ 20 16 12 08 04 00 + \ 24 20 16 12 08 04 00:DI + + d# 08 [sp] si xchg \ SI: weights (old value stored on stack) + di push \ Save DI + + begin + d# 16 [sp] bx mov \ BX: inptr + di di xor \ Accumulator + + d# 08 [sp] cx mov \ taps/phase + begin + op: 0 [bx] ax mov + cwde + 0 [si] imul + 4 [si] si lea \ Update weight pointer + mulscale # dx ax shrd \ Scale down by multiplier scale factor + ax di add \ Accumulate + + d# 20 [sp] bx sub \ Update inbuf ptr + loopa + + di ax mov + + \ Saturate + d# 32767 # ax cmp > if + d# 32767 # ax mov + else + d# -32767 # ax cmp < if + d# -32767 # ax mov + then + then + + d# 24 [sp] di mov \ Output pointer + op: ax stos \ Store output value + di d# 24 [sp] mov \ Update output pointer + + d# 04 [sp] dec \ Phase counter + 0= until + + di pop \ Restore DI + d# 08 [sp] si mov \ Restore SI + d# 16 [sp] sp lea \ Remove stuff from stack +c; + +\ Convert a decimal fraction to a scaled integer multiplier +: mul: ( "coef" -- ) + safe-parse-word push-decimal $number drop pop-base ( n ) + 1 mulscale lshift d# 1,000,000,000 */ ( n' ) + , +; + +\ Filter coefficients for 6x upsampling. The following filter was +\ computed with GNU Octave, using the program shown at the end of this file. +\ The coeeficients are ordered by phase for easy addressing in the inner loop. +\ The transition band is centered on Fs/6. The stopband attenuation is 78dB. +\ The -3dB point is about 95% of Fs/6. + +d# 6 constant #phases +d# 16 constant taps/phase + +create weights +\ Phase 0 +mul: 0.000190788 mul: 0.000375061 mul: -0.001237886 mul: 0.003214694 +mul: -0.007235622 mul: 0.015062052 mul: -0.031397096 mul: 0.080446668 +mul: 0.976279469 mul: -0.074732552 mul: 0.034801841 mul: -0.018817755 +mul: 0.010022601 mul: -0.004881022 mul: 0.002025107 mul: -0.000631880 + +\ Phase 1 +mul: -0.000511063 mul: 0.001786043 mul: -0.005327045 mul: 0.012716422 +mul: -0.026661852 mul: 0.052425455 mul: -0.105580171 mul: 0.283737941 +mul: 0.885823376 mul: -0.166749609 mul: 0.078608864 mul: -0.041296857 +mul: 0.021106533 mul: -0.009784496 mul: 0.003821226 mul: -0.001092645 + +\ Phase 2 +mul: -0.000795594 mul: 0.003214599 mul: -0.009060710 mul: 0.020831489 +mul: -0.042537000 mul: 0.082398233 mul: -0.167272365 mul: 0.508384704 +mul: 0.720544802 mul: -0.194040773 mul: 0.093827768 mul: -0.048873931 +mul: 0.024446032 mul: -0.010977550 mul: 0.004090325 mul: -0.001079175 + +\ Phase 3 +mul: -0.001079175 mul: 0.004090325 mul: -0.010977550 mul: 0.024446032 +mul: -0.048873931 mul: 0.093827768 mul: -0.194040773 mul: 0.720544802 +mul: 0.508384704 mul: -0.167272365 mul: 0.082398233 mul: -0.042537000 +mul: 0.020831489 mul: -0.009060710 mul: 0.003214599 mul: -0.000795594 + +\ Phase 4 +mul: -0.001092645 mul: 0.003821226 mul: -0.009784496 mul: 0.021106533 +mul: -0.041296857 mul: 0.078608864 mul: -0.166749609 mul: 0.885823376 +mul: 0.283737941 mul: -0.105580171 mul: 0.052425455 mul: -0.026661852 +mul: 0.012716422 mul: -0.005327045 mul: 0.001786043 mul: -0.000511063 + +\ Phase 5 +mul: -0.000631880 mul: 0.002025107 mul: -0.004881022 mul: 0.010022601 +mul: -0.018817755 mul: 0.034801841 mul: -0.074732552 mul: 0.976279469 +mul: 0.080446668 mul: -0.031397096 mul: 0.015062052 mul: -0.007235622 +mul: 0.003214694 mul: -0.001237886 mul: 0.000375061 mul: 0.000190788 + +taps/phase 2* /n* buffer: zbuf + +\ Stride is 2 for mono, 4 for stereo +\ For stereo you must call it twice with an offset of 2 for +\ inbuf and outbuf on the second call +: 8khz>48khz ( inbuf /inbuf outbuf stride -- ) + 2swap ( outbuf stride inbuf /inbuf ) + + \ First compute half a phase worth of samples with leading zeros + 2 pick taps/phase * >r ( outbuf stride inbuf /inbuf r: span ) + zbuf r@ 2/ erase ( outbuf stride inbuf /inbuf ) + + over zbuf r@ 2/ + r@ move ( outbuf stride inbuf /inbuf ) + r@ /string ( outbuf stride inbuf' /inbuf' ) + + 2swap zbuf r@ + r@ 2/ bounds ?do ( inbuf /inbuf outbuf stride ) + i weights taps/phase #phases fir-upsample ( inbuf /inbuf outbuf' strid ) + dup +loop ( inbuf /inbuf outbuf stride ) + + \ Compute the bulk of the samples where the filter taps fit entirely + \ within the input buffer + 2over bounds ?do ( inbuf /inbuf outbuf stride ) + i weights taps/phase #phases fir-upsample ( inbuf /inbuf outbuf' stride ) + dup +loop ( inbuf /inbuf outbuf stride ) + + \ Finally compute half a phase worth of samples with trailing zeros + 2swap ( outbuf stride inbuf /inbuf ) + + r@ - zbuf r@ move ( outbuf stride ) + zbuf r@ + r@ 2/ erase ( outbuf stride ) + zbuf r@ + r@ 2/ bounds ?do ( outbuf stride ) + i weights taps/phase #phases fir-upsample ( outbuf' stride ) + dup +loop ( outbuf stride ) + + r> 3drop ( ) +; + +0 [if] +\ Here is some Matlab/Octave code to compute the weights +weights = remez(95, [0 .12 .215 1], [1 1 0 0]); +for phase=1:6 + for tap=1:16 + printf("mul: %.9f ", 5.9 * weights((tap-1)*6+phase)); + end +end +[then] [View Less]

1 0

r1273 - cpu/x86
by svn＠openfirmware.info 04 Aug '09

04 Aug '09

Author: wmb Date: 2009-08-04 03:42:24 +0200 (Tue, 04 Aug 2009) New Revision: 1273 Modified: cpu/x86/iirfilter.fth Log: Fixed typos in iirfilter.fth Modified: cpu/x86/iirfilter.fth =================================================================== --- cpu/x86/iirfilter.fth 2009-08-04 01:33:39 UTC (rev 1272) +++ cpu/x86/iirfilter.fth 2009-08-04 01:42:24 UTC (rev 1273) @@ -51,6 +51,7 @@ si pop \ Restore SI ax push \ Return value c; +[then] \ iir-cascade-z1 is the same … [View More]

1 0

r1272 - cpu/x86
by svn＠openfirmware.info 04 Aug '09

04 Aug '09

Author: wmb Date: 2009-08-04 03:33:39 +0200 (Tue, 04 Aug 2009) New Revision: 1272 Modified: cpu/x86/assem.fth Log: Added SHRD and SHLD instructions to x86 assembler. Modified: cpu/x86/assem.fth =================================================================== --- cpu/x86/assem.fth 2009-08-04 01:32:33 UTC (rev 1271) +++ cpu/x86/assem.fth 2009-08-04 01:33:39 UTC (rev 1272) @@ -538,6 +538,14 @@ \ LSS, LFS, LGS : 16MI CREATE C, DOES> C@ prefix-0f ASM8, MEM, normal ; +\ SHLD,… [View More]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware August 2009