Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29087 commits 17 branches 142 tags 291 MiB
Commit graph

1154 commits

Author SHA1 Message Date
Dave Chapman
a5c1ee5cf1 Working Nano2G UI sim. UI-ipodnano2g.bmp courtesy of Marianne Arnold, based on her SVG for the manual. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23176 a1c6a512-1295-4272-9138-f99709370657
 2009-10-14 21:40:28 +00:00
Dave Chapman
81ef39bd8d Changes to make the Nano2G sim build. It is still missing a UI-ipodnano2g.bmp 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23163 a1c6a512-1295-4272-9138-f99709370657
 2009-10-13 20:51:28 +00:00
Karl Kurbjun
8b6161b24b Simulator: Fix scrollwheel targets. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22977 a1c6a512-1295-4272-9138-f99709370657
 2009-10-06 01:26:01 +00:00
Tomer Shalev
a39be4b307 Fix red: Invert buttons in RTL mode 
- Revert renaming of button_set_flip()
- Moved rtl flipping logic to apps/actions.c as a static function
- Joined rtl_button_flip_needed() and button_flip_horizontally()


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22962 a1c6a512-1295-4272-9138-f99709370657
 2009-10-05 17:53:45 +00:00
Tomer Shalev
f7bd7252e1 Invert buttons in RTL mode 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22961 a1c6a512-1295-4272-9138-f99709370657
 2009-10-05 17:17:30 +00:00
Karl Kurbjun
714b4aaaf8 Simulator buttons: Remove a hack and make brickmania work the same as on target. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22936 a1c6a512-1295-4272-9138-f99709370657
 2009-10-05 04:20:28 +00:00
Bertrik Sikken
870b04760b Rename UI bmps for Creative Zen Vision / Vision M 30GB / Vision M60 GB, to match model names. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22847 a1c6a512-1295-4272-9138-f99709370657
 2009-09-27 16:20:35 +00:00
Nils Wallménius
c8b87d76eb FS#10569 RTC driver cleanup 
Change the RTC drivers so that the rtc_(read|write)_datetime functions now deal directly with the tm struct instead of passing a string of bcd digits to/from (set|get)_time .
This simplifies drivers for rtc's that do not use a bcd representation internally and cleans up some target specific code and #ifdefs in generic code. Implement simple stubs for the sim to avoid #ifdefing for that too.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22839 a1c6a512-1295-4272-9138-f99709370657
 2009-09-26 14:58:32 +00:00
Thomas Martitz
a305ca94a1 Change that include to " " style to allow for using SDL from custom installation pathes. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22823 a1c6a512-1295-4272-9138-f99709370657
 2009-09-24 23:04:15 +00:00
Thomas Martitz
d5797a6e93 Fix non-hold button and headphone detection target sims. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22800 a1c6a512-1295-4272-9138-f99709370657
 2009-09-23 17:26:42 +00:00
Thomas Martitz
ca85c401f5 Rework the simulators button reading to not implement it's own complete driver. 
Instead, implement it more as a target driver with button_read_device(), button_init_device() and button_hold(), then use the normal button driver from firmware/drivers/button.c.
Fixes FS#10451 ("backlight off on hold doesn't function properly").

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22799 a1c6a512-1295-4272-9138-f99709370657
 2009-09-23 16:59:56 +00:00
Karl Kurbjun
3f2e28b0f5 Sim: Add support for vertical stride. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22612 a1c6a512-1295-4272-9138-f99709370657
 2009-09-04 00:38:01 +00:00
Maurus Cuelenaere
9680244f4a * Fix plugin keymaps for VX777 
* Enable plugins for VX777
 * Fix VX777 simulator

All done by Aaron DeMille.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22576 a1c6a512-1295-4272-9138-f99709370657
 2009-08-31 21:11:32 +00:00
Nils Wallménius
304c622899 fix more red 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22433 a1c6a512-1295-4272-9138-f99709370657
 2009-08-19 22:36:39 +00:00
Nils Wallménius
47608e06b3 fix red 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22432 a1c6a512-1295-4272-9138-f99709370657
 2009-08-19 22:15:45 +00:00
Nils Wallménius
4f87976677 Slight cleanup in lcd.h: kill fixme and remove useless include, add some includes elsewhere and add a stub for sims instead of ifdef 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22431 a1c6a512-1295-4272-9138-f99709370657
 2009-08-19 21:48:17 +00:00
Karl Kurbjun
35ffefa6b6 M:Robe 500: Correct UI simulator. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22372 a1c6a512-1295-4272-9138-f99709370657
 2009-08-17 01:54:24 +00:00
Dominik Riebeling
a77b17cb33 Remove underscore from YH modelnames as discussed on IRC. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22229 a1c6a512-1295-4272-9138-f99709370657
 2009-08-09 19:15:08 +00:00
Robert Kukla
275a30092e initial commit of remote support for m:robe 100 courtesy of lowlight; simulator support including small fixes for the m:robe 500 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22053 a1c6a512-1295-4272-9138-f99709370657
 2009-07-26 14:26:14 +00:00
