openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2503 - cpu/arm/olpc/1.75
by repository service 03 Sep '11

03 Sep '11

Author: rsmith Date: Sat Sep 3 17:55:57 2011 New Revision: 2503 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2503 Log: Q4B09 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Fri Sep 2 22:23:04 2011 (r2502) +++ cpu/arm/olpc/1.75/fw-version.fth Sat Sep 3 17:55:57 2011 (r2503) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 08 +macro: FW_MINOR 09

1 0

[commit] r2502 - cpu/arm/olpc/1.75
by repository service 02 Sep '11

02 Sep '11

Author: wmb Date: Fri Sep 2 22:23:04 2011 New Revision: 2502 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2502 Log: OLPC XO-1.75 - when reprogramming the EC FLASH, skip the page that contains the EC configuration flags. Modified: cpu/arm/olpc/1.75/ecflash.fth cpu/arm/olpc/1.75/edi.fth Modified: cpu/arm/olpc/1.75/ecflash.fth ============================================================================== --- cpu/arm/olpc/1.75/ecflash.fth Fri Sep 2 21:22:45 2011 (r2501) +++ cpu/arm/olpc/1.75/ecflash.fth Fri Sep 2 22:23:04 2011 (r2502) @@ -46,7 +46,6 @@ load-base /ec-flash + /ec-flash 0 " read-flash" $call-ec [else] use-edi-spi edi-open - ." Erasing ..." erase-chip cr ." Writing ..." load-base /ec-flash 0 edi-program-flash cr ." Verifying ..." load-base /ec-flash + /ec-flash 0 edi-read-flash Modified: cpu/arm/olpc/1.75/edi.fth ============================================================================== --- cpu/arm/olpc/1.75/edi.fth Fri Sep 2 21:22:45 2011 (r2501) +++ cpu/arm/olpc/1.75/edi.fth Fri Sep 2 22:23:04 2011 (r2502) @@ -131,13 +131,17 @@ h# 70 flash-cmd ( ) wait-flash-busy ( ) ; +h# 7e80 constant ec-flags-offset : edi-program-flash ( adr len offset -- ) - cr - swap 0 ?do - (cr i . - over i + over i + edi-program-page ( adr offset ) - /flash-page +loop ( adr offset ) - 2drop ( ) + cr ( adr len offset ) + swap 0 ?do ( adr offset ) + (cr i . ( adr offset ) + dup i + ec-flags-offset <> if ( adr offset ) + dup i + erase-page ( adr offset ) + over i + over i + edi-program-page ( adr offset ) + then ( adr offset ) + /flash-page +loop ( adr offset ) + 2drop ( ) ; : edi-read-flash ( adr len offset -- ) over 0= if 3drop exit then ( adr len offset )

1 0

[commit] r2501 - cpu/arm
by repository service 02 Sep '11

02 Sep '11

Author: wmb Date: Fri Sep 2 21:22:45 2011 New Revision: 2501 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2501 Log: ARM - deleted obsolete ARM_RAMDISK atag Modified: cpu/arm/linux.fth Modified: cpu/arm/linux.fth ============================================================================== --- cpu/arm/linux.fth Fri Sep 2 19:37:19 2011 (r2500) +++ cpu/arm/linux.fth Fri Sep 2 21:22:45 2011 (r2501) @@ -61,12 +61,6 @@ 0 tag-l, \ start_address /ramdisk if - 5 tag-l, \ size - h# 54410004 tag-l, \ ATAG_RAMDISK - 0 tag-l, \ load flag == 0 - d# 4096 tag-l, \ 4k kilobytes = 4 megabytes (calculate dynamically?) - 0 tag-l, \ unused floppy block number - 4 tag-l, h# 54420005 tag-l, \ ATAG_INITRD2 ramdisk-adr >physical tag-l, \ physical starting address

1 0

[commit] r2500 - dev/olpc/keyboard
by repository service 02 Sep '11

02 Sep '11

Author: wmb Date: Fri Sep 2 19:37:19 2011 New Revision: 2500 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2500 Log: OLPC keyboard selftest improvements for the case where the SP manages PS/2 and handles game buttons. Modified: dev/olpc/keyboard/selftest.fth Modified: dev/olpc/keyboard/selftest.fth ============================================================================== --- dev/olpc/keyboard/selftest.fth Fri Sep 2 19:35:05 2011 (r2499) +++ dev/olpc/keyboard/selftest.fth Fri Sep 2 19:37:19 2011 (r2500) @@ -575,6 +575,9 @@ false ; +" name" parent-device get-package-property drop decode-string ( name$ ) +" ec-spi" $= [if] + \ For XO-1.75, the game buttons are connected directly to the CPU SoC, \ instead of going through the EC. To preserve the rest of the test \ logic, we generate a stream of up-down events from the game button @@ -664,18 +667,19 @@ then ( false | scancode true ) ; -0 value ec-spi-buttons? - \ Check for a change in button state if necessary. : or-button? ( [scancode] key? -- [scancode] flag ) \ If there is already a key from get-data?, handle it before checking the game buttons - dup if exit then ( false ) + ?dup if exit then ( ) \ If the /ec-spi device node is present, the game buttons are directly connected \ so we must handle them here. Otherwise the EC will handle them and fold their \ events into the keyboard scancode stream. - ec-spi-buttons? if drop button-event? then + button-event? ; +[else] +alias or-button? noop immediate +[then] 0 value last-timestamp : selftest-keys ( -- ) @@ -728,13 +732,6 @@ : selftest ( -- error? ) open 0= if true exit then - " /ec-spi" locate-device if ( ) - false ( flag ) - else ( phandle ) - drop true ( flag ) - then ( flag ) - to ec-spi-buttons? ( ) - set-keyboard-type make-keys

