Commit graph

2218 commits

Author SHA1 Message Date
Thomas Martitz
1ecb753668 Redo a hack that precluded entering a folder on an ejected hotswap drive. Use storage api and proper defines for the drive folder instead.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23755 a1c6a512-1295-4272-9138-f99709370657
2009-11-26 00:37:27 +00:00
Thomas Martitz
10753f195b Mini2440: Cleanup SD driver a bit, undefine SD_DEBUG for faster transfers, implement hotswap and HAVE_HOTSWAP_STORAGE_AS_MAIN.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23754 a1c6a512-1295-4272-9138-f99709370657
2009-11-25 23:23:21 +00:00
Jack Halpin
84f04a57ee AMS Sansa: For consistency, replace references to SECTOR_SIZE with SD_BLOCK_SIZE which is defined in sd.h as 512 bytes.
We had 3 different references to the same value.  Rockbox always uses a blocksize of 512 bytes for SD and we were using SECTOR_SIZE, SD_BLOCK_SIZE, & card_info[drive].blocksize to use this value.  Now the only reference being used is SD_BLOCK_SIZE.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23746 a1c6a512-1295-4272-9138-f99709370657
2009-11-25 03:24:28 +00:00
Rafaël Carré
231e54d80f Sansa AMS : fix recording
Flyspray: FS#10371
Authors: Fred Bauer and myself

Only enabled on e200v2 and Fuze (crashes on clipv1)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23739 a1c6a512-1295-4272-9138-f99709370657
2009-11-24 17:59:25 +00:00
Jack Halpin
cb9dff0a95 AMS Sansa: Include time spent yielding when figuring timeout in sd_wait_for_state().
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23738 a1c6a512-1295-4272-9138-f99709370657
2009-11-24 17:43:53 +00:00
Robert Kukla
1511d75f9d Tatung Elio: a few more buttons identified
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23737 a1c6a512-1295-4272-9138-f99709370657
2009-11-24 15:42:54 +00:00
Rafaël Carré
ed13fd6dca Sansa AMS: VIC_INT_ENABLE register is not a mask
When read it returns all enabled interrupt sources
When written it enables interrupt sources for each bit set
So just like VIC_INT_EN_CLEAR, we don't have to read the previous value
before writing to it (VIC_INT_EN_CLEAR is write-only anyway)