Thomas Martitz
eb915ce6a1 Make the Sansa Clip and Fuze sim keymapping more like other Sansas with regard to the use of the numpad 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21713 a1c6a512-1295-4272-9138-f99709370657
 2009-07-08 12:45:15 +00:00
Mark Arigo
f820d36fe2 Change the button definitions for the SA9200 sim too 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21699 a1c6a512-1295-4272-9138-f99709370657
 2009-07-07 04:23:03 +00:00
Rafaël Carré
89ccd5c145 Remove int_prio argument from timer_register, and move the only use for it into alpine_cdc plugin, since this plugin is only built on SH7034 
Also remove it from TIMER_START()

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21558 a1c6a512-1295-4272-9138-f99709370657
 2009-06-29 14:29:46 +00:00
Mark Arigo
895357be99 Philips SA9200: add the UI sim 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21348 a1c6a512-1295-4272-9138-f99709370657
 2009-06-19 03:50:30 +00:00
Rafaël Carré
fa9339a63e c200v2 simulator 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21333 a1c6a512-1295-4272-9138-f99709370657
 2009-06-18 19:12:43 +00:00
Dan Everton
72c65d7575 Commit FS#10324 from Jeffrey Goode. 
Close the debug audio stream in the simulator when playback is stopped
to allow the file to be opened by other programs. This would mostly have
been an issue on Windows.



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21315 a1c6a512-1295-4272-9138-f99709370657
 2009-06-17 07:55:50 +00:00
Maurus Cuelenaere
c18495842a Onda VX747 simulator: add some more usefull keys 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21303 a1c6a512-1295-4272-9138-f99709370657
 2009-06-15 20:41:02 +00:00
Karl Kurbjun
4d41886caa M:Robe 500: Fix up 256 color blitting when in portrait mode, fix a mistake in the plugin linker script, reduce the amount of memory used by overwriting IRAM with bss after program has started, clean up some tabs and formatting, resize the simulator when building for 640x480 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21280 a1c6a512-1295-4272-9138-f99709370657
 2009-06-13 20:59:03 +00:00
Mark Arigo
758bb3bc62 3 new ports: Samsung YH-820, YH-920, and YH-925. Mostly functional. Audio working on 820 & 925 (untested on the 920). No battery readings. No recording. No plugins. Keymap needs work. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21083 a1c6a512-1295-4272-9138-f99709370657
 2009-05-25 21:10:45 +00:00
Thomas Martitz
b2b3f39403 Remove an #ifdef SIMULATOR in favor of using a stub 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20853 a1c6a512-1295-4272-9138-f99709370657
 2009-05-05 08:43:32 +00:00
Thomas Martitz
23e505b32b Fix reds. libuisimulator.a apparently needs to be linked twice (aka quick fix as I don't know a better solution yet) :/ 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20830 a1c6a512-1295-4272-9138-f99709370657
 2009-04-29 22:58:56 +00:00
Thomas Martitz
a7f4e1f1c5 Simulate lcd_enable and lcd_sleep in the simulator. Therefore, turn backlight-sim.h into a .c too. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20829 a1c6a512-1295-4272-9138-f99709370657
 2009-04-29 22:24:40 +00:00
Thomas Martitz
13477a0d0f Set keywords and eol-style properties for the new backlight-sim.h. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20797 a1c6a512-1295-4272-9138-f99709370657
 2009-04-26 02:32:37 +00:00
Thomas Martitz
0a5beba823 Move the sim stubs into a seperate file to clean backlight.c up a bit. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20796 a1c6a512-1295-4272-9138-f99709370657
 2009-04-26 02:27:11 +00:00
Jonathan Gordon
0eb5dc649f beginings of a working touchscreen interface for the WPS. 2 new tags: 
%T|x|y|width|height|action| <- setup a region (relative to the current viewport) where if pressed the "action" will be done (currently play/stop/prev/next/menu/browse work, suggestions for others to add and better names welcome)
%Tl<timeout> <- used as a conditional to say if the touchscreen was touched in the last <timeout>, use this to enable/disable button viewports or something... same syntax as other timeout tags

cabbiev2 for the mr500 has been modified to demonstrate the new tags. press the pause/play button to pause playback. press the rockbox logo to get back to the menu. pretty icons needed to make this more usable :)



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20753 a1c6a512-1295-4272-9138-f99709370657
 2009-04-20 01:41:56 +00:00
Karl Kurbjun
8ec87106bc M:Robe 500: Cleanup the simulator image. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20727 a1c6a512-1295-4272-9138-f99709370657
 2009-04-18 01:58:52 +00:00