1 0

[commit] r2499 - cpu/arm/olpc/1.75
by repository service 02 Sep '11

02 Sep '11

Author: wmb Date: Fri Sep 2 19:35:05 2011 New Revision: 2499 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2499 Log: OLPC XO-1.75 - changes in convenience commands like "newrom" to match my new network setup. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Fri Sep 2 19:32:54 2011 (r2498) +++ cpu/arm/olpc/1.75/fw.bth Fri Sep 2 19:35:05 2011 (r2499) @@ -518,10 +518,10 @@ ; : newrom - " flash! http:\\10.20.0.14\~wmb\new.rom" eval + " flash! http:\\10.20.0.14\new.rom" eval ; : newec - " flash-ec http:\\10.20.0.14\~wmb\ecimage.bin" eval + " flash-ec http:\\10.20.0.14\ecimage.bin" eval ; : qz " qz" $essid " http:\\qz\" included \ qa test bed scripting, james cameron

1 0

[commit] r2498 - cpu/arm/olpc/1.75
by repository service 02 Sep '11

02 Sep '11

Author: wmb Date: Fri Sep 2 19:32:54 2011 New Revision: 2498 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2498 Log: OLPC XO-1.75 - removed some more boring startup messages. Modified: cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/emmc.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Fri Sep 2 19:26:52 2011 (r2497) +++ cpu/arm/olpc/1.75/devices.fth Fri Sep 2 19:32:54 2011 (r2498) @@ -36,7 +36,6 @@ : stand-init-io ( -- ) stand-init-io inituarts install-uart-io - ." UART installed" cr ; warning on Modified: cpu/arm/olpc/1.75/emmc.fth ============================================================================== --- cpu/arm/olpc/1.75/emmc.fth Fri Sep 2 19:26:52 2011 (r2497) +++ cpu/arm/olpc/1.75/emmc.fth Fri Sep 2 19:32:54 2011 (r2498) @@ -1,6 +1,5 @@ \ XXX do we need to set the internal SD for fast drive in boardgpio.fth ? : select-internal-sd ( -- ) - ." Using internal SD" cr h# 18c3 d# 113 af! \ SD_CMD h# 18c3 d# 126 af! \ SD_DATA2 h# 18c3 d# 127 af! \ SD_DATA0 @@ -19,7 +18,6 @@ h# c1 d# 168 af! \ eMMC_D1 as GPIO ; : select-emmc ( -- ) - ." Using eMMC" cr h# c1 d# 113 af! \ SD_CMD as GPIO h# c1 d# 126 af! \ SD_DATA2 as GPIO h# c0 d# 127 af! \ SD_DATA0 as GPIO

1 0

[commit] r2497 - cpu/arm
by repository service 02 Sep '11

02 Sep '11

Author: wmb Date: Fri Sep 2 19:26:52 2011 New Revision: 2497 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2497 Log: ARM - fixes to initrd loading found by Daniel Drake. Modified: cpu/arm/linux.fth Modified: cpu/arm/linux.fth ============================================================================== --- cpu/arm/linux.fth Fri Sep 2 09:02:34 2011 (r2496) +++ cpu/arm/linux.fth Fri Sep 2 19:26:52 2011 (r2497) @@ -31,17 +31,11 @@ + ( limit ) ; -: add-root-dev ( cmdline$ -- cmdline$' ) - /ramdisk if ( cmdline$ ) - " root=/dev/ram0" $cat2 ( cmdline$' ) - then ( cmdline$ ) -; - \ see http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html 0 value arm-linux-machine-type \ Set this after loading this file h# 100 value linux-params \ The location recommended by the above article -def-load-base value linux-base +h# 10.0000 value linux-base 0 value rootdev# \ Set externally 0 value tag-adr @@ -74,13 +68,12 @@ 0 tag-l, \ unused floppy block number 4 tag-l, - h# 54420005 tag-l, \ ATAG_RAMDISK2 + h# 54420005 tag-l, \ ATAG_INITRD2 ramdisk-adr >physical tag-l, \ physical starting address /ramdisk tag-l, \ size of compressed ramdisk in bytes then \ Command line - ( cmdline$ ) add-root-dev ( cmdline$ ) ( adr len ) dup if ( adr len ) 1+ 4 round-up ( adr len+null_rounded ) @@ -121,7 +114,7 @@ : linux-place-ramdisk ( adr len -- ) to /ramdisk ( adr ) - memory-limit umin /ramdisk - ( adr new-ramdisk-adr ) + dup memory-limit umin /ramdisk - ( adr new-ramdisk-adr ) tuck /ramdisk move ( new-ramdisk-adr ) \ dup to linux-memtop to ramdisk-adr

1 0

[commit] r2496 - in cpu/arm: . mmp2 olpc/1.75
by repository service 02 Sep '11

02 Sep '11