Thanks to Fred Bauer for spotting

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23734 a1c6a512-1295-4272-9138-f99709370657
2009-11-24 12:05:53 +00:00
Jack Halpin
4314ceb73b AMS Sansa: Remove MCI_RX_ACTIVE FIFO check following SD transfers.
We don't need to check the FIFO for MCI_RX_ACTIVE because we don't experience problems reading from the SD cards.
We need the MCI_TX_ACTIVE FIFO check during writes because some SD cards spend longer times in the PRG state
programming the data that has been written to them.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23733 a1c6a512-1295-4272-9138-f99709370657
2009-11-24 06:37:36 +00:00
Jack Halpin
9e9db20357 AMS Sansa: Remove wait_for_state() following transfer in sd_select_bank() function.
We use wait_for_state() before any command that requires a state prior to being sent.  Waiting after a transfer is not needed.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23732 a1c6a512-1295-4272-9138-f99709370657
2009-11-24 06:12:17 +00:00
Jack Halpin
f5b59cdf5e AMS Sansa: dma-pl081.c: dma_enable_channel() Add step to clear pending interrupts from the previous operation. Add comments and make construction
of the CH_CONTROL and CH_CONFIGURATION registers easier to follow.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23725 a1c6a512-1295-4272-9138-f99709370657
2009-11-23 19:44:13 +00:00
Jack Halpin
fab80009bc AMS Sansa: Handle responses to SD Commands so that response crc checking is accounted for. Adjust sd error codes appropriately.
The crc check on responses to sd commands was being bypassed due to a SD_APP_OP_COND special case.  Now a short response is returned
even if the crc check fails so we can check the busy bit.  The send_cmd() function still returns a false value but it loads the response
variable with the cmd response.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23718 a1c6a512-1295-4272-9138-f99709370657
2009-11-23 04:22:11 +00:00
Jack Halpin
ecbb01fe0a AMS Sansa: Remove a now redundant sd_wait_for_state() and adjust error codes in ata_sd_as3525.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23698 a1c6a512-1295-4272-9138-f99709370657
2009-11-22 14:13:39 +00:00
Jack Halpin
6df98f690d AMS Sansa: Make send_cmd() function a bit less complicated and save ~96 bytes.
Also move sd_wait_for_state() to immediately precede SD_READ/WRITE_MULTIPLE_BLOCK commands.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23692 a1c6a512-1295-4272-9138-f99709370657
2009-11-22 04:50:26 +00:00
Michael Chicoine
bbc8b1b8cb FS#10796 - Clip - prevent power switch activation when coming out of hold
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23686 a1c6a512-1295-4272-9138-f99709370657
2009-11-21 21:16:08 +00:00
Nils Wallménius
7d4ca1a85a Increase stack space for the Gigabeat S specific headphone thread to fix stack overflow when compiled with gcc 4.4
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23678 a1c6a512-1295-4272-9138-f99709370657
2009-11-20 16:42:07 +00:00
Thomas Martitz
3b402e254a Change "r" back to "i" (i is for immediate, so no syntax error) and reclaim a bit binsize. Live with that those function don't build with -O0 since they rely on inlining.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23641 a1c6a512-1295-4272-9138-f99709370657
2009-11-15 22:29:22 +00:00
Thomas Martitz
a1bc3401f1 Fix a few possible problems discovered in -O0 / eabi experiments.
- two essential parts of Sansa AMS drivers are optimzed away in newer gcc, so mark them volatile.
- use "r" instead of "i" (which is apparently invalid syntax) for the input list in some inline assembly

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23634 a1c6a512-1295-4272-9138-f99709370657
2009-11-15 17:23:25 +00:00
Andrew Mahone
6d93285087 Fix dangling #endif
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23624 a1c6a512-1295-4272-9138-f99709370657
2009-11-14 11:37:16 +00:00
Andrew Mahone
81f72ddef6 Set DRMODE_SOLID, uniform colors, and sysfont before clearing LCD to display panic or exception messages - see FS#10665.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23623 a1c6a512-1295-4272-9138-f99709370657
2009-11-14 11:27:41 +00:00
Bertrik Sikken
daff26b1da Meizu M3: configure and use SDRAM
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23614 a1c6a512-1295-4272-9138-f99709370657
2009-11-11 21:31:38 +00:00
Bertrik Sikken
69b7dab5f0 pcm-s5l8700: add missing header file, remove out-of-date comment
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23612 a1c6a512-1295-4272-9138-f99709370657
2009-11-11 20:30:53 +00:00
Michael Sparmann
91d982a1b6 Fix mpegplayer on S5L870x
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23587 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 15:50:13 +00:00
Jeffrey Goode
59dd433ccd Removed unneeded includes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23578 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 05:46:08 +00:00
Karl Kurbjun
2a93cee8e2 M:Robe 500 - Enable ASM optimized ATA interface improving disk access speed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23572 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 00:38:10 +00:00
Michael Sparmann
64ac121e2c Squash another bunch of iPod Nano 2G NAND bugs by moving the idle powerdown code down into the lowlevel driver. Move even more things from the FTL to the bss instead of the stack to prevent USB stkovs. Also fix some evil whitespace.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23570 a1c6a512-1295-4272-9138-f99709370657
2009-11-08 14:55:30 +00:00
Karl Kurbjun
487d088e12 M:Robe 500: Disable LED above screen and add a change for the 256 color blitter
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23564 a1c6a512-1295-4272-9138-f99709370657
2009-11-07 23:00:36 +00:00
Karl Kurbjun
c3edcad1aa M:Robe 500 - Add some more debug information.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23561 a1c6a512-1295-4272-9138-f99709370657
2009-11-07 22:49:34 +00:00
Bertrik Sikken
c87270fb75 Meizu M6SP: initial button driver (adapted from Meizu M3)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23559 a1c6a512-1295-4272-9138-f99709370657
2009-11-07 21:37:28 +00:00
Bertrik Sikken
3f70b661a3 Meizu M6SP: initialise and use SDRAM
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23544 a1c6a512-1295-4272-9138-f99709370657
2009-11-06 22:47:09 +00:00
Michael Chicoine
a06feaa7ec Fix FS#10751 - Fuze freezes when using radio while charging
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23517 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 15:58:18 +00:00
Thomas Martitz
1566705984 Simplify uart_printf() a bit by using vuprintf(), that also makes removing a static buffer possible.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23504 a1c6a512-1295-4272-9138-f99709370657
2009-11-03 21:28:02 +00:00
Thomas Martitz
310346ebcc Fix a #elif without condion (is an error with newer gcc/cpp versions).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23502 a1c6a512-1295-4272-9138-f99709370657
2009-11-03 21:20:02 +00:00
Torne Wuff
2d0af6f3c7 FS#9728: Battery current measuring on the Video iPod
Patch by Boris Gjenero. Displays the current flowing into or out of the
battery on the ipodvideo. Other ipods do not appear to have this ADC channel
connected.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23500 a1c6a512-1295-4272-9138-f99709370657
2009-11-03 20:35:04 +00:00
Jeffrey Goode
9d842683eb Comment out LOGF_ENABLE defines everywhere, replace evil comments
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23497 a1c6a512-1295-4272-9138-f99709370657
2009-11-03 16:25:03 +00:00
Bob Cousins
deb1b0e51c Improvements to mini2440 audio; change CPU freq to 406MHz
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23495 a1c6a512-1295-4272-9138-f99709370657
2009-11-03 13:50:52 +00:00
Rafaël Carré
9b46960baf Sansa AMS PCM : cleanup
Init CGU_AUDIO with correct clock source (for play & rec)
Do not disable recording clocks when starting playback, they are already disabled
Move clock enable/disable code from dma callback to init

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23493 a1c6a512-1295-4272-9138-f99709370657
2009-11-03 08:14:28 +00:00
Rafaël Carré
d06aafc03a Sansa AMS: fix system_exception_wait()
If a panicf() is called while a button is still pressed, the Sansa would
reboot immediately with no chance to see the message

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23490 a1c6a512-1295-4272-9138-f99709370657
2009-11-03 07:42:42 +00:00
Michael Sparmann
890444c917 Hopefully fix the remaining iPod Nano 2G flash issues, by adding a tiny sleep after resetting the chip. Also remove some evil tabs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23489 a1c6a512-1295-4272-9138-f99709370657
2009-11-02 22:18:09 +00:00
Karl Kurbjun
02385cb5b0 M:Robe 500/M66591 USB improvements: Interrupts now work, a bug in odd-length transfers has been fixed. Buffers that are not initially short aligned are also now supported. Enable USB HID mouse mode.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23483 a1c6a512-1295-4272-9138-f99709370657
2009-11-02 04:37:57 +00:00
Rafaël Carré
fb126d4305 Sansa AMS : reduce size of interrupt source/isr mapping table
INT_GPIOB is not used
INT_MCI0 and INT_GPIOA are only put in the table if needed

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23481 a1c6a512-1295-4272-9138-f99709370657
2009-11-01 23:41:10 +00:00
Rafaël Carré
f64a3fe149 Sansa AMS PCM: remove runtime sanity checks
Unaligned memory ops will cause a data abort anyway
Make the check for samplerate at buildtime

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23480 a1c6a512-1295-4272-9138-f99709370657
2009-11-01 23:35:34 +00:00
Bob Cousins
33040275cf Improvements to mini2440/UDA1341 audio
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23478 a1c6a512-1295-4272-9138-f99709370657
2009-11-01 22:58:08 +00:00
Rafaël Carré
9b4057bbd4 Sansa AMS recording support (Microphone and FM)
Still disabled on all targets:
- Fuze and e200v2 see spurious interrupts with no source defined
- Clip/m200v4 deadlock instantly when starting recording (perhaps due to low memory size)