Antoine Cellerier
443a4e2296 Add a few simulator keys for the e200 (in case you don't have a numpad) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20628 a1c6a512-1295-4272-9138-f99709370657
 2009-04-05 17:35:48 +00:00
Thomas Martitz
7e7d8ebfef Actually do the renaming of the stub. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20334 a1c6a512-1295-4272-9138-f99709370657
 2009-03-17 03:45:55 +00:00
Thomas Martitz
4ed387d603 Fix reds and yellows (hopefully). Some targets apparently didn't properly #ifdef lcd_enable and lcd_sleep code out, so that it got partly active in the bootloader; rename the ui simulator stub fixes most reds; for the clip: move the hook code into lcd-1bit-vert.c which should fix the bootloader red. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20333 a1c6a512-1295-4272-9138-f99709370657
 2009-03-17 03:36:36 +00:00
Maurus Cuelenaere
5d43daac1f Also add support for the Onda VX747+ 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20274 a1c6a512-1295-4272-9138-f99709370657
 2009-03-09 23:40:23 +00:00
Maurus Cuelenaere
935780e426 Add support for Onda VX747 simulator (and yes, it needs a better picture) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20273 a1c6a512-1295-4272-9138-f99709370657
 2009-03-09 23:32:37 +00:00
Jens Arnold
08b643ee57 Fix update rectangle calculation. This caused the black artifacts outside the screen area introduced with backlight simulation for colour targets. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20199 a1c6a512-1295-4272-9138-f99709370657
 2009-03-04 18:46:08 +00:00
Jens Arnold
6421f94c0d Silence warning from 'ar' if the archive had to be created. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20151 a1c6a512-1295-4272-9138-f99709370657
 2009-03-01 09:04:15 +00:00
Steve Bavin
b61f0c6884 FS#9964 take 2. Including the whole patch is a good idea. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20133 a1c6a512-1295-4272-9138-f99709370657
 2009-02-27 21:25:17 +00:00
Steve Bavin
6eea66fbc1 FS#9964 - Fix simulator file i/o when the --root option is used. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20132 a1c6a512-1295-4272-9138-f99709370657
 2009-02-27 21:15:52 +00:00
Tom Ross
353ebd0967 Small bit from my GSoC work: Unify the way the simulator accesses voice strings. In the future this will allow plugin menus to be translated and voiced. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20125 a1c6a512-1295-4272-9138-f99709370657
 2009-02-27 07:57:29 +00:00
Daniel Stenberg
2e6d604bb6 Stop hiding errors by redirecting stderr to /dev/null. If we really need to do re-introduce somewhere we should rather make it dependent on the V variable so that make V=1 would still show the error and only "normal" builds would hide it. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20090 a1c6a512-1295-4272-9138-f99709370657
 2009-02-23 08:45:16 +00:00
Jens Arnold
3e67e3b1f0 Add a rockbox kernel thread for simulator specific tasks, and use that for calling the screendump function(s). Fixes screendump in simulators for backlight-less targets (Ondio), and reduces mixing of unrelated functionality a bit (screendump was called from backlight thread, triggered by a sim-only system wide event). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20065 a1c6a512-1295-4272-9138-f99709370657
 2009-02-20 17:13:08 +00:00
Jens Arnold
8b948c34f5 Fix the Playersim as well. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19969 a1c6a512-1295-4272-9138-f99709370657
 2009-02-11 00:10:35 +00:00
Jens Arnold
11ad7b4bc8 Move screendump from apps to firmware, solving two nasty firmware-to-apps calls. This required to move the filename creation functions as well. * Fix bug in the BMP header of Clip screendumps. * Add remote screendump for targets with an LCD remote. * Simplify some ifdefs and rename a macro in the sim. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19967 a1c6a512-1295-4272-9138-f99709370657
 2009-02-10 23:43:37 +00:00
Jens Arnold
0358d9b382 Simulate backlight for colour targets. Implements the idea from FS #9884, but uses SDL alpha blending. Display is dimmed to 1/3 for targets with transflective LCD, and set to black for others. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19961 a1c6a512-1295-4272-9138-f99709370657
 2009-02-10 01:23:18 +00:00
Jens Arnold
309a3c4590 More compact screendump routines for core and greylib. The core routine might be a little slower for vertically packed mono and greyscale displays, the greylib one should be faster in all cases. * Reduce stack usage of greyscale screendump on the Clip* Rename a macro in the bitmap LCD simulation. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19959 a1c6a512-1295-4272-9138-f99709370657
 2009-02-09 23:34:44 +00:00
Jens Arnold
305d86d045 Fix red and yellow. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19951 a1c6a512-1295-4272-9138-f99709370657
 2009-02-09 00:47:20 +00:00
Jens Arnold
0d935ce75e Put the display colours for monochrome and greyscale targets into the target config files, and use them both for the simulator UI and screendumps. The Clip now shows the split display properly in screendumps and simulator. A side effect is that screendumps of ordinary monochrome targets are now 4-bit BMP files (saves an alternate code path, and might be more compatible with some gfx programs). * Simplify the simulation of split display, and also simplify greylib simulation. The simulator now always calculates 129 shades (2*128 for a Clip sim), and just uses 2 (or 4) of those for native display simulation. * Centralised the simulator LCD dimension definition. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19950 a1c6a512-1295-4272-9138-f99709370657
 2009-02-09 00:32:59 +00:00
Jens Arnold
d8899b3455 Simulator: Fix an almost 3 years old colour init bug both on startup and on greylib init, that caused the weird colours in the m:robe 100 sim. Add a quick-fix for m:robe 100 greylib inversion in the sim. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19838 a1c6a512-1295-4272-9138-f99709370657
 2009-01-24 09:38:54 +00:00
Björn Stenberg
ff498519d0 Red build fix. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19744 a1c6a512-1295-4272-9138-f99709370657
 2009-01-10 21:38:56 +00:00
Jonas Häggqvist
fed22a06e6 The simulator background logic is now reversed, such that it defaults to being enabled. Use --nobackground to disable it (FS#9626). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19726 a1c6a512-1295-4272-9138-f99709370657
 2009-01-08 20:04:17 +00:00
Michael Sevakis
c5a2f543b2 threads_exit should be volatile being polled in a loop on a sim thread and be written by the GUI thread. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19721 a1c6a512-1295-4272-9138-f99709370657
 2009-01-08 12:40:18 +00:00
Michael Sevakis
faa01e9e94 Fix yellow. Don't know how I missed that testing sim build. :\ 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19719 a1c6a512-1295-4272-9138-f99709370657
 2009-01-08 11:27:46 +00:00
Michael Sevakis
33a7f3a6cf Allow sims to shut down normally from panic code. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19718 a1c6a512-1295-4272-9138-f99709370657
 2009-01-08 11:08:22 +00:00
Michael Sevakis
4ed78f5c72 Clean up panicf and introduce system_exception_wait to do further target tasks and wait for a button when an unrecoverable error has occurred (panic, UIE, etc.). Returning from that function should reboot or don't return from it. Move UIE and __div0 for ARM to its own file. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19716 a1c6a512-1295-4272-9138-f99709370657
 2009-01-08 10:15:32 +00:00
Dominik Wenger
c38815aa29 fix m200v4 simulator. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19711 a1c6a512-1295-4272-9138-f99709370657
 2009-01-07 18:52:32 +00:00
Nils Wallménius
f501cda42d Fix remaining red. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19661 a1c6a512-1295-4272-9138-f99709370657
 2009-01-03 15:55:20 +00:00
Mark Arigo
498e95b986 Add the sim build for the Philips HDD1630. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19639 a1c6a512-1295-4272-9138-f99709370657
 2009-01-02 04:35:13 +00:00
Michael Sevakis
3157e13956 Simplify powermgmt thread loops so it calls functions turn (no more power_thread_sleep). Do other target-friendly simplifications, generic battery switch handling and split sim-specific code. Whoever can, please verify charging on the Archos Recorder (due to change in the charger duty cycle code). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19579 a1c6a512-1295-4272-9138-f99709370657
 2008-12-24 16:58:41 +00:00
Björn Stenberg
ee46a3d88e Moved database builder into a separate directory, and gave it its' own Makefile. Now it compiles cleanly and builds a database if ran in root of music tree. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19448 a1c6a512-1295-4272-9138-f99709370657
 2008-12-15 23:42:19 +00:00
Michael Sevakis
e69d567d9e Bring consistency to pcm implementation and samplerate handling. Less low-level duplication. A small test_sampr fix so it works on coldfire again. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19400 a1c6a512-1295-4272-9138-f99709370657
 2008-12-12 11:01:07 +00:00
Michael Sevakis
8cfbd3604f Use cookies for thread identification instead of pointers directly which gives a buffer against wrongly identifying a thread when the slot is recycled (which has been nagging me for awhile). A slot gets 255 uses before it repeats. Everything gets incompatible so a full update is required. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19377 a1c6a512-1295-4272-9138-f99709370657
 2008-12-10 08:57:10 +00:00
Rafaël Carré
07fd663b02 Remove left-over debug code 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19348 a1c6a512-1295-4272-9138-f99709370657
 2008-12-04 23:31:02 +00:00
Rafaël Carré
bba06cfd55 Sansa Clip Simulator: emulate the real screen at the price of some CPU (FS#9521) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19347 a1c6a512-1295-4272-9138-f99709370657
 2008-12-04 23:24:45 +00:00
Jonathan Gordon
2f1892a267 stop printing "storage_sleep()" in the sim output 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19323 a1c6a512-1295-4272-9138-f99709370657
 2008-12-04 09:09:49 +00:00
Michael Sevakis
add677fca8 Fix some red. The stubs in bootloaders are giving some trouble. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19316 a1c6a512-1295-4272-9138-f99709370657
 2008-12-03 20:43:10 +00:00
Michael Sevakis
58eb784a5d Straighten out some powermanagement stuff. Give target complete control over how power inputs are sensed. Clean SIMULATOR stuff out of target files. Get rid of USB charging option on targets that don't support it or don't implement it yet. Menu string remains to avoid language incompatibility but should be removed on next cleanup for targets not using it (notice in english.lang). global_settings becomes incompatible for some builds and so plugin API version is incremented. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19315 a1c6a512-1295-4272-9138-f99709370657
 2008-12-03 19:54:25 +00:00
Björn Stenberg
a091d20ba0 Added 'keywords' and 'eol-style' properties. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19218 a1c6a512-1295-4272-9138-f99709370657
 2008-11-25 19:54:23 +00:00
Björn Stenberg
819378bf9d Renamed simulator disk directory from 'archos' to 'simdisk'. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19204 a1c6a512-1295-4272-9138-f99709370657
 2008-11-24 20:32:57 +00:00
Björn Stenberg
7f00ad0a52 Removed duplicate LANG_O... 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19172 a1c6a512-1295-4272-9138-f99709370657
 2008-11-21 15:27:54 +00:00
Björn Stenberg
6b96270856 Added LANG_O to simulators as well. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19171 a1c6a512-1295-4272-9138-f99709370657
 2008-11-21 15:27:16 +00:00
Björn Stenberg
7bdf9a3392 Remove .a files before running ar, to avoid problems with renamed files remaining in the library. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19161 a1c6a512-1295-4272-9138-f99709370657
 2008-11-20 16:51:13 +00:00
Björn Stenberg
c6b3d38a15 New makefile solution: A single invocation of 'make' to build the entire tree. Fully controlled dependencies give faster and more correct recompiles. 
Many #include lines adjusted to conform to the new standards.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19146 a1c6a512-1295-4272-9138-f99709370657
 2008-11-20 11:27:31 +00:00
Dominik Wenger
83dc89f751 m200v4: make buttons work again (added a small delay). make m200 keymap better. Add button mappings for the sim. Remove some config defines temporary to make building work again. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19104 a1c6a512-1295-4272-9138-f99709370657
 2008-11-14 21:57:43 +00:00
Jonathan Gordon
0d812dd235 FS#9535 - Sansa Fuze sim 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19086 a1c6a512-1295-4272-9138-f99709370657
 2008-11-11 11:26:07 +00:00
Rafaël Carré
d34837cba1 Sansa Clip simulator: bind p/escape to power button 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18986 a1c6a512-1295-4272-9138-f99709370657
 2008-11-03 13:20:06 +00:00
Frank Gevaerts
99d39f5c3a put stubs in the proper place 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18978 a1c6a512-1295-4272-9138-f99709370657
 2008-11-02 02:19:39 +00:00
Rafaël Carré
603a9c7c7d Clip: add backlight and buttonlight code 
Revive lcd_enable() as well, and use it in _backlight_on/off()
Don't update the lcd framebuffer if the display is off

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18952 a1c6a512-1295-4272-9138-f99709370657
 2008-10-31 22:02:41 +00:00
Rafaël Carré
cd9b1379ff Sansa Clip simulator 
First draft at keymapping based on e200

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18948 a1c6a512-1295-4272-9138-f99709370657
 2008-10-31 18:54:37 +00:00
Dave Chapman
74b935c893 Make the e200v2 simulator compile - an easy job as the apps/ code is identical to the e200v1. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18902 a1c6a512-1295-4272-9138-f99709370657
 2008-10-28 17:49:35 +00:00
Michael Sevakis
4ce3eb2453 The tick change for the sim can be a little nicer. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18895 a1c6a512-1295-4272-9138-f99709370657
 2008-10-27 17:26:58 +00:00
Michael Sevakis
623cd1cb0d Fix red-- it should. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18894 a1c6a512-1295-4272-9138-f99709370657
 2008-10-27 17:18:01 +00:00
Vitja Makarov
9004289a14 iaudio7: simulator 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18861 a1c6a512-1295-4272-9138-f99709370657
 2008-10-22 11:58:49 +00:00
Maurus Cuelenaere
1392dc2144 Commit FS#9308: differentiate between TOUCHPAD & TOUCHSCREEN 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18338 a1c6a512-1295-4272-9138-f99709370657
 2008-08-23 09:46:38 +00:00
Dave Chapman
ee4ff052c2 Revert r17988 and instead fix the button labels in the ipod simulator background images. This isn't 100% perfect (I didn't go back to the layered source images), but IMO is good enough. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17991 a1c6a512-1295-4272-9138-f99709370657
 2008-07-08 23:27:09 +00:00
Marc Guay
779c0eb5f0 Fix the simulator buttons for the iPod scrollwheels. Closes FS#8956. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17988 a1c6a512-1295-4272-9138-f99709370657
 2008-07-08 17:06:15 +00:00
Robert Kukla
feeac4f15f volume buttons for gigabeat sim 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17956 a1c6a512-1295-4272-9138-f99709370657
 2008-07-06 12:27:03 +00:00
Bertrik Sikken
f4d4a6ab60 Implement FS#8947 - Add a stub in the simulator for ata_disk_is_active. This make it possible to clean up some #ifdef SIMULATOR macros. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17927 a1c6a512-1295-4272-9138-f99709370657
 2008-07-03 13:37:57 +00:00
Daniel Stenberg
2acc0ac542 Updated our source code header to explicitly mention that we are GPL v2 or 
later. We still need to hunt down snippets used that are not. 1324 modified
files...
http://www.rockbox.org/mail/archive/rockbox-dev-archive-2008-06/0060.shtml


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17847 a1c6a512-1295-4272-9138-f99709370657
 2008-06-28 18:10:04 +00:00
Marcoen Hirschberg
7b10ef9a7c initial Meizu M6SL port (take 2) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17819 a1c6a512-1295-4272-9138-f99709370657
 2008-06-27 23:24:34 +00:00
Michael Giacomelli
3d30be8557 lcd-common.h hasn't contained code in nearly 6 years. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17722 a1c6a512-1295-4272-9138-f99709370657
 2008-06-14 23:10:47 +00:00
Maurus Cuelenaere
785aa5cf64 Fix M:Robe 500 simulator 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17663 a1c6a512-1295-4272-9138-f99709370657
 2008-05-30 23:04:55 +00:00
Maurus Cuelenaere
944219bb77 (Simulator) Touchscreen improvements. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17662 a1c6a512-1295-4272-9138-f99709370657
 2008-05-30 22:55:24 +00:00
Michael Sevakis
3b730a280d Fix red while keeping menu item. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17658 a1c6a512-1295-4272-9138-f99709370657
 2008-05-29 21:53:49 +00:00
Maurus Cuelenaere
1ea884b531 1) Add ZVM60GB and ZV simulator builds (ZVM60GB sim equals to ZVM30GB) 
2) Correct typo which'll break build system for ZV currently
3) Split up keymaps for ZV & ZVM


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17525 a1c6a512-1295-4272-9138-f99709370657
 2008-05-15 18:01:14 +00:00
Maurus Cuelenaere
f37371246c Fix sim build 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17518 a1c6a512-1295-4272-9138-f99709370657
 2008-05-14 21:46:17 +00:00
Maurus Cuelenaere
02883e02e2 Make ZVM30GB simulator work. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17513 a1c6a512-1295-4272-9138-f99709370657
 2008-05-14 21:14:06 +00:00
Nicolas Pennequin
357ffb3c46 Convert the whole codebase to UTF-8, except docs/COMMITTERS and tools/creative.c, which need checking. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17369 a1c6a512-1295-4272-9138-f99709370657
 2008-05-05 10:32:46 +00:00
Jonathan Gordon
5b5a626bb6 Setup the touchpads to have two modes - stylus and button - and set them in button mode by default. 
in button mode the touchpad is split into a 3x3 grid for 9 seperate buttons which can be used by the action system like real buttons.
Unify the keymap file for the touchpads in button mode. the target keymap file only needs to worry about real buttons.
(As these ports mature each screen will need to be fixed seperatly to be able to use stylus mode (the lists can already but don't change mode just yet.)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17114 a1c6a512-1295-4272-9138-f99709370657
 2008-04-15 10:35:11 +00:00
Jens Arnold
2bf4178018 Make mpegplayer sleep the disk after buffering to save battery. * Add a simulator stub for ata_sleep(), and un-ifdef most calls to it. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17096 a1c6a512-1295-4272-9138-f99709370657
 2008-04-13 12:24:47 +00:00
Steve Bavin
ac313abe87 Best use C, not C++ 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17021 a1c6a512-1295-4272-9138-f99709370657
 2008-04-07 17:27:56 +00:00
Steve Bavin
799e9489ca Remove some more simulator debugging output. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17019 a1c6a512-1295-4272-9138-f99709370657
 2008-04-07 17:19:53 +00:00
Jens Arnold
5c87a98b97 Greyscale library: * Implement linearisation curve flipping for 1st/2nd Gen iPods (LCD is inverted when backlight is on, so the curve is also inverted). This needs a slight extension of is_backlight_on() functionality in the core. * Thorough recalibration of all reachable greyscale targets, and #ifdef cleanup. * Reduce on-target gamma a bit, because the displayable contrast range of a monochrome/greyscale isn't that high. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16936 a1c6a512-1295-4272-9138-f99709370657
 2008-04-02 22:16:14 +00:00
Steve Bavin
135cc757bd Revert my earlier const madness, we'll keep the parameter lists simple. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16863 a1c6a512-1295-4272-9138-f99709370657
 2008-03-28 12:51:33 +00:00
Steve Bavin
c9df8fd87b The const police raid playback.c, should be no change to behaviour. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16860 a1c6a512-1295-4272-9138-f99709370657
 2008-03-28 11:24:24 +00:00
Marcoen Hirschberg
b2ec13d8f1 Revert "initial Meizu M6SL port" 
This reverts commit b7bd17ce1715c3a8acbf74a63694c28b6075da5b.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16846 a1c6a512-1295-4272-9138-f99709370657
 2008-03-27 11:53:51 +00:00
Marcoen Hirschberg
c7e5d78241 initial Meizu M6SL port 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16844 a1c6a512-1295-4272-9138-f99709370657
 2008-03-27 11:29:24 +00:00
Daniel Stenberg
08cabe9169 kill the release script and build tarball from *everything* in SVN... 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16818 a1c6a512-1295-4272-9138-f99709370657
 2008-03-26 13:12:07 +00:00
Michael Sevakis
af395f4db6 Do core interrupt masking in a less general fashion and save some instructions to decrease size and speed things up a little bit. Small fix to a few places where interrupts would get enabled again where they shouldn't have been (context switching calls when disabled). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16811 a1c6a512-1295-4272-9138-f99709370657
 2008-03-26 01:50:41 +00:00
Michael Sevakis
27cf677339 Add a complete priority inheritance implementation to the scheduler (all mutex ownership and queue_send calls are inheritable). Priorities are differential so that dispatch depends on the runnable range of priorities. Codec priority can therefore be raised in small steps (pcmbuf updated to enable). Simplify the kernel functions to ease implementation and use the same kernel.c for both sim and target (I'm tired of maintaining two ;_). 1) Not sure if a minor audio break at first buffering issue will exist on large-sector disks (the main mutex speed issue was genuinely resolved earlier). At this point it's best dealt with at the buffering level. It seems a larger filechunk could be used again. 2) Perhaps 64-bit sims will have some minor issues (finicky) but a backroll of the code of concern there is a 5-minute job. All kernel objects become incompatible so a full rebuild and update is needed. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16791 a1c6a512-1295-4272-9138-f99709370657
 2008-03-25 02:34:12 +00:00
Jens Arnold
b88c7d076d The blit functions shouldn't exist for the simulator. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16777 a1c6a512-1295-4272-9138-f99709370657
 2008-03-24 01:00:42 +00:00
Jens Arnold
c84e345e6e Oops, fix red. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16776 a1c6a512-1295-4272-9138-f99709370657
 2008-03-24 00:45:03 +00:00
Jens Arnold
68a21689ae Consistent naming scheme the various blit functions. * Removed lcd_blit_mono() for colour targets. Plugin API became incompatible, so sort, clean up & bump. * Implemented lcd_blit_mono() for M3. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16775 a1c6a512-1295-4272-9138-f99709370657
 2008-03-24 00:35:53 +00:00
Jens Arnold
919c20669b More M3 work: Rockbox logo, keymap, sim definitions, sim bitmap. Simulator builds and works now, but for some reason it tries to build plugins even though they're deactivated through configure... The keymap probably needs further refinement. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16658 a1c6a512-1295-4272-9138-f99709370657
 2008-03-14 00:17:59 +00:00
Robert Kukla
2aa48042e5 fix red 2 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16490 a1c6a512-1295-4272-9138-f99709370657
 2008-03-02 22:00:39 +00:00
Robert Kukla
3e3e1d518e simulator: 
- correct colours for m:robe 100 display & screendump
- labelled button on background 

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16488 a1c6a512-1295-4272-9138-f99709370657
 2008-03-02 21:28:26 +00:00
Mark Arigo
d829075a00 Driver for the Synaptics touchpad on the m:robe 100 based on the 3-wire interface spec. Needs some tweaking as it's too sensitive with the default hardware settings. For now, the vertical strip is divided into up/select/down buttons. Also, redo the keymap (using the Gigabeat as a starting point), but it still needs a good bit of work. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16400 a1c6a512-1295-4272-9138-f99709370657
 2008-02-24 04:12:16 +00:00
Will Robertson
fffa26987a UI Simulator for Gigabeat S. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16246 a1c6a512-1295-4272-9138-f99709370657
 2008-02-08 08:33:17 +00:00
Rob Purchase
d8e3abf6ce Shiny new bitmap for the D2 sim 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16151 a1c6a512-1295-4272-9138-f99709370657
 2008-01-23 22:19:53 +00:00
Daniel Stenberg
9759c035f4 Renamed 'archos' to 'modelname' in the configure script and the Makefiles 
using it, to reduce confusion for newcomers who never even had an Archos. Those
innocent youngsters.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16149 a1c6a512-1295-4272-9138-f99709370657
 2008-01-23 10:59:17 +00:00
Rob Purchase
fa85aa8d97 D2 simulator build (plugins not built yet) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16146 a1c6a512-1295-4272-9138-f99709370657
 2008-01-22 22:48:36 +00:00
Robert Kukla
c1791a540e compile uisimulator for m:robe 100, button definitions taken from h10 for now 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16123 a1c6a512-1295-4272-9138-f99709370657
 2008-01-20 22:57:49 +00:00
Michael Sevakis
32a531b09b Do some simplification in switch_thread regarding interrupt enabling which simplifies kernel objects as well. Simply doing unconditional disable/enable should be fine in the firmware. Not sure about the case in the bootloader for all targets and so will evaluate but that should be fine too if everything is masked. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16107 a1c6a512-1295-4272-9138-f99709370657
 2008-01-19 13:27:47 +00:00
Michael Sevakis
6a8379674c Finally, out goes struct spinlock for anything but mutiprocessor targets where it becomes a reenterable corelock. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16105 a1c6a512-1295-4272-9138-f99709370657
 2008-01-18 13:12:33 +00:00
Jonathan Gordon
81ba146706 Accept FS#8341 - rename BUTTON_SCROLL_UP/DOWN to FWD/BACK on the e200 to make it consistant with the ipods. apart from removing a bit of confusion, it fixes the wheel in pictureflow and possibly elsewhere. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16045 a1c6a512-1295-4272-9138-f99709370657
 2008-01-10 08:08:31 +00:00
Michael Sevakis
a5fc3f4df4 Initial WVS for mpegplayer. Adjusts to the user's preferred font and uses FF/RW preferences set for playback. Picked a random color for the base WVS color but it could be configured. Some engine tweaks to accomodate it since certain nescessities are clearer now. Fix a clipped YUV output bug in the SIM. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15991 a1c6a512-1295-4272-9138-f99709370657
 2008-01-03 17:14:28 +00:00
Michael Sevakis
6a05883239 Simulate the effects of sector caching a bit. Bypass I/O yield if a byte counter hasn't reached a certain threshold. Can be dialed-in by changing a #define. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15871 a1c6a512-1295-4272-9138-f99709370657
 2007-12-03 15:33:12 +00:00
Michael Sevakis
a4d19b7e89 Simplify the uisimulator I/O routine and let the rockbox thread calling the functions be the background thread. Should speed things up too and lose none of the advantanges of background I/O. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15870 a1c6a512-1295-4272-9138-f99709370657
 2007-12-03 14:01:12 +00:00
Jonathan Gordon
50a8308ded fix fs#8131 - if --debugwps is used with the sim, the mouse coordinates will be displayed in the console when it is clicked 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15565 a1c6a512-1295-4272-9138-f99709370657
 2007-11-11 01:50:18 +00:00
Steve Bavin
f87eb608a8 Code police; trailing spaces mainly. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15527 a1c6a512-1295-4272-9138-f99709370657
 2007-11-08 12:11:34 +00:00
Steve Bavin
9e05cc537b Add --root option to allow overriding of simulator root menu. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15526 a1c6a512-1295-4272-9138-f99709370657
 2007-11-08 10:15:44 +00:00
Jonathan Gordon
c14430a9c1 compile talk.c on hwcodec sim. it wont actually talk though 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15512 a1c6a512-1295-4272-9138-f99709370657
 2007-11-07 09:28:07 +00:00
Jonathan Gordon
5af8e940e1 woops, lasttn does need to be global 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15453 a1c6a512-1295-4272-9138-f99709370657
 2007-11-04 10:01:27 +00:00
Jonathan Gordon
e0cd0b84f3 fix red 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15431 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 12:10:03 +00:00
Jonathan Gordon
97f6c46fe9 mouse support for HAVE_TOUCHPAD target simulator 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15430 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 11:58:31 +00:00
Nicolas Pennequin
c70671b652 Fix sims: sim_codec_load_ram() needed an update 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15411 a1c6a512-1295-4272-9138-f99709370657
 2007-11-02 17:43:37 +00:00
Michael Sevakis
a8eeff0fee Improve the fake interrupt stuff on the sim a bit. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15349 a1c6a512-1295-4272-9138-f99709370657
 2007-10-28 16:49:02 +00:00
Nicolas Pennequin
1839edf64a Add queue_peek to the kernel (written by Mike Sevakis), and use it to improve upon my previous commit. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15336 a1c6a512-1295-4272-9138-f99709370657
 2007-10-27 18:08:18 +00:00
Michael Sevakis
4a5894db1a Correct some commenting left from an earlier set_irq_level version. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15323 a1c6a512-1295-4272-9138-f99709370657
 2007-10-26 23:27:04 +00:00
Michael Sevakis
c935ed5112 Argh. Forgot to 'svn add' as usual. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15322 a1c6a512-1295-4272-9138-f99709370657
 2007-10-26 23:16:41 +00:00
Michael Sevakis
d6af287397 Implement as genuine a set_irq_level function for the sim as possible. The yield added earlier is still nescessary since other threads won't run anyway while viewing the database screen on either sim or target. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15321 a1c6a512-1295-4272-9138-f99709370657
 2007-10-26 23:11:18 +00:00
Karl Kurbjun
fdbc01c6e2 More M:Robe work including a fix to lcd-as-memframe for larger screens thanks to Michael Sevakis. Also fixes simulator builds. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15254 a1c6a512-1295-4272-9138-f99709370657
 2007-10-21 23:12:17 +00:00
Steve Bavin
32a9575130 FS#7994 - Rename talk.c API, make talk_disable() affect all talking (not just menus), hopefully save some space. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15206 a1c6a512-1295-4272-9138-f99709370657
 2007-10-19 15:31:42 +00:00
Dave Chapman
443ccb6031 Remove some dead code 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15171 a1c6a512-1295-4272-9138-f99709370657
 2007-10-17 18:23:25 +00:00
Michael Sevakis
9b1f1dd0b4 Fix a warning (no newline at end of file). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15136 a1c6a512-1295-4272-9138-f99709370657
 2007-10-16 01:52:18 +00:00