Author: wmb Date: Fri Sep 2 09:02:34 2011 New Revision: 2496 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2496 Log: OLPC XO-1.75 - checkpoint current state of low-power test code. Modified: cpu/arm/assem.fth cpu/arm/mmp2/dramrecal.fth cpu/arm/olpc/1.75/addrs.fth Modified: cpu/arm/assem.fth ============================================================================== --- cpu/arm/assem.fth Wed Aug 31 10:31:46 2011 (r2495) +++ cpu/arm/assem.fth Fri Sep 2 09:02:34 2011 (r2496) @@ -1401,7 +1401,7 @@ : sev ( -- ) 0320f004 {cond} op( )op ; : nop ( -- ) e1a00000 {} op( )op ; \ mov r0,r0 -: dsb ( -- ) f57ff040 {} op( )op ; \ "dsb sy" is f57ff04f +: dsb ( -- ) f57ff04f {} op( )op ; \ "dsb" is equivalent to "dsb sy" - f57ff04f : dmb ( -- ) f57ff050 {} op( )op ; : isb ( -- ) f57ff060 {} op( )op ; Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Wed Aug 31 10:31:46 2011 (r2495) +++ cpu/arm/mmp2/dramrecal.fth Fri Sep 2 09:02:34 2011 (r2496) @@ -72,25 +72,22 @@ \ orr r1, r1, #0x000a \ ODT{1,0}_SWITCH_MODE: Termination controlled by Read and Write enables \ str r1, [r0, #0x770] \ SDRAM_CTRL7_SDRAM_ODT_CTRL2 -[ifdef] notdef +\ Store registers in SRAM so CForth can see them, for debugging +\ set r2, #0xd102.0400 +\ stmia r2, {r0-r15} + + \ Linux sets the register to 0x860 ldr r1, [r0, #0x1e0] \ PHY_CTRL8 bic r1,r1,#0x07700000 \ PHY_ADCM_ZPDRV: 0 PHY_ADCM_ZNDRV: 0 (Disable drivers 6:0) str r1, [r0, #0x1e0] \ PHY_CTRL8 -[then] - set r2, #0xfe086000 - set r3, #0xfe050000 - str r2, [r3] \ Final write to SP votes - - mcr p15,0,r0,7,10,4 \ Data Synchronization Barrier -\ dsb \ Data Synchronization Barrier + dsb \ Data Synchronization Barrier wfi \ Wait for interrupt -[ifdef] notdef + \ Linux sets the register to 0x07700860, hardcoding the drive strength ldr r1, [r0, #0x1e0] \ PHY_CTRL8 orr r1,r1,#0x07700000 \ PHY_ADCM_ZPDRV: 7 PHY_ADCM_ZNDRV: 7 (Enable drivers 6:0) str r1, [r0, #0x1e0] \ PHY_CTRL8 -[then] \ This block was commented-out in the Linux code, and the value is incorrect for OLPC in any case \ mov r1, #0x02000000 \ PAD_TERM_SWITCH_MODE: Termination enabled during all reads @@ -100,11 +97,11 @@ mov r1, #0x80000000 \ PHY_SYNC_EN str r1, [r0, #0x240] \ PHY_CTRL14 - ldr r1, [r0, #230] \ PHY_CTRL13 + ldr r1, [r0, #0x230] \ PHY_CTRL13 orr r1,r1,#0xf0000000 \ DLL_RESET_TIMER: 15*256 memory clocks \ mov r1, #0xf0000000 \ DLL_RESET_TIMER: 15*256 memory clocks \ orr r1, r1, #0x0040 \ DLL_PHSEL: 4 (45 + 4*3 = 57 degrees) - adjust? - str r1, [r0, #230] \ PHY_CTRL13 + str r1, [r0, #0x230] \ PHY_CTRL13 mov r1, #0x20000000 \ PHY_DLL_RESET str r1, [r0, #0x240] \ PHY_CTRL14 @@ -168,8 +165,11 @@ code do-self-refresh ( -- ) set r0,`memctrl-va #` \ Memory controller virtual address set r1,`'ddr-self-refresh #` \ Address of ddr-self-refresh routine in SRAM + mov r7,sp + set sp,`'ddr-self-refresh-sp #` mov lr,pc mov pc,r1 + mov sp,r7 c; : +apbc ( offset -- io-offset ) h# 01.5000 + ; @@ -217,16 +217,28 @@ h# f0 h# 1c +scu io-clr \ SCU_MCB_CONF ; : disable-apmu-clks ( -- ) - h# 3f h# d8 +apmu io-clr \ PMUA_MSPRO_CLK_RES_CTRL - h# 1fffd h# dc +apmu io-clr \ PMUA_GLB_CLK_RES_CTRL -\ 0 h# 68 +apmu io! \ PMUA_WTM_CLK_RES_CTRL - h# 9 h# 5c +apmu io-clr \ PMUA_USB_CLK_RES_CTRL + h# 1b h# 54 +apmu io-clr \ PMUA_SDH0_CLK_RES_CTRL + h# 1b h# 58 +apmu io-clr \ PMUA_SDH1_CLK_RES_CTRL + h# 1b h# e8 +apmu io-clr \ PMUA_SDH2_CLK_RES_CTRL + h# 1b h# d4 +apmu io-clr \ PMUA_SMC_CLK_RES_CTRL + h# 3f h# 60 +apmu io-clr \ PMUA_NF_CLK_RES_CTRL + h# 3f h# d8 +apmu io-clr \ PMUA_MSPRO_CLK_RES_CTRL - XO does not use MSPRO + h# 12 h# 10c +apmu io-clr \ PMUA_AUDIO_CLK_RES_CTRL + h# 1fffd h# dc +apmu io-clr \ PMUA_GLB_CLK_RES_CTRL +\ 0 h# 68 +apmu io! \ PMUA_WTM_CLK_RES_CTRL + h# 9 h# 5c +apmu io-clr \ PMUA_USB_CLK_RES_CTRL ; : enable-apmu-clks ( -- ) - h# 3f h# d8 +apmu io-set \ PMUA_MSPRO_CLK_RES_CTRL - h# 1fffd h# dc +apmu io-set \ PMUA_GLB_CLK_RES_CTRL -\ h# 1b h# 68 +apmu io! \ PMUA_WTM_CLK_RES_CTRL - h# 9 h# 5c +apmu io-set \ PMUA_USB_CLK_RES_CTRL + h# 1b h# 54 +apmu io-set \ PMUA_SDH0_CLK_RES_CTRL + h# 1b h# 58 +apmu io-set \ PMUA_SDH1_CLK_RES_CTRL + h# 1b h# e8 +apmu io-set \ PMUA_SDH2_CLK_RES_CTRL + h# 1b h# d4 +apmu io-set \ PMUA_SMC_CLK_RES_CTRL \ ??? what is this and why is it on? + h# 3f h# 60 +apmu io-set \ PMUA_NF_CLK_RES_CTRL \ Should this be on? +\ h# 3f h# d8 +apmu io-set \ PMUA_MSPRO_CLK_RES_CTRL + h# 12 h# 10c +apmu io-set \ PMUA_AUDIO_CLK_RES_CTRL + h# 1fffd h# dc +apmu io-set \ PMUA_GLB_CLK_RES_CTRL +\ h# 1b h# 68 +apmu io! \ PMUA_WTM_CLK_RES_CTRL + h# 9 h# 5c +apmu io-set \ PMUA_USB_CLK_RES_CTRL ; : disable-mpmu-clks ( -- ) h# a010 h# 1024 +mpmu io! \ MPMU_ACGR @@ -310,9 +322,37 @@ save-apcr h# 1000 +mpmu io! ( ) \ Restore APCR save-idlecfg h# 18 +apmu io! ( ) \ Restore IDLE_CFG ; +\ Questions: +\ Meaning of various connect type options +\ do LP mode settings take effect immediately if SP is already at WFI, or only on entry to WFI +\ does WFI make any difference on SP? I don't see any difference in power +\ Which WFI instruction on SP? +\ Which WFI instruction on PJ4? +\ Any undocumented bits that affect the situation? +\ What are the _INT versions of the XDB config files? +\ What does CS stand for in ARM/CS ? +\ When using XDB on XO with OFW, XDB can see entry to LP state - core Status stays running - LowPower Internal +\ How to recapture short of restarting XDB? +\ Pushing button on JTAG box often seems to have no effect + : setup-sleep-state ( -- ) \ begin mmp2_pm_enter_lowpower_mode(state) + \ Security processor setup + sleep-depth 4 >= if \ state at least POWER_MODE_CHIP_SLEEP (turn off most of SoC) + h# fe08.6000 0 +mpmu io! \ In SP, set AXISD, resvd, SLPEN, SPSD, DDRCORSD, APBSD resvd, VCXOSD + then + + sleep-depth 3 = if \ state at least POWER_MODE_APPS_SLEEP (turn off slow IO) + h# de00.6000 0 +mpmu io! \ In SP, set AXISD, resvd, SPSD, DDRCORSD, APBSD resvd, + then + +\ Linux value +\ h# 8030.0020 h# 14 +apmu io! \ IN PMUA_SP_IDLE_CFG, set , DIVIDER_RESET_EN, SP_DIS_MC_SW_REQ, SP_MC_WAKE_EN, TCM_STATE_RETAIN + h# 8020.0020 h# 14 +apmu io! \ IN PMUA_SP_IDLE_CFG, set , DIVIDER_RESET_EN, SP_DIS_MC_SW_REQ, TCM_STATE_RETAIN + + \ PJ4 setup + h# 1000 +mpmu io@ to save-apcr h# 18 +apmu io@ to save-idlecfg @@ -323,28 +363,23 @@ h# 0008.0000 or ( apcr' ) \ Set VCXOSD then - h# 2000.0000 0 +mpmu io-clr \ In SP, clear SLPEN - we might set it later - sleep-depth 4 >= if \ state at least POWER_MODE_CHIP_SLEEP (turn off most of SoC) - h# 2008.0000 0 +mpmu io-set \ In SP, also set SLPEN, VCXOSD h# 2000.0000 or ( apcr' ) \ Set SLPEN setup-wakeup-sources and ( apcr' ) then sleep-depth 3 >= if \ state at least POWER_MODE_APPS_SLEEP (turn off slow IO) - h# de00.0000 0 +mpmu io-set \ In SP, set AXISD, resvd, SPSD, DDRCORSD, APBSD resvd, h# 0400.0000 or ( apcr' ) \ Set APBSD then - h# 8030.0020 h# 14 +apmu io! ( apcr ) \ IN PMUA_SP_IDLE_CFG, set , DIVIDER_RESET_EN, SP_DIS_MC_SW_REQ, SP_MC_WAKE_EN, TCM_STATE_RETAIN - sleep-depth 2 >= if \ state at least POWER_MODE_APPS_IDLE (turn off fast IO and DDR) h# 8800.0000 or ( apcr' ) \ Set AXISD, DDRCORSD then h# 5200.0000 or ( apcr' ) \ Set DSPSD (bit 30, reserved), SPSD (bit 28), BBSD (bit 25, resvd) - save-idlecfg 1 invert and ( apcr idle ) \ PMUA_MOH_IDLE + save-idlecfg 2 invert and ( apcr idle ) \ Clear PMUA_MOH_IDLE (AKA PJ_IDLE) +\ h# 8000.0000 invert and ( apcr idle' ) \ Clear PJ_DBG_CLOCK_EN sleep-depth 2 >= if \ state at least POWER_MODE_APPS_IDLE h# 0000.0020 or ( apcr idle' ) \ PJ_PWRDWN @@ -352,7 +387,7 @@ sleep-depth 1 >= if \ state at least POWER_MODE_CORE_EXTIDLE h# 3000.0000 invert and ( apcr idle' ) \ PJ_ISO_MODE_CNTRL - isolation controlled by processor logic and active - h# 000a.0000 or ( apcr idle' ) \ 2 L2 power switches, 1 L1 power switch, 3 core power switches + h# 000a.0002 or ( apcr idle' ) \ 2 L2 power switches, 1 L1 power switch, 3 core power switches then h# 0020.0000 or ( apcr idle' ) \ PJ_DIS_MC_SW_REQ - disable idle entry using software register bits @@ -376,7 +411,16 @@ : stdin-idle-on ['] safe-idle to stdin-idle d# 15 enable-interrupt ; : stdin-idle-off ['] noop to stdin-idle install-uart-io d# 15 disable-interrupt ; +: timers-off ( -- ) + 0 h# 14048 io! \ Disable interrupts from the tick timer + 7 h# 1407c io! \ Clear any pending interrupts + h# f disable-interrupt \ Block timer interrupt +; + : str ( -- ) + timers-off + + screen-dark stdin-idle-off 5 h# 38 +mpmu io! \ Use 32 kHz clock instead of VCXO for slow clock @@ -391,7 +435,7 @@ setup-sleep-state -\ h# 00c0.0000 h# 8c +apmu io-set \ Power down CoreSight SRAM + h# 000c.0000 h# 8c +apmu io-set \ Power down CoreSight SRAM \ TODO - need to power down sram/l2$ \ mmp2_cpu_disable_l2(0); @@ -402,7 +446,7 @@ disable-clks \ begin mmp2_cpu_do_idle() - block-irqs ( ) \ Block IRQs - will be cleared by PMU + block-irqs ( ) \ Block IRQs - will be cleared by PMU do-self-refresh ( ) restore-run-state Modified: cpu/arm/olpc/1.75/addrs.fth ============================================================================== --- cpu/arm/olpc/1.75/addrs.fth Wed Aug 31 10:31:46 2011 (r2495) +++ cpu/arm/olpc/1.75/addrs.fth Fri Sep 2 09:02:34 2011 (r2496) @@ -71,5 +71,6 @@ sram-va h# 2.0000 + constant 'ddr-recal sram-va h# 2.0100 + constant 'ddr-self-refresh +sram-va h# 2.0400 + constant 'ddr-self-refresh-sp sram-pa h# 2.4000 + constant diagfb-pa \ Low-resolution frame buffer for startup numbers