Having the code in SVN will make working on this feature easier

Also add keymaps for Fuze, and correct Frequency section of recording
options : the 22.05kHz limitation of e200v1 and c200v1 doesn't apply to
Sansa AMS (different I2S hardware, unrelated to as3514)

Flyspray: FS#10371
Authors: Fred Bauer and myself

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23476 a1c6a512-1295-4272-9138-f99709370657
2009-11-01 22:51:31 +00:00
Bob Cousins
603b0aa5eb Replace hardcoded constants (fix 32/64MB bug)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23463 a1c6a512-1295-4272-9138-f99709370657
2009-11-01 14:15:23 +00:00
Bob Cousins
add481bf6d Fix debug/multidrive build error
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23460 a1c6a512-1295-4272-9138-f99709370657
2009-11-01 13:29:09 +00:00
Michael Chicoine
4eafd23f42 FS#10744 - Fuze: Last line of screen's pixels doesn't change when switching themes and using plugins
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23452 a1c6a512-1295-4272-9138-f99709370657
2009-10-31 23:15:33 +00:00
Bob Cousins
b73b067a90 Replace hard-coded value of memory size
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23451 a1c6a512-1295-4272-9138-f99709370657
2009-10-31 23:03:34 +00:00
Dominik Wenger
d25baecc0b make mini2440 bootloader compile again, and remove a few warnings from sd driver.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23440 a1c6a512-1295-4272-9138-f99709370657
2009-10-31 16:48:08 +00:00
Michael Chicoine
6e54cabd2c Remove svn:executable from firmware
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23432 a1c6a512-1295-4272-9138-f99709370657
2009-10-31 02:26:40 +00:00
Rob Purchase
0f90f0b423 Make the TCC78x HW debug screen yield by including a button wait timeout.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23409 a1c6a512-1295-4272-9138-f99709370657
2009-10-29 21:25:51 +00:00
Maurus Cuelenaere
e415395c5b The Onda VX777 has only one button, add it to the keymap.
Also fix a typo that erroneously enabled button_hold in button-target.h

Flyspray: FS#10732
Author: Yann Muller

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23383 a1c6a512-1295-4272-9138-f99709370657
2009-10-28 21:16:45 +00:00
Dominik Wenger
04ebf48fe4 Initial touchscreen support for mini2440. Based on D2 touchscreen driver
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23370 a1c6a512-1295-4272-9138-f99709370657
2009-10-27 20:25:40 +00:00
Michael Sparmann
c9667e6d23 Fix iPod Nano 2G UI sluggishness (thanks to JdGordon for spotting this)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23365 a1c6a512-1295-4272-9138-f99709370657
2009-10-26 22:22:01 +00:00
Dominik Wenger
90b576f55e Many more drivers for mini2440. Now the main binary compiles and runs.
Flyspray: FS#10725
Author: Bob Cousins

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23362 a1c6a512-1295-4272-9138-f99709370657
2009-10-26 18:16:58 +00:00
Jack Halpin
6d20102a9c AMS Sansa: Change some #defines in debug-as3525 from "(SANSA_E200V2) || defined(SANSA_FUZE) || defined(SANSA_C200V2)" to HAVE_MULTIDRIVE
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23361 a1c6a512-1295-4272-9138-f99709370657
2009-10-26 17:22:05 +00:00
Michael Chicoine
10f46b3c8a fix an off-by-one error in lcd_update_rect()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23359 a1c6a512-1295-4272-9138-f99709370657
2009-10-26 15:42:26 +00:00
Jack Halpin
03986d4ec7 Revert r23350 "AMS Sansa: Assume IDECLK is MCLK for the internal SD Disk."
More information makes this assumption seem incorrect.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23356 a1c6a512-1295-4272-9138-f99709370657
2009-10-26 07:06:37 +00:00
Thomas Martitz
78c956d73b Make current_vp static and importings from Gigabeat F/X/S lcd drivers as they don't need it anymore.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23354 a1c6a512-1295-4272-9138-f99709370657
2009-10-26 01:44:39 +00:00
Jens Arnold
5365cbe0a5 Color targets: Ported assembler optimised transparent bitmap drawing from Gigabeat S/F/X to all ARM targets (~23..40% speedup). * C optimised transparent bitmap drawing for non-ARM targets and sims. * Use the more compact boundary checking for non-transparent native bitmap drawing as well.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23353 a1c6a512-1295-4272-9138-f99709370657
2009-10-26 01:35:31 +00:00
Jack Halpin
ec43287aa0 AMS Sansa: Assume IDECLK is MCLK for the internal SD Disk. Reduce IDECLK to 62 MHz for now to be consistent with MCLK for uSD which is PCLK.
Adjust SD timeouts accordingly.

Adjust code in debug-as3525.c to display correct frequencies on system/debug/View disk info page.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23350 a1c6a512-1295-4272-9138-f99709370657
2009-10-25 18:31:44 +00:00
Bertrik Sikken
1e4c2fd9d2 Fix ipod nano 2g bootloader link problem, caused by my previous commit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23348 a1c6a512-1295-4272-9138-f99709370657
2009-10-25 14:03:43 +00:00
Bertrik Sikken
d2827996af Meizu M6 SP: make bootloader compile and run again
* don't use DRAM yet in the bootloader linker script
* add header files for the ftl and nand
* update svn:keywords


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23347 a1c6a512-1295-4272-9138-f99709370657
2009-10-25 13:52:46 +00:00
Bertrik Sikken
52ca187f68 Meizu M6 SP: update lcd driver, it is now possible to display a rockbox logo (with some limitations, see comments in lcd-m6sp.c)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23345 a1c6a512-1295-4272-9138-f99709370657
2009-10-25 11:31:13 +00:00
Bertrik Sikken
7e35619fb6 power-meizu.c: fix usage of USB_TR name
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23341 a1c6a512-1295-4272-9138-f99709370657
2009-10-25 09:54:23 +00:00
Michael Sparmann
c9dd93e286 Adjust the iPod Nano 2G CPU clock freq again, this time to an exact value. Also add hardware defines for the 9th DMA channel we discovered on the S5L8701, and fix the µsec timer (there were missing braces).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23338 a1c6a512-1295-4272-9138-f99709370657
2009-10-24 23:27:13 +00:00
Michael Sparmann
ef6e1c4eaa Plumb an iPod Nano 2G battery leak that started spilling as soon as USB was used at least once until a reboot.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23335 a1c6a512-1295-4272-9138-f99709370657
2009-10-24 20:31:40 +00:00
Jack Halpin
5897249c1e Add #ifdef HAVE_MULTIDRIVE to HS timings switch for uSD cards.
Internal cards are v1 sd cards so no need to include this code for the clip.

Move transition from STBY -> TRAN-> STBY states inside the if(sd_v2) conditional check for HS switch as it's not needed for non HS cards.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23331 a1c6a512-1295-4272-9138-f99709370657
2009-10-24 16:42:24 +00:00
Thomas Martitz
e4921d6ab5 Speed up lcd_update_rect by ~2.5% by counting towards 0 in the loop.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23329 a1c6a512-1295-4272-9138-f99709370657
2009-10-24 16:01:53 +00:00
Michael Sparmann
4e617332ff Hide yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23327 a1c6a512-1295-4272-9138-f99709370657
2009-10-24 00:05:13 +00:00
Michael Sparmann
6599932f2f Fix red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23326 a1c6a512-1295-4272-9138-f99709370657
2009-10-23 23:58:54 +00:00
Michael Sparmann
49d4c428dc Implement iPod Nano 2G storage active indicator
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23325 a1c6a512-1295-4272-9138-f99709370657
2009-10-23 23:50:32 +00:00
Michael Sparmann
16a956c4f3 Finally a click, pop and other distortion free PCM driver for that fishy bufferless S5L870x I2S controller.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23324 a1c6a512-1295-4272-9138-f99709370657
2009-10-23 23:47:38 +00:00
Dominik Wenger
5b4938a8ca Working Bootloader for mini2440.
Flyspray: FS#10701
Author: Bob Cousins

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23316 a1c6a512-1295-4272-9138-f99709370657
2009-10-22 17:45:02 +00:00
Michael Sparmann
4a63ac7c00 Add iPod Nano 2G µsec timer, and use it in the clickwheel driver.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23309 a1c6a512-1295-4272-9138-f99709370657
2009-10-21 18:53:41 +00:00
Michael Sparmann
7bff585d83 iPod Nano 2G: "Fix" the latest PCM issues, channel swap and vinyl popping. The latter is a revert of the cache coherency patch for now, we need to find a better solution in the long term...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23308 a1c6a512-1295-4272-9138-f99709370657
2009-10-21 18:52:09 +00:00
Michael Sparmann
0c89c0ef7c Fix another bunch of iPod Nano 2G FTL bugs. It seems to work fine for me now, but this doesn't necessarily mean that it's bug-free.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23307 a1c6a512-1295-4272-9138-f99709370657
2009-10-21 15:28:11 +00:00
Thomas Martitz
d85c3ec410 Convert lcd_activation callbacks to use the event system to allow for multiple parallel callbacks (for custom statusbar).
Increase maximum event count as we need more (I actually had a report about it during custom statusbar testing).
Removed corresponding functions from the core and plugin api. Bump min version and sort.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23302 a1c6a512-1295-4272-9138-f99709370657
2009-10-20 21:54:59 +00:00
Rob Purchase
d94c3c47f9 D2: Remove the hardcoded driver-level touchscreen calibration, since it's done at apps level as well now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23299 a1c6a512-1295-4272-9138-f99709370657
2009-10-20 20:57:26 +00:00
Rob Purchase
cb2db20a32 Cleanup and expand D2 charger detection (not yet implemented for D2+).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23297 a1c6a512-1295-4272-9138-f99709370657
2009-10-20 20:38:35 +00:00
Michael Sparmann
1668cfa3dd Fixed a bunch of iPod Nano 2G FTL bugs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23296 a1c6a512-1295-4272-9138-f99709370657
2009-10-20 20:20:39 +00:00
Michael Sparmann
d03fe64dcf iPod Nano 2G USB support based on the S3C6400X datasheet. Disabled by default for now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23285 a1c6a512-1295-4272-9138-f99709370657
2009-10-20 06:37:07 +00:00
Jens Arnold
2dd45f7c6d Make RoLo work on PP5002. * Rename CACHE_CTL flag values on PP5002 for consistency.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23277 a1c6a512-1295-4272-9138-f99709370657
2009-10-19 21:38:52 +00:00
Dominik Wenger
41c497025f Initial mini2440 port.
Flyspray: FS#10627
Author: Bob Cousins

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23265 a1c6a512-1295-4272-9138-f99709370657
2009-10-19 18:14:27 +00:00
Jack Halpin
c5a3f93ac3 AMS Sansa: Adjust SD Card frequency to Identification frequency at beginning of card init instead of the end of pl180 controller init.
If a card is reinitialized now the ident frequency is used instead of the bypass frequency during the identification phase.

Added comments throughout sd_init_card() to help follow init process and highlight indent stage.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23256 a1c6a512-1295-4272-9138-f99709370657
2009-10-19 05:34:25 +00:00
Bertrik Sikken
d24d885aa4 Use wrap-safe TIME_BEFORE/TIME_AFTER macros to compare times with current_time, instead of comparing them directly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23246 a1c6a512-1295-4272-9138-f99709370657
2009-10-18 15:50:30 +00:00
Rafaël Carré
735b522929 Split ARMv6 code from mmu-arm.S
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23244 a1c6a512-1295-4272-9138-f99709370657
2009-10-18 13:07:14 +00:00
Michael Sparmann
b424b852e5 iPod Nano 2G storage performance improved by not copying around buffers unneccessarily if they are aligned anyways and using cache coherency functions instead of bypassing the caches altogether.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23243 a1c6a512-1295-4272-9138-f99709370657
2009-10-18 12:36:17 +00:00
Michael Sparmann
bde0231803 Add dcache cleaning to the S5L870x PCM driver.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23240 a1c6a512-1295-4272-9138-f99709370657
2009-10-17 23:08:51 +00:00
Michael Sparmann
3ac50ca9ff Fix S5L870x cache coherency functions. They were split into a different file, as changes were needed all over the place.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23239 a1c6a512-1295-4272-9138-f99709370657
2009-10-17 23:06:45 +00:00
Michael Sparmann
4562e683a2 Implement iPod Nano 2G nand_get_info()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23238 a1c6a512-1295-4272-9138-f99709370657
2009-10-17 23:00:49 +00:00
Michael Sparmann
8f1709f434 Adjust iPod Nano 2G CPU speed to 192MHz, which measurements show it to be. Timers will be more accurate now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23237 a1c6a512-1295-4272-9138-f99709370657
2009-10-17 22:32:46 +00:00
Nils Wallménius
11fbfae20d fix red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23234 a1c6a512-1295-4272-9138-f99709370657
2009-10-17 18:12:24 +00:00
Nils Wallménius
f34a841b0c Revise r23225 a bit, removing the debug_printf function and implementing more generic lcd_(remote)_putsf function(s) instead and use those in more places
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23233 a1c6a512-1295-4272-9138-f99709370657
2009-10-17 18:02:48 +00:00
Rob Purchase
b91ae3c3cd Fix logic error in D2+ touchscreen driver.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23217 a1c6a512-1295-4272-9138-f99709370657
2009-10-16 22:14:27 +00:00
Jack Halpin
000cff5bae AMS Sansa: Lower ADC checkvalue for voltage scaling to 1.175V as some players run slightly low.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23205 a1c6a512-1295-4272-9138-f99709370657
2009-10-16 17:44:23 +00:00
Rob Purchase
d29114c671 Touchscreen support for newer Cowon D2+ hardware revisions (using TSC200x touchscreen controller).
Flyspray: FS#10671
Author: Jonas Aaberg


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23194 a1c6a512-1295-4272-9138-f99709370657
2009-10-15 20:13:29 +00:00
Jack Halpin
562e41bae5 AMS Sansa: FS#10669 Reimplement Voltage scaling.
Reimplement voltage scaling on AMS Sansas at 1.10v during unboosted operation to improve runtimes.  The voltage is now also boosted during disk access if a µSD is present.  This prevents the µSD problems we saw on the last implementation.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23193 a1c6a512-1295-4272-9138-f99709370657
2009-10-15 19:48:26 +00:00
Rafaël Carré
19d70fce20 Sansa Fuze & e200v2 : do not enable USBSTACK in the bootloader
Don't implement usb_enable() is HAVE_USBSTACK is not defined

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23185 a1c6a512-1295-4272-9138-f99709370657
2009-10-15 10:23:18 +00:00
Rafaël Carré
8bd8d06842 Sansa AMS USB driver : still not working
Implement usb_enable()
Reorder/Modify usb_drv_init() to match closer the OF and remove a freeze
(USB registers were accessed before the USB module was enabled)
Add a panic in USB isr to be sure we notice when it's called
Reset GPIOA direction for usb_detect() to notice extraction
Add some comments

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23184 a1c6a512-1295-4272-9138-f99709370657
2009-10-15 10:03:20 +00:00
Rafaël Carré
5303ab101b Sansa AMS SD driver: cleanup defines and comments
Remove useless E200V2 || FUZE || C200V2 : all those models have
MULTIDRIVE and/or HOTSWAP defined and have no specific difference.

Correct some comments

Remove HAVE_MULTIDRIVE within HAVE_HOTSWAP since HOTSWAP imply MULTIDRIVE

Change HOTSWAP to MULTIDRIVE where needed

Use NUM_DRIVES in sd_num_drives()

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23180 a1c6a512-1295-4272-9138-f99709370657
2009-10-15 07:16:38 +00:00
Rafaël Carré
0290094d8a Sansa AMS PCM : replace buggy and confusing one-liner
The bits which are not divider (i2si/i2so enable and clock selection)
would be unset.
This is not a problem in the current code since this function was always
called before starting playback (and setting those bits) but this might
be a problem when recording is enabled.

Finally it is simpler to read.

Thanks to Fred Bauer for pointing this.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23156 a1c6a512-1295-4272-9138-f99709370657
2009-10-13 16:41:20 +00:00
Dave Chapman
745266d309 Re-commit r23070 - reboot to disk mode on the Nano2G when USB is inserted. This was accidentally reverted in r23099
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23148 a1c6a512-1295-4272-9138-f99709370657
2009-10-13 09:23:32 +00:00
Michael Sparmann
008f01348b Fix iPod Nano 2G charging detection
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23146 a1c6a512-1295-4272-9138-f99709370657
2009-10-13 09:04:51 +00:00
Dave Chapman
8b3433e1c0 Don't touch the clocks in Nano2G bootloader - this breaks the Apple firmware (audio playback didn't work).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23143 a1c6a512-1295-4272-9138-f99709370657
2009-10-13 08:04:52 +00:00
Dave Chapman
a70c7bf862 Nano2G bootloader - fix dual-booting the Apple firmware.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23139 a1c6a512-1295-4272-9138-f99709370657
2009-10-12 19:46:45 +00:00
Jack Halpin
7331bd5381 AMS Sansa: Remove BUSWIDTH and BLOCKLEN commands and revise strategy for High Speed SD Card.
We are unable to successfully put the pl180 controller into 4 bit mode so we should not put the cards into widebus mode for now.
The blocklength is hardcoded to 512 in sd.c and BLOCKLEN defaults to 512 so this command is not needed.
It appears the internal SD card is not HS capable but sending it the HS switch command does not seem to hinder it's init process.
Assume all SD_V2 cards are HS capable and send them the HS switch command.
If View disk info shows 50.0 MBit/s the card has HS timings.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23137 a1c6a512-1295-4272-9138-f99709370657
2009-10-12 18:55:10 +00:00
Michael Sparmann
7a5904cf1c S5L870x: Implement pcm_play_dma_get_peak_buffer
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23129 a1c6a512-1295-4272-9138-f99709370657
2009-10-12 11:58:36 +00:00
Michael Sparmann
8afaee6471 Fix the yellow again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23127 a1c6a512-1295-4272-9138-f99709370657
2009-10-12 10:44:48 +00:00
Michael Sparmann
6b17295926 Bring the iPod Nano 2G shutdown FTL panics back.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23126 a1c6a512-1295-4272-9138-f99709370657
2009-10-12 08:54:51 +00:00
Michael Sparmann
5a4ce22b77 Fix the iPod Nano 2G clickwheel when releasing the hold switch
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23122 a1c6a512-1295-4272-9138-f99709370657
2009-10-12 00:12:02 +00:00
Michael Sparmann
6cea8c1e1a Fix the latest iPod Nano 2G NAND issues
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23115 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 18:21:15 +00:00
Michael Sparmann
b729a7d75e iPod Nano 2G PMU rework, added backlight brightness setting and USB charging speed setting
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23114 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 18:20:56 +00:00
Michael Sparmann
3b549fedbb iPod Nano 2G: Reset NAND banks after powering the chip up.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23110 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 13:48:12 +00:00
Jens Arnold
e13c600133 H300 LCD update: Use interrupt driven background DMA transfers, giving other threads a
chance to run while the LCD updates. * Add an optimisation for partial updates with width == 
LCD_WIDTH.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23109 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 13:30:06 +00:00
Bertrik Sikken
b68d7f54ae Samsung YP-S3: make bootloader compile again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23107 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 13:15:23 +00:00
Michael Sparmann
264d877889 Add a thread to power down the NAND after inactivity on the iPod Nano 2G
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23106 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 12:45:27 +00:00
Michael Sparmann
c3dc24b479 S5L870x: Fix PCLK freq
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23103 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 11:35:14 +00:00
Michael Sparmann
9f18e1958f Fix yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23102 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 10:22:07 +00:00
Michael Sparmann
b84ef86871 Fix another anti-double-inclusion define for iPod Nano 2G
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23100 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 10:12:32 +00:00
Michael Sparmann
e6c8a185e5 Implement NAND power management for iPod Nano 2G
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23099 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 10:10:49 +00:00
Michael Sparmann
0260b0ad5a S5L870x crt0.S: Streamline things a bit, and close unneeded clock gates on iPod Nano 2G
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23098 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 09:52:39 +00:00
Dave Chapman
7f836fd869 Nano2G - remove HAVE_RECORDING from config-ipodnano2g.h as it's not implmented yet, and properly #ifdef audio-nano2g.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23095 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 09:17:12 +00:00
Karl Kurbjun
d6227edbb5 M:Robe 500: Correct power down pin assignment.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23091 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 06:58:43 +00:00
Karl Kurbjun
173d854e7f M:Robe 500: Add support for more audio frequencies, initialize and set the touchscreen PWD pin.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23089 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 06:08:14 +00:00
Jack Halpin
14079c39f0 AMS Sansa: If SD card is HS capable set High Speed timings.
This still doesn't solve the problem of the cards being overclocked at 62MHz but we can mitigate this a bit by switching to HS timings.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23088 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 03:11:13 +00:00
Dave Chapman
4ea4ce4cfb Kill some warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23085 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 01:45:50 +00:00
Dave Chapman
b04a7a86e1 Make the Nano2G bootloader actually function as a bootloader. The resulting bootloader-ipodnano2g.ipod file needs to be encrypted on a target using the crypt_firmware plugin to create bootloader-ipodnano2g.ipodx, which can then be written to the firmware partition using the ipodpatcher patch at FS#10609. Dual-booting doesn't work yet - only Rockbox can be run.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23084 a1c6a512-1295-4272-9138-f99709370657
2009-10-11 01:37:12 +00:00
Michael Sparmann
55fc2ea314 Increase iPod Nano 2G stack size to 16KiB
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23080 a1c6a512-1295-4272-9138-f99709370657
2009-10-10 22:02:22 +00:00
Rob Purchase
e6ec5414e8 D2: Don't read touchscreen co-ordinates when hold is enabled.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23079 a1c6a512-1295-4272-9138-f99709370657
2009-10-10 17:42:36 +00:00
Rob Purchase
16ada4cb81 Initial support for runtime detection of the PMU used in newer D2+ models (PCF50635). The backlight and battery monitoring should work, but the RTC and touchscreen are not yet implemented.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23078 a1c6a512-1295-4272-9138-f99709370657
2009-10-10 17:35:02 +00:00
Michael Sparmann
31464f7930 Add a timeout for I2C transfers (S5L870x)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23077 a1c6a512-1295-4272-9138-f99709370657
2009-10-10 17:22:06 +00:00
Michael Sparmann
e2aeef7501 Fix panic caused by r23074
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23076 a1c6a512-1295-4272-9138-f99709370657
2009-10-10 16:58:37 +00:00
Michael Sparmann
6be1d8b8a8 Revert the S5L870X I2C driver to busy waiting because of some issues with interrupts, and increase the bus speed from 24kHz to 390kHz.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23074 a1c6a512-1295-4272-9138-f99709370657
2009-10-10 16:36:55 +00:00
Dave Chapman
72271af7df Squash a warning when FTL_READONLY is defined
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23073 a1c6a512-1295-4272-9138-f99709370657
2009-10-10 16:18:14 +00:00
Dave Chapman
3c362fa8c6 Nano2G - implement "Pause on headphone unplug" feature
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23072 a1c6a512-1295-4272-9138-f99709370657
2009-10-10 15:37:05 +00:00
Dave Chapman
8c078f34ff Nano2G - reboot into disk mode when USB is inserted.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23070 a1c6a512-1295-4272-9138-f99709370657
2009-10-10 15:26:38 +00:00
Dave Chapman
4ff7666388 Implement __dbg_ports for S5L870X targets (Nano2G and Meizus)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23069 a1c6a512-1295-4272-9138-f99709370657
2009-10-10 13:23:07 +00:00
Michael Sparmann
51b00c9b0b Fixed some mutex issues in the iPod Nano 2G NAND driver and FTL.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23066 a1c6a512-1295-4272-9138-f99709370657
2009-10-10 10:51:07 +00:00
Thomas Martitz
faddb57482 Fuze/e200v2: Fix inaccuracy when moving the wheel slowly (fixes FS#10667).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23059 a1c6a512-1295-4272-9138-f99709370657
2009-10-09 23:27:38 +00:00
Michael Sparmann
a931acd3ab Added S5L870X cache coherency support
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23058 a1c6a512-1295-4272-9138-f99709370657
2009-10-09 21:41:57 +00:00
Michael Sparmann
f0a96580ae Core changes to allow storage drivers to do cleanup on shutdown, and iPod Nano 2G shutdown code rework (FS#10668)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23057 a1c6a512-1295-4272-9138-f99709370657
2009-10-09 20:36:09 +00:00
Michael Sparmann
e74daf2973 Reduce iPod Nano 2G NAND timeouts to a sane value (20ms)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23054 a1c6a512-1295-4272-9138-f99709370657
2009-10-09 18:54:48 +00:00
Michael Sparmann
1fa5d49380 Implemented iPod Nano 2G power_off()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23014 a1c6a512-1295-4272-9138-f99709370657
2009-10-08 20:56:51 +00:00
Rob Purchase
998db963ca Remove an unused #define
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23008 a1c6a512-1295-4272-9138-f99709370657
2009-10-08 16:00:13 +00:00
Rob Purchase
292a53da4b D2: Use a common function for reading ADC values from the PMU
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23007 a1c6a512-1295-4272-9138-f99709370657
2009-10-08 15:47:43 +00:00
Rafaël Carré
7cc6202c03 Sansa AMS SD: relax requirement for APP_CMD response, some uSD cards seem to not set correctly the response bits
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23001 a1c6a512-1295-4272-9138-f99709370657
2009-10-07 20:34:58 +00:00
Michael Sparmann
304d7175b9 Make iPod Nano 2G FTL return -1 on write() call, if read-only, to prevent panic.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23000 a1c6a512-1295-4272-9138-f99709370657
2009-10-07 18:46:53 +00:00
Dave Chapman
ee21a5322e Implement lcd_blit_yuv() for the 2nd gen Nano, based on the implementation for the iPod Color and 1st gen Nano. mpegplayer now works.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22992 a1c6a512-1295-4272-9138-f99709370657
2009-10-06 21:48:11 +00:00
Michael Sparmann
5abd9686f4 Encoding fixes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22970 a1c6a512-1295-4272-9138-f99709370657
2009-10-05 20:54:37 +00:00
Michael Sparmann
be25469b9b Reworked iPod Nano 2G PMU code, added RTC and battery ADC.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22967 a1c6a512-1295-4272-9138-f99709370657
2009-10-05 20:21:33 +00:00