1 0

[commit] r2495 - cpu/arm/olpc/1.75
by repository service 31 Aug '11

31 Aug '11

Author: wmb Date: Wed Aug 31 10:31:46 2011 New Revision: 2495 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2495 Log: OLPC XO-1.75 - turned off most of the serial messages for early startup, their diagnostic value being limited at this point. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Wed Aug 31 10:27:55 2011 (r2494) +++ cpu/arm/olpc/1.75/fw.bth Wed Aug 31 10:31:46 2011 (r2495) @@ -79,8 +79,8 @@ ; ' (ofw-tag,) to ofw-tag, -\ false to stand-init-debug? -true to stand-init-debug? +false to stand-init-debug? +\ true to stand-init-debug? false value secure?

1 0

[commit] r2494 - in cpu: arm arm/olpc/1.75 x86
by repository service 31 Aug '11

31 Aug '11

Author: wmb Date: Wed Aug 31 10:27:55 2011 New Revision: 2494 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2494 Log: XO-1.75 - Implemented an upsampling filter using iwMMX instructions and used it to upsample the audio for the startup jingle, thus eliminating the aliasing that was occurring when trying to play 8khz audio directly. The XO-1.75's codec can play at 8khz, but it doesn't do antialiasing at the frequency, so the sound is bad. Added: cpu/arm/firfilter.fth cpu/arm/iwmmx.fth Modified: cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/sound.fth cpu/x86/adpcm.fth Added: cpu/arm/firfilter.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/firfilter.fth Wed Aug 31 10:27:55 2011 (r2494) @@ -0,0 +1,182 @@ +\ See license at end of file +purpose: Polyphase audio interpolation (upsampling) filter + +\needs enable fload ${BP}/cpu/arm/iwmmx.fth + +d# 15 constant mulscale \ Bits for fractional multipliers + +\ 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' ) + w, +; + +\ This is a polyphase interpolation filter that uses 16 taps per phase. +\ The upsampling ratio is equal to the number of phases. +\ The number of phases and the array of filter weights are arguments, +\ so the code could be used for different length filters, given suitable +\ weight arrays. + +\ Taps/phase=16 +\ Stride=2 (mono) + +code 16tap-upsample ( 'out 'in /in 'weights #phases -- ) + ldmia sp!,{r0,r1,r2,r3} \ r0:'weights r1:/in r2:'in r3:'out tos:#phases + + mov r4,#15 \ Multiplier scale factor + tmcr wcgr0,r4 + +\ wr0-4 - unaligned samples +\ wr5,6 - aligned samples +\ wr15 - accum +\ wr8,9 - weights +\ wcgr1 - alignment + + and r7,r2,#7 \ Alignment shift count + bic r2,r2,#7 \ r5 - aligned address + + wldrd wr0,[r2],#8 + wldrd wr1,[r2],#8 + wldrd wr2,[r2],#8 + wldrd wr3,[r2],#8 + wldrd wr4,[r2],#8 + + begin + \ r4: inner loop phase counter + \ r5: aligned source address + tmcr wcgr1,r7 \ wcgr1: alignment shift count + walignr1 wr5,wr0,wr1 \ Shift samples into place + walignr1 wr6,wr1,wr2 \ Shift samples into place + walignr1 wr7,wr2,wr3 \ Shift samples into place + walignr1 wr8,wr3,wr4 \ Shift samples into place + + mov r6,r0 \ Restore weights pointer + mov r4,tos \ Restore phase counter + begin + wldrd wr9,[r6],#8 \ W Get the first four weights + + wldrd wr10,[r6],#8 \ W Get the second four weights + wmacsz wr15,wr5,wr9 \ First multiply-accumulate, pipelined + + wldrd wr9,[r6],#8 \ W Get the third four weights + wmacs wr15,wr6,wr10 \ Second multiply-accumulate, pipelined + + wldrd wr10,[r6],#8 \ W Get the fourth four weights + wmacs wr15,wr7,wr9 \ Third multiply-accumulate, pipelined + + wmacs wr15,wr8,wr10 \ Fourth multiply-accumulate (stalls?) + + wrordg wr15,wr15,wcgr0 \ Scale the output sample by the multiplier fraction point + + wstrh wr15,[r3] \ Store the output sample + inc r3,#2 \ This cannot be combined with the preceding because STC requires a word offset + + decs r4,#1 \ Decrement phase counter + 0= until + + inc r7,#2 \ Increment alignment counter + ands r7,r7,#7 \ Check for next word needed + 0= if + wor wr0,wr1,wr1 \ Shift samples + wor wr1,wr2,wr2 + wor wr2,wr3,wr3 + wor wr3,wr4,wr4 + wldrd wr4,[r2],#8 \ Get next group of input samples + then + + decs r1,#2 \ Decrement input length by the sample size + 0<= until + + pop tos,sp +c; + +\ Filter coefficients for 6x upsampling. The following filter was +\ computed with GNU Octave using the program shown at the end of the array. +\ The transition band is centered on Fs/6. The stopband attenuation is 78dB. +\ The -3dB point is about 95% of Fs/6. +\ The coefficients are ordered by phase for easy addressing in the inner loop. +\ The coefficients are in reverse order so they can be accessed by an +\ incrementing pointer - the conventional convolutional filter algorithm +\ runs the data and filter tap pointers in opposite directions but the code +\ above runs both pointers forward for ease of use with MMX instructions. + +d# 6 constant #phases + +create weights-6phase +\ Phase 0 +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 + +\ Phase 1 +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 2 +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 3 +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 4 +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 5 +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 + +0 [if] +\ This Matlab/Octave code computes the weights. +\ The 95 is one less than the filter length 96 = 6 * 16 +weights = remez(95, [0 .12 .215 1], [1 1 0 0]); +for phase=1:6 + for tap=16:-1:1 + printf("mul: %.9f ", 5.9 * weights((tap-1)*6+phase)); + end + printf("\n"); +end +[then] + +: upsample6 ( src-adr /src dst-adr -- ) + enable-iwmmx ( src-adr #src-samples dst-adr ) + -rot weights-6phase #phases 16tap-upsample ( ) +; + +\ LICENSE_BEGIN +\ Copyright (c) 2011 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 Added: cpu/arm/iwmmx.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/iwmmx.fth Wed Aug 31 10:27:55 2011 (r2494) @@ -0,0 +1,120 @@ +\ See license at end of file +purpose: Intel Wireless MMX support + +: enable-iwmmx ( -- ) + coprocessor-access@ h# f or coprocessor-access! +; + +d# 16 8 * d# 8 4 * + buffer: iwmmx-buf +code get-iwmmx ( adr -- ) + wstrd wr0,[tos],#8 + wstrd wr1,[tos],#8 + wstrd wr2,[tos],#8 + wstrd wr3,[tos],#8 + wstrd wr4,[tos],#8 + wstrd wr5,[tos],#8 + wstrd wr6,[tos],#8 + wstrd wr7,[tos],#8 + wstrd wr8,[tos],#8 + wstrd wr9,[tos],#8 + wstrd wr10,[tos],#8 + wstrd wr11,[tos],#8 + wstrd wr12,[tos],#8 + wstrd wr13,[tos],#8 + wstrd wr14,[tos],#8 + wstrd wr15,[tos],#8 + wstrw wcgr0,[tos],#4 + wstrw wcgr1,[tos],#4 + wstrw wcgr2,[tos],#4 + wstrw wcgr3,[tos],#4 + wstrw wcgr0,[tos],#4 + wstrw wcid,[tos],#4 + wstrw wcon,[tos],#4 + wstrw wcssf,[tos],#4 + wstrw wcasf,[tos],#4 +c; +: dump-iwmmx ( -- ) + iwmmx-buf get-iwmmx + push-hex + d# 16 0 do + i 4 bounds do + iwmmx-buf i 8 * + d@ d# 17 ud.r + loop + cr + 4 +loop + space + ." wCGRs: " + 4 0 do + iwmmx-buf h# 40 + i la+ l@ d# 9 u.r + loop + cr + ." cid, con, cssf, casf: " + 4 0 do + iwmmx-buf h# 50 + i la+ l@ d# 9 u.r + loop + cr + pop-base +; + +0 [if] \ These code words are not expected to be used much; they are examples +: mcr 0e00.0010 {cond} amode-copr ; +: mrc 0e10.0010 {cond} amode-copr ; + +code wcid@ ( -- n ) psh tos,sp tmrc tos,wcid c; \ Coprocessor ID + +code wcon@ ( -- n ) psh tos,sp tmrc tos,wcon c; \ Control +code wcon! ( n -- ) tmcr wcon,tos pop tos,sp c; + +code wcasf@ ( -- n ) psh tos,sp tmrc tos,wcasf c; \ Arithmetic flags +code wcasf! ( n -- ) tmcr wcasf,tos pop tos,sp c; + +code wcssf@ ( -- n ) psh tos,sp tmrc tos,wcssf c; \ Saturation flags +code wcssf! ( n -- ) tmcr wcssf,tos pop tos,sp c; + +code wcgr0@ ( -- n ) psh tos,sp tmrc tos,wcgr0 c; \ General registers for constants +code wcgr0! ( n -- ) tmcr wcgr0,tos pop tos,sp c; +code wcgr1@ ( -- n ) psh tos,sp tmrc tos,wcgr1 c; +code wcgr1! ( n -- ) tmcr wcgr1,tos pop tos,sp c; +code wcgr2@ ( -- n ) psh tos,sp tmrc tos,wcgr2 c; +code wcgr2! ( n -- ) tmcr wcgr2,tos pop tos,sp c; +code wcgr3@ ( -- n ) psh tos,sp tmrc tos,wcgr3 c; +code wcgr3! ( n -- ) tmcr wcgr3,tos pop tos,sp c; +[then] + + + + +code wtest + wldrd wr1,[sp],#8 + tmrrc r3,r4,wr1 + psh r3,sp + mov r4,tos +c; + +code firstep ( adr1 adr2 -- adr1' adr2' d.acc ) + ldr r0,[sp] + + wldrd wr0,[r0],#8 + wldrd wr1,[tos],#8 + + wldrd wr2,[r0],#8 + wmacsz wr4,wr1,wr0 + wldrd wr3,[tos],#8 + + wldrd wr0,[r0],#8 + wmacs wr4,wr2,wr3 + wldrd wr1,[tos],#8 + + wldrd wr2,[r0],#8 + wmacs wr4,wr1,wr0 + wldrd wr3,[tos],#8 + + wmacs wr4,wr2,wr3 + + str r0,[sp] + psh tos,sp + + tmrrc r3,tos,wr4 + psh r3,sp +c; + Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Wed Aug 31 10:24:22 2011 (r2493) +++ cpu/arm/olpc/1.75/devices.fth Wed Aug 31 10:27:55 2011 (r2494) @@ -351,6 +351,8 @@ fload ${BP}/dev/olpc/mmp2camera/loadpkg.fth +fload ${BP}/cpu/arm/firfilter.fth + fload ${BP}/cpu/x86/adpcm.fth \ ADPCM decoding d# 32 is playback-volume Modified: cpu/arm/olpc/1.75/sound.fth ============================================================================== --- cpu/arm/olpc/1.75/sound.fth Wed Aug 31 10:24:22 2011 (r2493) +++ cpu/arm/olpc/1.75/sound.fth Wed Aug 31 10:27:55 2011 (r2494) @@ -187,7 +187,7 @@ : copy-in ( -- ) in-len /audio-buf min ( this-len ) - my-in-desc 2 la+ l@ in-adr third move ( this-len ) + my-in-desc 2 la+ l@ in-adr third move ( this-len ) in-adr over + to in-adr ( this-len ) in-len over - to in-len ( this-len ) drop ( ) @@ -477,6 +477,10 @@ dup set-ctlr-sample-rate set-codec-sample-rate ; +: set-get-sample-rate ( rate -- actual-rate ) + drop d# 48000 ( actual-rate ) + dup set-sample-rate ( actual-rate ) +; \ This is called from "record" in "mic-test" in "selftest" : set-record-gain ( db -- ) Modified: cpu/x86/adpcm.fth ============================================================================== --- cpu/x86/adpcm.fth Wed Aug 31 10:24:22 2011 (r2493) +++ cpu/x86/adpcm.fth Wed Aug 31 10:27:55 2011 (r2494) @@ -234,8 +234,22 @@ : wav-blk-size ( -- blk-size ) wav-fmt-adr dup if h# 14 + le-w@ then ; : set-volume ( -- ) " set-volume" $call-audio ; -: set-sample-rate ( -- ) - wav-fmt-adr ?dup if h# c + le-l@ " set-sample-rate" $call-audio then +0 value src-sample-rate +0 value dst-sample-rate +: try-set-sample-rate ( desired-rate -- ) + dup to src-sample-rate + dup " set-get-sample-rate" ['] $call-audio catch if ( desired x x x ) + 3drop ( desired ) + dup " set-sample-rate" $call-audio ( desired ) + else ( desired actual ) + nip ( actual ) + then ( actual ) + to dst-sample-rate ( ) +; +: wav-set-sample-rate ( -- ) + wav-fmt-adr ?dup if + h# c + le-l@ try-set-sample-rate ( desired-rate ) + then ; 0 value out-move @@ -243,35 +257,37 @@ \ Collapse a sample array with "#output-ch" channels/sample into a smaller \ array with "wav-in-#ch" channels/sample, discarding the excess channels. -: condense-pcm ( adr in-len -- ) - wav-in-#ch #output-ch - /w* to in-skip ( adr in-len ) - #output-ch /w* to out-move ( adr in-len ) - over swap bounds ?do ( out ) - i over out-move move ( out ) - out-move + ( out' ) - in-skip +loop drop ( ) +: condense-pcm ( adr in-len -- adr out-len ) + 2dup #output-ch wav-in-#ch */ 2swap ( adr out-len adr in-len ) + wav-in-#ch #output-ch - /w* to in-skip ( adr out-len adr in-len ) + #output-ch /w* to out-move ( adr out-len adr in-len ) + over swap bounds ?do ( adr out-len out ) + i over out-move move ( adr out-len out ) + out-move + ( adr out-len out' ) + in-skip +loop drop ( adr out-len ) ; \ Spread a sample array with "wav-in-#ch" channels/sample into a larger \ array with "#output-ch" channels/sample, zeroing the new channels. -: expand-pcm ( adr in-len -- ) - #output-ch wav-in-#ch - /w* to out-skip ( adr in-len ) - wav-in-#ch /w* to out-move ( adr in-len ) - 2dup wav-in-#ch / #output-ch * ( adr in-len adr out-len ) - + -rot ( out-adr in-start in-len ) - over + out-move - do ( out-adr ) - out-skip - dup out-skip erase ( out-adr' ) - out-move - i over out-move move ( out-adr' ) - out-move negate +loop ( out-adr ) - drop +: expand-pcm ( adr in-len -- adr out-len ) + 2dup #output-ch wav-in-#ch */ 2swap ( adr out-len adr in-len ) + #output-ch wav-in-#ch - /w* to out-skip ( adr out-len adr in-len ) + wav-in-#ch /w* to out-move ( adr out-len adr in-len ) + 2dup wav-in-#ch / #output-ch * ( adr out-len adr in-len adr out-len ) + + -rot ( adr out-len out-adr in-start in-len ) + over + out-move - do ( adr out-len out-adr ) + out-skip - dup out-skip erase ( adr out-len out-adr' ) + out-move - i over out-move move ( adr out-len out-adr' ) + out-move negate +loop ( adr out-len out-adr ) + drop ( adr out-len ) ; \ Given a sample array of the form L0, R0, L1, R1, ..., copy the left \ channel into the right, giving L0, L0, L1, L1, etc. This is \ particularly useful when the R samples are initially 0. -: mono16>stereo16 ( adr len -- ) bounds ?do i w@ i wa1+ w! /l +loop ; +: mono16>stereo16 ( adr len -- adr len ) 2dup bounds ?do i w@ i wa1+ w! /l +loop ; : play-wait ( -- ) " write-done" $call-audio ; @@ -287,27 +303,55 @@ 0 value pcm-base -: play-raw-pcm ( adr -- error? ) - wav-in-#ch 0= if drop true exit then ( adr ) - - \ Allocate DMA memory for the decoded output - wav-data-adr 4 - le-l@ ( adr in-len ) - dup wav-in-#ch / #output-ch * to /pcm-output ( adr in-len ) - /pcm-output " dma-alloc" $call-audio to pcm-base ( adr in-len ) - - tuck pcm-base swap move ( in-len ) - - #output-ch wav-in-#ch < if pcm-base over condense-pcm then \ Skip extra channel data - #output-ch wav-in-#ch > if pcm-base over expand-pcm then \ Spread out channel data - #output-ch 2 = wav-in-#ch 1 = and if pcm-base over 2* mono16>stereo16 then \ Stereo from mono - drop +: allocate-playback-buffer ( -- in-len ) + dst-sample-rate src-sample-rate ( num denom ) + 2dup = if ( num denom ) + false ( num denom error? ) + else ( num denom ) +[ifdef] upsample6 + 2dup 6 * <> ( num denom error? ) +[else] + true ( num denom error? ) +[then] + then ( num denom error? ) + abort" Unsupported sample rate conversion" ( num denom ) + + 2>r ( r: num denom ) + wav-data-adr 4 - le-l@ ( in-len r: num denom ) + dup 2r> */ ( in-len out-len ) + #output-ch wav-in-#ch */ ( in-len out-len' ) + to /pcm-output ( in-len ) + /pcm-output " dma-alloc" $call-audio to pcm-base ( in-len ) +; + +: move-or-upsample ( adr -- adr' len ) + allocate-playback-buffer ( adr in-len ) + + src-sample-rate dst-sample-rate = if ( adr in-len ) + tuck pcm-base swap move ( in-len ) + else ( adr in-len ) +[ifdef] upsample6 + dup 6 * -rot ( out-len adr in-len ) + pcm-base upsample6 ( out-len ) +[then] + then ( len ) + pcm-base swap ( adr' len ) +; +: play-raw-pcm ( -- error? ) + wav-in-#ch 0= if true exit then ( ) + + wav-data-adr move-or-upsample ( adr in-len ) + + #output-ch wav-in-#ch < if condense-pcm then ( adr len' ) \ Skip extra channel data + #output-ch wav-in-#ch > if expand-pcm then ( adr len' ) \ Spread out channel data + #output-ch 2 = wav-in-#ch 1 = and if mono16>stereo16 then ( adr len ) \ Stereo from mono - pcm-base /pcm-output (play-pcm) - false + (play-pcm) ( ) + false ( error? ) ; -: play-ima-adpcm ( adr -- error? ) - wav-fact-adr 0= if drop true exit then +: play-ima-adpcm ( -- error? ) + wav-fact-adr 0= if true exit then wav-#sample #output-ch * /w* to /pcm-output @@ -315,11 +359,12 @@ /pcm-output " dma-alloc" $call-audio to pcm-base pcm-base /pcm-output erase ( in ) - pcm-base wav-#sample wav-in-#ch wav-blk-size adpcm-decoder ( ) - #output-ch 2 = wav-in-#ch 1 = and if ( ) - pcm-base /pcm-output mono16>stereo16 ( ) - then ( ) - pcm-base /pcm-output (play-pcm) ( ) + wav-data-adr pcm-base wav-#sample wav-in-#ch wav-blk-size adpcm-decoder ( ) + pcm-base /pcm-output ( adr len ) + #output-ch 2 = wav-in-#ch 1 = and if ( adr len ) + mono16>stereo16 ( adr len ) + then ( adr len ) + (play-pcm) ( ) false ( error? ) ; @@ -340,14 +385,15 @@ then playback-volume set-volume - set-sample-rate + wav-set-sample-rate wav-cc case - 1 of wav-data-adr play-raw-pcm endof - h# 11 of wav-data-adr play-ima-adpcm endof + 1 of play-raw-pcm endof + h# 11 of play-ima-adpcm endof ( default ) ." Cannot play .wav format type: " dup .wav-cc true swap cr endcase \ audio-ih close-dev + free-wav ; : ($play-wav) ( file-str -- )

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware