vice-emu-commit — Commit notifications for the source server

[Vice-emu-commit] SF.net SVN: vice-emu: [18895] trunk/vice

[<st...@us...>]

Revision: 18895
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18895&view=rev
Author:   strik
Date:     2008-06-23 10:14:59 -0700 (Mon, 23 Jun 2008)

Log Message:
-----------
2008-06-23  Spiro Trikaliotis  <spi...@gm...>

	* src/c64/tfe.c: disabled log_message() for tfe_hash_mask[], as it
	accessed memory out of bounds.

2008-06-22  Marco van den Heuvel  <bla...@ya...>

	* Makefile.am: Improved some of the make-bindist.sh scripts.

2008-06-19  Marco van den Heuvel  <bla...@ya...>

	* vice-mint.spec, Makefile.am: Added Atari Mint specific rpm

2008-06-19  Marco van den Heuvel  <bla...@ya...>

	* vice-mint.spec, Makefile.am: Added Atari Mint specific rpm
	spec file.

	* AUTHORS, README: Added Fabrizio to the VICE core members.

	* config.guess, config.sub: Added preliminary support for
	avr32-linux.

	* doc/vice.texi: Added Fabrizio to the VICE core members, got
	rid of a duplicate Christian Vogelgsang entry and added/updated
	external contributors entries.

	* doc/html/plain/NEWS, doc/html/index.html: Updated for the VICE
	2.0 release.

2008-06-19  Marco van den Heuvel  <bla...@ya...>

	* po/nl.po: Updated.

2008-06-22  Marco van den Heuvel  <bla...@ya...>

	* src/arch/amigaos/uiapi.c, src/arch/os2/ui.c,
	src/arch/unix/x11/gnome/x11ui.c, src/arch/unix/x11/xaw/x11ui.c:
	Added the option to choose 'continue' for the CPU JAM dailog.

	* src/monitor/mon_lex.c, src/monitor/mon_lex.l: Fixed the undump
	command as provided by M. Kiesel <ma...@us...>.

	* src/plus4/plus4mem.c: Fixed the reported plus4 hannes/csory
	memory expansion bug for memory at $ffxx.

	* src/arch/unix/qnx6/make-bindist.sh,
	src/arch/unix/sco_sol/make-bindist.sh,
	src/arch/unix/skyos/make-bindist.sh: Improved some of the
	make-bindist.sh scripts.

2008-06-19  Marco van den Heuvel  <bla...@ya...>

	* src/vdrive/vdrive-internal.c, src/vdrive/vdrive-command.c,
	src/plus4/ted-mem.c, src/vicii/vicii-mem.c, src/cbmimage.c,
	src/c128/c128mem.c, src/c1541.c, src/fsdevice/fsdevice-open.c,
	src/pet/petmem.c: Changed around to get rid of unreachable code.

	* src/video/video-resources.c, src/video/video-resources.h,
	src/video/video-resources-pal.c: Added a check for win32, new
	PAL-mode, PAL emulation on, double size, double scan to give a
	warning about the performance problem of that combination on
	win32.

	* src/sid/sid-resources.c: Changed the unsigned int to int for
	some variables used in a resource-table.

	* src/alarm.h, src/sounddrv/soundwmm.c: Got rid of a comparison
	of an unsigned type with smaller than zero (unsigned int x < 0).

	* src/main.c, src/arch/amigaos/mui/mui.c,
	src/arch/os2/dialogs/dialogs.rc,
	src/arch/unix/macosx/Resources/Credits.html,
	src/arch/unix/x11/xaw/about.c, src/arch/unix/x11/gnome/about.c,
	src/arch/msdos/menudefs.c, src/arch/beos/ui.cc: Added Fabrizio
	to the VICE core members.

	* src/info.c: Added Fabrizio to the VICE core members, got rid
	of a duplicate Christian Vogelgsang entry and added/updated
	external contributors entries.

	* src/translate.c: Updated the German and Swedish texts and
	added a log warning when returning a NULL.

	* src/arch/amigaos/intl.c: Updated the German and Swedish texts.

	* src/arch/win32/uikeyboard.c, src/arch/win32/uipetset.c,
	src/arch/win32/uiplus60k.c, src/arch/win32/rescbm2.rc,
	src/arch/win32/uicart.c, src/arch/win32/resgeoram.rc,
	src/arch/win32/intl.c, src/arch/win32/uigeoram.c,
	src/arch/win32/intl.h, src/arch/win32/uimediafile.c,
	src/arch/win32/uiramcart.c, src/arch/win32/ffmpeglib.c,
	src/arch/win32/uiconsole.c, src/arch/win32/uiattach.c,
	src/arch/win32/resplus4.rc, src/arch/win32/uirs232user.c,
	src/arch/win32/uicmdline.c, src/arch/win32/ui.c,
	src/arch/win32/ui.h, src/arch/win32/uinetwork.c,
	src/arch/win32/uicbm2set.c, src/arch/win32/uic64_256k.c,
	src/arch/win32/uic64cart.c, src/arch/win32/statusbar.c,
	src/arch/win32/uic128.c, src/arch/win32/uidrivevic20.c,
	src/arch/win32/uievent.c, src/arch/win32/resmouse.rc,
	src/arch/win32/uifliplist.c, src/arch/win32/uiplus256k.c,
	src/arch/win32/uisnapshot.c, src/arch/win32/uidriveplus4.c,
	src/arch/win32/resstrings.txt, src/arch/win32/uidrivec128.c,
	src/arch/win32/uisound.c, src/arch/win32/fullscrn.c,
	src/arch/win32/uiquicksnapshot.c, src/arch/win32/uiacia.c,
	src/arch/win32/uilib.c, src/arch/win32/uiide64.c,
	src/arch/win32/uisid.c, src/arch/win32/resvic20.rc,
	src/arch/win32/uidrivepetcbm2.c, src/arch/win32/uirom.c,
	src/arch/win32/uipetreu.c, src/arch/win32/resc128.rc,
	src/arch/win32/resc64.rc, src/arch/win32/signals.c,
	src/arch/win32/uivideo.c, src/arch/win32/res.rc,
	src/arch/win32/uiplus4cart.c, src/arch/win32/respet.rc,
	src/arch/win32/uidrivec64.c, src/arch/win32/uihelp.c,
	src/arch/win32/uiperipheral.c, src/arch/win32/uireu.c,
	src/arch/win32/uijoystick.c: Changed over to the new way (made
	by Tibor) of getting strings from the string resource blocks to
	avoid situations where in the old way a string was not able to
	be found even though it was present, and updated the German and
	Swedish texts.

	* src/arch/win32/Makefile.am,
	src/arch/win32/make-msvc-bindist.bat,
	src/arch/win32/watcom/make-watcom-bindist.bat: Added msvc and
	watcom binary distribution generation batch files.

Modified Paths:
--------------
    trunk/vice/AUTHORS
    trunk/vice/ChangeLog
    trunk/vice/Makefile.am
    trunk/vice/README
    trunk/vice/config.guess
    trunk/vice/config.sub
    trunk/vice/doc/html/index.html
    trunk/vice/doc/html/plain/NEWS
    trunk/vice/doc/vice.texi
    trunk/vice/po/ChangeLog
    trunk/vice/po/nl.po
    trunk/vice/src/ChangeLog
    trunk/vice/src/alarm.h
    trunk/vice/src/arch/amigaos/intl.c
    trunk/vice/src/arch/amigaos/mui/mui.c
    trunk/vice/src/arch/amigaos/uiapi.c
    trunk/vice/src/arch/beos/ui.cc
    trunk/vice/src/arch/msdos/menudefs.c
    trunk/vice/src/arch/os2/dialogs/dialogs.rc
    trunk/vice/src/arch/os2/ui.c
    trunk/vice/src/arch/unix/macosx/Resources/Credits.html
    trunk/vice/src/arch/unix/qnx6/make-bindist.sh
    trunk/vice/src/arch/unix/sco_sol/make-bindist.sh
    trunk/vice/src/arch/unix/skyos/make-bindist.sh
    trunk/vice/src/arch/unix/x11/gnome/about.c
    trunk/vice/src/arch/unix/x11/gnome/x11ui.c
    trunk/vice/src/arch/unix/x11/xaw/about.c
    trunk/vice/src/arch/unix/x11/xaw/x11ui.c
    trunk/vice/src/arch/win32/Makefile.am
    trunk/vice/src/arch/win32/ffmpeglib.c
    trunk/vice/src/arch/win32/fullscrn.c
    trunk/vice/src/arch/win32/intl.c
    trunk/vice/src/arch/win32/intl.h
    trunk/vice/src/arch/win32/res.rc
    trunk/vice/src/arch/win32/resc128.rc
    trunk/vice/src/arch/win32/resc64.rc
    trunk/vice/src/arch/win32/rescbm2.rc
    trunk/vice/src/arch/win32/resgeoram.rc
    trunk/vice/src/arch/win32/resmouse.rc
    trunk/vice/src/arch/win32/respet.rc
    trunk/vice/src/arch/win32/resplus4.rc
    trunk/vice/src/arch/win32/resstrings.txt
    trunk/vice/src/arch/win32/resvic20.rc
    trunk/vice/src/arch/win32/signals.c
    trunk/vice/src/arch/win32/statusbar.c
    trunk/vice/src/arch/win32/ui.c
    trunk/vice/src/arch/win32/ui.h
    trunk/vice/src/arch/win32/uiacia.c
    trunk/vice/src/arch/win32/uiattach.c
    trunk/vice/src/arch/win32/uic128.c
    trunk/vice/src/arch/win32/uic64_256k.c
    trunk/vice/src/arch/win32/uic64cart.c
    trunk/vice/src/arch/win32/uicart.c
    trunk/vice/src/arch/win32/uicbm2set.c
    trunk/vice/src/arch/win32/uicmdline.c
    trunk/vice/src/arch/win32/uiconsole.c
    trunk/vice/src/arch/win32/uidrivec128.c
    trunk/vice/src/arch/win32/uidrivec64.c
    trunk/vice/src/arch/win32/uidrivepetcbm2.c
    trunk/vice/src/arch/win32/uidriveplus4.c
    trunk/vice/src/arch/win32/uidrivevic20.c
    trunk/vice/src/arch/win32/uievent.c
    trunk/vice/src/arch/win32/uifliplist.c
    trunk/vice/src/arch/win32/uigeoram.c
    trunk/vice/src/arch/win32/uihelp.c
    trunk/vice/src/arch/win32/uiide64.c
    trunk/vice/src/arch/win32/uijoystick.c
    trunk/vice/src/arch/win32/uikeyboard.c
    trunk/vice/src/arch/win32/uilib.c
    trunk/vice/src/arch/win32/uimediafile.c
    trunk/vice/src/arch/win32/uinetwork.c
    trunk/vice/src/arch/win32/uiperipheral.c
    trunk/vice/src/arch/win32/uipetreu.c
    trunk/vice/src/arch/win32/uipetset.c
    trunk/vice/src/arch/win32/uiplus256k.c
    trunk/vice/src/arch/win32/uiplus4cart.c
    trunk/vice/src/arch/win32/uiplus60k.c
    trunk/vice/src/arch/win32/uiquicksnapshot.c
    trunk/vice/src/arch/win32/uiramcart.c
    trunk/vice/src/arch/win32/uireu.c
    trunk/vice/src/arch/win32/uirom.c
    trunk/vice/src/arch/win32/uirs232user.c
    trunk/vice/src/arch/win32/uisid.c
    trunk/vice/src/arch/win32/uisnapshot.c
    trunk/vice/src/arch/win32/uisound.c
    trunk/vice/src/arch/win32/uivideo.c
    trunk/vice/src/c128/c128mem.c
    trunk/vice/src/c1541.c
    trunk/vice/src/c64/tfe.c
    trunk/vice/src/cbmimage.c
    trunk/vice/src/fsdevice/fsdevice-open.c
    trunk/vice/src/info.c
    trunk/vice/src/main.c
    trunk/vice/src/monitor/mon_lex.c
    trunk/vice/src/monitor/mon_lex.l
    trunk/vice/src/pet/petmem.c
    trunk/vice/src/plus4/plus4mem.c
    trunk/vice/src/plus4/ted-mem.c
    trunk/vice/src/sid/sid-resources.c
    trunk/vice/src/sounddrv/soundwmm.c
    trunk/vice/src/translate.c
    trunk/vice/src/vdrive/vdrive-command.c
    trunk/vice/src/vdrive/vdrive-internal.c
    trunk/vice/src/vicii/vicii-mem.c
    trunk/vice/src/video/video-resources-pal.c
    trunk/vice/src/video/video-resources.c
    trunk/vice/src/video/video-resources.h

Modified: trunk/vice/AUTHORS
===================================================================
--- trunk/vice/AUTHORS	2008-06-22 19:51:00 UTC (rev 18894)
+++ trunk/vice/AUTHORS	2008-06-23 17:14:59 UTC (rev 18895)
@@ -14,3 +14,4 @@
 Teemu Rantanen <tv...@cs...>
 Marco van den Heuvel <bla...@ya...>
 Christian Vogelgsang <ch...@vo...>
+Fabrizio Gennari <fab...@ti...>

Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog	2008-06-22 19:51:00 UTC (rev 18894)
+++ trunk/vice/ChangeLog	2008-06-23 17:14:59 UTC (rev 18895)
@@ -1,3 +1,28 @@
+2008-06-22  Marco van den Heuvel  <bla...@ya...>
+
+	* Makefile.am: Improved some of the make-bindist.sh scripts.
+
+2008-06-19  Marco van den Heuvel  <bla...@ya...>
+
+	* vice-mint.spec, Makefile.am: Added Atari Mint specific rpm
+
+2008-06-19  Marco van den Heuvel  <bla...@ya...>
+
+	* vice-mint.spec, Makefile.am: Added Atari Mint specific rpm
+	spec file.
+
+	* AUTHORS, README: Added Fabrizio to the VICE core members.
+
+	* config.guess, config.sub: Added preliminary support for
+	avr32-linux.
+
+	* doc/vice.texi: Added Fabrizio to the VICE core members, got
+	rid of a duplicate Christian Vogelgsang entry and added/updated
+	external contributors entries.
+
+	* doc/html/plain/NEWS, doc/html/index.html: Updated for the
+	VICE 2.0 release.
+
 2008-06-22  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.19

Modified: trunk/vice/Makefile.am
===================================================================
--- trunk/vice/Makefile.am	2008-06-22 19:51:00 UTC (rev 18894)
+++ trunk/vice/Makefile.am	2008-06-23 17:14:59 UTC (rev 18895)
@@ -2,7 +2,7 @@
 
 SUBDIRS = $(POSUB) src build data man doc
 
-EXTRA_DIST = AUTHORS FEEDBACK COPYING INSTALL NEWS vice.spec
+EXTRA_DIST = AUTHORS FEEDBACK COPYING INSTALL NEWS vice.spec vice-mint.spec
 
 .PHONY: x64 x128 xvic xpet xplus4 xcbm2
 x64:
@@ -68,18 +68,18 @@
 
 if UNIX_SKYOS_COMPILE
 bindist:
-	$(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir) $(MAKE)
 
 bindistzip:
-	$(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir) $(MAKE)
 endif
 
 if UNIX_QNX6_COMPILE
 bindist:
-	$(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip $(top_srcdir) $(MAKE)
 
 bindistzip:
-	$(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip $(top_srcdir) $(MAKE)
 endif
 
 if UNIX_QNX4_COMPILE
@@ -100,34 +100,34 @@
 
 if UNIX_SOLARIS_COMPILE
 bindist:
-	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sol $(infodir) $(mandir) $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sol $(infodir) $(mandir) $(top_srcdir) $(MAKE)
 
 bindistzip:
-	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sol $(infodir) $(mandir) $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sol $(infodir) $(mandir) $(top_srcdir) $(MAKE)
 endif
 
 if UNIX_OPENSERVER5_COMPILE
 bindist:
-	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco5 $(infodir) $(mandir) $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco5 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
 
 bindistzip:
-	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco5 $(infodir) $(mandir) $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco5 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
 endif
 
 if UNIX_OPENSERVER6_COMPILE
 bindist:
-	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco6 $(infodir) $(mandir) $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco6 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
 
 bindistzip:
-	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco6 $(infodir) $(mandir) $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco6 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
 endif
 
 if UNIX_UNIXWARE_COMPILE
 bindist:
-	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco7 $(infodir) $(mandir) $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) nozip sco7 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
 
 bindistzip:
-	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco7 $(infodir) $(mandir) $(top_srcdir)
+	$(SHELL) @ARCH_SRC_DIR@/sco_sol/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) zip sco7 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
 endif
 
 if WIN32_COMPILE

Modified: trunk/vice/README
===================================================================
--- trunk/vice/README	2008-06-22 19:51:00 UTC (rev 18894)
+++ trunk/vice/README	2008-06-23 17:14:59 UTC (rev 18895)
@@ -19,10 +19,10 @@
  ----------------------------------------------------------------------------
 
 
- This is version 1.20 of VICE, the multi-platform C64, C128, VIC20,
+ This is version 2.0 of VICE, the multi-platform C64, C128, VIC20,
  PET, PLUS4 and CBM-II emulator.  This version can be compiled for
- MSDOS, Win32, RiscOS, OS/2, BeOS, QNX 6.x, AmigaOS, GP2X and for most
- Unix systems provided with the X Window System version 11, R5 or
+ MSDOS, Win32, RiscOS, OS/2, BeOS, QNX 4.x, QNX 6.x, AmigaOS, GP2X
+ and for most Unix systems provided with the X Window System version 11, R5 or
  later.
 
  The following programs are included:
@@ -122,6 +122,7 @@
     Copyright C 2000-2008 Spiro Trikaliotis
     Copyright C 2005-2008 Marco van den Heuvel
     Copyright C 2006-2008 Christian Vogelgsang
+    Copyright C 2007-2008 Fabrizio Gennari
     Copyright C 1999-2007 Andreas Dehmel
     Copyright C 2003-2005 David Hansel
     Copyright C 2000-2004 Markus Brenner

Modified: trunk/vice/config.guess
===================================================================
--- trunk/vice/config.guess	2008-06-22 19:51:00 UTC (rev 18894)
+++ trunk/vice/config.guess	2008-06-23 17:14:59 UTC (rev 18895)
@@ -827,6 +827,9 @@
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit ;;
+    avr32*:Linux:*:*)
+	echo $(UNAME_MACHINE)-unknown-linux
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux
 	exit ;;

Modified: trunk/vice/config.sub
===================================================================
--- trunk/vice/config.sub	2008-06-22 19:51:00 UTC (rev 18894)
+++ trunk/vice/config.sub	2008-06-23 17:14:59 UTC (rev 18895)
@@ -231,7 +231,7 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
@@ -305,7 +305,7 @@
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \

Modified: trunk/vice/doc/html/index.html
===================================================================
--- trunk/vice/doc/html/index.html	2008-06-22 19:51:00 UTC (rev 18894)
+++ trunk/vice/doc/html/index.html	2008-06-23 17:14:59 UTC (rev 18895)
@@ -300,6 +300,11 @@
 <a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-minix-2.0.tar.gz">vice-minix-2.0.tar.gz</a>
 </li>
 
+<li>
+Binary for <b>Atari Mint</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-1.m68kmint.rpm">vice-2.0-1.m68kmint.rpm</a>
+</li>
+
 </ul>
 
 <li>

Modified: trunk/vice/doc/html/plain/NEWS
===================================================================
--- trunk/vice/doc/html/plain/NEWS	2008-06-22 19:51:00 UTC (rev 18894)
+++ trunk/vice/doc/html/plain/NEWS	2008-06-23 17:14:59 UTC (rev 18895)
@@ -5,9 +5,60 @@
 official release of VICE.  See `src/ChangeLog' for a more detailed
 list of all the changes in the code.
 
-* Changes in VICE 1.23
+* Changes in VICE 2.0
 ======================
 
+** General
+----------
+
+- New Openserver 5.x, Openserver 6.x and Unixware ports.
+
+- New AROS64 port.
+
+- New QNX 4.x port.
+
+- New HPUX (HPPA and IA64) ports.
+
+- New SkyOS port.
+
+** C64/C128 changes
+-------------------
+
+- Improved $01 behaviour with regards to unused bit fall-off.
+
+- Mew experimental NEOS and Amiga mouse support.
+
+- Added a working RTC to the emulation of the IDE64 cartridge.
+
+- New more precise PAL emulation, works only with double size
+  and double scan.
+
+- Added support for the Action Replay 4 and StarDos cartridges.
+
+** VIC20 changes
+----------------
+
+- Added unconnected c-bus floating byte support.
+
+- New more precise PAL emulation, works only with double size
+  and double scan.
+
+** PET changes
+--------------
+
+- Added support for toggling CB2 sound output line.
+
+** PLUS4 changes
+----------------
+
+- New more precise PAL emulation, works only with double size
+  and double scan.
+
+** Drive changes
+----------------
+
+- Fixed block allocation and interleave.
+
 ** Unix changes
 ---------------
 
@@ -17,6 +68,49 @@
 
 - XRandR/Fullscreen can now toggle the Statusbar/Menu
 
+- Fixed unix mouse for single sized display.
+
+- Fixed mouse grab and xaw menu popup.
+
+** MS-Windows changes
+---------------------
+
+- Fixed the reverse logic of the -confirmexit/+confirmexit and
+  -singlecpu/+singlecpu command-line options.
+
+** BeOS changes
+---------------
+
+- Fixed to also run on Haiku.
+
+- Lots of fixes to the dailogs.
+
+- Fixed the joystick system.
+
+- Added warning dialog when the monitor is accessed without
+  having an open console window.
+
+** AmigaOS changes
+------------------
+
+- Fixed the reverse logic of the -confirmexit/+confirmexit
+  command-line options.
+
+** Miscellaneous changes
+------------------------
+
+- Added support for more 3rd party basic extenders to petcat.
+
+- Extended BMP saving to support 24bit.
+
+- Fixed the joystick code of all emulators to handle state changes
+  on both joysticks at the same time.
+
+- New monitor commands and features.
+
+- New memmap feature which allows tracking of memory accesses,
+  activated by the configure option --enable-memmap.
+
 * Changes in VICE 1.22
 ======================
 

Modified: trunk/vice/doc/vice.texi
===================================================================
--- trunk/vice/doc/vice.texi	2008-06-22 19:51:00 UTC (rev 18894)
+++ trunk/vice/doc/vice.texi	2008-06-23 17:14:59 UTC (rev 18895)
@@ -66,6 +66,7 @@
 Copyright @copyright{} 2000-2008 Spiro Trikaliotis
 Copyright @copyright{} 2005-2008 Marco van den Heuvel
 Copyright @copyright{} 2006-2008 Christian Vogelgsang
+Copyright @copyright{} 2007-2008 Fabrizio Gennari
 Copyright @copyright{} 1999-2007 Andreas Dehmel
 Copyright @copyright{} 2003-2005 David Hansel
 Copyright @copyright{} 2000-2004 Markus Brenner
@@ -7424,16 +7425,16 @@
 
 @item
 @b{Marco van den Heuvel} Translated the UI to Dutch. Made the
-internationalization support for the Win32 and Amiga ports. Wrote
-the GEORAM and RamCart cartridge code. Wrote the c64 +60K, +256K
-and 256K memory expansions code. Wrote the pet REU code. Wrote
-the plus4 memory expansions code. Made the ethernet support for
-the Msdos port. Maintains the RiscOS, QNX 6.x, Solaris, GP2X,
-Minix 3.x, Amiga, ppc-BeOS and newly resurrected OS/2 binary
-ports. Added new .crt support. Added new screenshot formats.
-Added new sound recording support. Added SIDcart support for
-pet, plus4 and vic20. Added digimax support. Improved the MMC64
-emulation. Added 2 MHz mode to x128. And lots of other fixes and
+Internationalization support for the Win32 and Amiga ports. Wrote
+the GEORAM and RamCart cartridge code. Wrote the c64 +60K, +256K and
+256K memory expansions code. Wrote the pet REU code. Wrote the plus4
+memory expansions code. Made the ethernet support for the Msdos
+port. Maintains the RiscOS, QNX 4.x, QNX 6.x, SkyOS, Solaris,
+Openserver, Unixware, HPUX, GP2X, Minix 3.x, Amiga, ppc-BeOS and
+newly resurrected OS/2 binary ports. Added new .crt support. Added
+new screenshot formats. Added new sound recording support. Added
+SIDcart support for pet, plus4 and vic20. Improved the MMC64
+emulation. Added 2 MHz mode for x128. And lots of other fixes and
 improvements.
 
 @item
@@ -7442,6 +7443,10 @@
 all external Mac libraries and the bindist bundle tool. Improved
 the TFE chip emulation. Added some Gtk+ fixes.
 
+@item
+@b{Fabrizio Gennari} added some improvements to the MSDOS- and GTK
+port.
+
 @end itemize
 
 Former team members:
@@ -7681,10 +7686,6 @@
 @b{ck!} provided a win32 cbm character font.
 
 @item
-@b{Fabrizio Gennari} added some improvements to the MSDOS- and GTK
-port.
-
-@item
 @b{Dirk Jagdmann} wrote the Catweasel sound driver.
 
 @item
@@ -7726,10 +7727,6 @@
 to the GCR code.
 
 @item
-@b{Christian Vogelgsang} resurrected the Mac
-OSX X11 port and added support for an Intel build.
-
-@item
 @b{Peter Gordon} provided support for native AmigaOS4 compiling.
 
 @item
@@ -7746,6 +7743,41 @@
 @b{Gunnar Ruthenberg} provided some VIC-II enhancements and improved
 the win32 port.
 
+@item
+@b{Hannu Nuotio} Added experimental NEOS and Amiga mouse support.
+Fixed mouse support for single size in unix. Fixed mouse grab and
+menu popup for xaw. Added new monitor commands and features. Added
+the memmap feature.
+
+@item
+@b{M. Kiesel} Added new monitor commands and features.
+
+@item
+@b{Daniel Kahlin} Added new monitor commands and features.
+
+@item
+@b{Groepaz/Hitmen} Added new more precise PAL emulation. Added support
+for the Action Replay 4 and StarDos cartridges.
+
+@item
+@b{Ingo Korb} Corrected block allocation and interleave for
+c1541/vdrive.
+
+@item
+@b{Georg Feil} Added support for toggling CB2 sound output line in
+the PET emulator.
+
+@item
+@b{Greg King} Added a working RTC to the emulation of the IDE64
+cartridge.
+
+@item
+@b{Thomas Giesel} Added new monitor commands and features.
+
+@item
+@b{Marcus Sutton} Made some console, dialog and joystick fixes for
+the BeOS port.
+
 @end itemize
 
 @itemize @bullet

Modified: trunk/vice/po/ChangeLog
===================================================================
--- trunk/vice/po/ChangeLog	2008-06-22 19:51:00 UTC (rev 18894)
+++ trunk/vice/po/ChangeLog	2008-06-23 17:14:59 UTC (rev 18895)
@@ -1,3 +1,7 @@
+2008-06-19  Marco van den Heuvel  <bla...@ya...>
+
+	* nl.po: Updated.
+
 2008-06-08  Marco van den Heuvel  <bla...@ya...>
 
 	* nl.po, POTFILES.in: Updated.

Modified: trunk/vice/po/nl.po
===================================================================
--- trunk/vice/po/nl.po	2008-06-22 19:51:00 UTC (rev 18894)
+++ trunk/vice/po/nl.po	2008-06-23 17:14:59 UTC (rev 18895)
@@ -1,14 +1,14 @@
 # Dutch Translation File for VICE
-# Copyright (C) 2005-2006
+# Copyright (C) 2005-2008
 # This file is distributed under the same license as the PACKAGE package.
-# Marco van den Heuvel <bla...@ya...>, 2005-2006.
+# Marco van den Heuvel <bla...@ya...>, 2005-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VICE 1.22\n"
+"Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-22 16:06+0200\n"
-"PO-Revision-Date: 2007-07-26 11:57+0200\n"
+"POT-Creation-Date: 2008-06-03 19:42+0200\n"
+"PO-Revision-Date: 2008-06-11 11:57+0200\n"
 "Last-Translator: Marco van den Heuvel <bla...@ya...>\n"
 "Language-Team: nl <nl...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -16,31 +16,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/vsync.c:147 src/sid/sid-cmdline-options.c:186
-#: src/sid/sid-cmdline-options.c:189 src/translate.c.po.c:3507
+#: src/sid/sid-cmdline-options.c:189 src/translate.c.po.c:3457
 msgid "<percent>"
 msgstr "<procent>"
 
-#: src/vsync.c:147 src/translate.c.po.c:4665
+#: src/vsync.c:147 src/translate.c.po.c:4615
 msgid "Limit emulation speed to specified value"
 msgstr "Beperk emulatiesnelheid tot de opgegeven waarde"
 
 #: src/vsync.c:149 src/sound.c:279 src/sound.c:281 src/debug.c:205
 #: src/c64/cart/ide64.c:283 src/c64/cart/ide64.c:285 src/c64/cart/ide64.c:287
 #: src/datasette.c:181 src/datasette.c:184 src/gfxoutputdrv/ffmpegdrv.c:201
-#: src/gfxoutputdrv/ffmpegdrv.c:204 src/monitor/monitor.c:999 src/mouse.c:362
-#: src/mouse.c:364 src/ram.c:101 src/translate.c.po.c:1612
+#: src/gfxoutputdrv/ffmpegdrv.c:204 src/mouse.c:362 src/mouse.c:364
+#: src/ram.c:101 src/translate.c.po.c:1592
 msgid "<value>"
 msgstr "<waarde>"
 
-#: src/vsync.c:149 src/translate.c.po.c:4675
+#: src/vsync.c:149 src/translate.c.po.c:4625
 msgid "Update every <value> frames (`0' for automatic)"
 msgstr "Elke <waarde> beeld vernieuwen (`0' voor automatisch)"
 
-#: src/vsync.c:151 src/translate.c.po.c:4685
+#: src/vsync.c:151 src/translate.c.po.c:4635
 msgid "Enable warp mode"
 msgstr "Activeer warpmodus"
 
-#: src/vsync.c:153 src/translate.c.po.c:4695
+#: src/vsync.c:153 src/translate.c.po.c:4645
 msgid "Disable warp mode"
 msgstr "Warpmodus uitschakelen"
 
@@ -56,19 +56,19 @@
 msgid "Cannot load snapshot file."
 msgstr "Kan momentopnamebestand niet laden."
 
-#: src/sound.c:275 src/translate.c.po.c:4515
+#: src/sound.c:275 src/translate.c.po.c:4465
 msgid "Enable sound playback"
 msgstr "Activeer geluidsweergave"
 
-#: src/sound.c:277 src/translate.c.po.c:4525
+#: src/sound.c:277 src/translate.c.po.c:4475
 msgid "Disable sound playback"
 msgstr "Geluid uitschakelen"
 
-#: src/sound.c:279 src/translate.c.po.c:4535
+#: src/sound.c:279 src/translate.c.po.c:4485
 msgid "Set sound sample rate to <value> Hz"
 msgstr "Zet de geluid sample rate naar <waarde> Hz"
 
-#: src/sound.c:281 src/translate.c.po.c:4545
+#: src/sound.c:281 src/translate.c.po.c:4495
 msgid "Set sound buffer size to <value> msec"
 msgstr "Zet de geluidsbuffergrootte naar <waarde> msec"
 
@@ -85,17 +85,16 @@
 #: src/c64/c64-cmdline-options.c:91 src/c64/c64-cmdline-options.c:93
 #: src/c64/c64-cmdline-options.c:95 src/c64/c64-cmdline-options.c:112
 #: src/c64/c64-cmdline-options.c:114 src/c64/c64-cmdline-options.c:116
-#: src/c64/cart/c64cart.c:246 src/c64/cart/c64cart.c:249
-#: src/c64/cart/c64cart.c:252 src/c64/cart/c64cart.c:255
-#: src/c64/cart/c64cart.c:258 src/c64/cart/c64cart.c:261
-#: src/c64/cart/c64cart.c:264 src/c64/cart/c64cart.c:267
-#: src/c64/cart/c64cart.c:270 src/c64/cart/c64cart.c:273
-#: src/c64/cart/c64cart.c:276 src/c64/cart/c64cart.c:279
-#: src/c64/cart/c64cart.c:282 src/c64/cart/c64cart.c:285
-#: src/c64/cart/c64cart.c:288 src/c64/cart/c64cart.c:291
+#: src/c64/cart/c64cart.c:236 src/c64/cart/c64cart.c:239
+#: src/c64/cart/c64cart.c:242 src/c64/cart/c64cart.c:245
+#: src/c64/cart/c64cart.c:248 src/c64/cart/c64cart.c:251
+#: src/c64/cart/c64cart.c:254 src/c64/cart/c64cart.c:257
+#: src/c64/cart/c64cart.c:260 src/c64/cart/c64cart.c:263
+#: src/c64/cart/c64cart.c:266 src/c64/cart/c64cart.c:269
+#: src/c64/cart/c64cart.c:272 src/c64/cart/c64cart.c:275
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
-#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:446
+#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
 #: src/c64/tfe.c:1934 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
@@ -122,7 +121,7 @@
 #: src/fsdevice/fsdevice-cmdline-options.c:82 src/initcmdline.c:208
 #: src/initcmdline.c:210 src/initcmdline.c:212 src/initcmdline.c:214
 #: src/initcmdline.c:216 src/initcmdline.c:218 src/initcmdline.c:220
-#: src/log.c:110 src/monitor/monitor.c:997 src/pet/pet-cmdline-options.c:116
+#: src/log.c:110 src/pet/pet-cmdline-options.c:116
 #: src/pet/pet-cmdline-options.c:118 src/pet/pet-cmdline-options.c:120
 #: src/pet/pet-cmdline-options.c:122 src/pet/pet-cmdline-options.c:124
 #: src/pet/pet-cmdline-options.c:126 src/pet/pet-cmdline-options.c:128
@@ -150,32 +149,32 @@
 msgid "<name>"
 msgstr "<naam>"
 
-#: src/sound.c:283 src/translate.c.po.c:4555
+#: src/sound.c:283 src/translate.c.po.c:4505
 msgid "Specify sound driver"
 msgstr "Geef geluidsstuurprogramma"
 
-#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4565
+#: src/sound.c:285 src/sound.c:289 src/translate.c.po.c:4515
 msgid "<args>"
 msgstr "<parameters>"
 
-#: src/sound.c:285 src/translate.c.po.c:4575
+#: src/sound.c:285 src/translate.c.po.c:4525
 msgid "Specify initialization parameters for sound driver"
 msgstr "Geef de initialisatieparameters voor het geluidsstuurprogramma"
 
-#: src/sound.c:287 src/translate.c.po.c:4585
+#: src/sound.c:287 src/translate.c.po.c:4535
 msgid "Specify recording sound driver"
 msgstr "Geef geluidsstuurprogramma voor opname"
 
-#: src/sound.c:289 src/translate.c.po.c:4595
+#: src/sound.c:289 src/translate.c.po.c:4545
 msgid "Specify initialization parameters for recording sound driver"
 msgstr ""
 "Geef initialisatieparameters voor het geluidsstuurprogramma voor opname"
 
-#: src/sound.c:291 src/translate.c.po.c:4605
+#: src/sound.c:291 src/translate.c.po.c:4555
 msgid "<sync>"
 msgstr "<sync>"
 
-#: src/sound.c:291 src/translate.c.po.c:4615
+#: src/sound.c:291 src/translate.c.po.c:4565
 msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
 msgstr "Zet geluidssnelheid aanpassing (0: flexibel, 1: aanpassend, 2: exact)"
 
@@ -308,7 +307,7 @@
 msgid "Error reading start snapshot file."
 msgstr "Fout bij het lezen van het start momentopnamebestand."
 
-#: src/event.c:1227 src/translate.c.po.c:4224
+#: src/event.c:1227 src/translate.c.po.c:4174
 msgid "Playback recorded events"
 msgstr "Afspelen opgenomen gebeurtenissen"
 
@@ -318,16 +317,16 @@
 msgid "Resource %s blocked by %s."
 msgstr "Bron %s geblokeerd door %s."
 
-#: src/c64/c64io.c:187 src/translate.c.po.c:590
+#: src/c64/c64io.c:185 src/translate.c.po.c:590
 #, c-format
 msgid "I/O read collision at %X from "
 msgstr "I/O lees botsing op %X van "
 
-#: src/c64/c64io.c:205 src/translate.c.po.c:600
+#: src/c64/c64io.c:203 src/translate.c.po.c:600
 msgid " and "
 msgstr " en "
 
-#: src/c64/c64io.c:206 src/translate.c.po.c:610
+#: src/c64/c64io.c:204 src/translate.c.po.c:610
 msgid ""
 ".\n"
 "All the named devices will be detached."
@@ -335,47 +334,47 @@
 ".\n"
 "Alle genoemde apparaten zullen worden ontkoppelt."
 
-#: src/debug.c:171 src/translate.c.po.c:4109
+#: src/debug.c:171 src/translate.c.po.c:4059
 msgid "Trace the main CPU"
 msgstr "Traceer de hoofd-CPU"
 
-#: src/debug.c:174 src/translate.c.po.c:4119
+#: src/debug.c:174 src/translate.c.po.c:4069
 msgid "Do not trace the main CPU"
 msgstr "Traceer de hoofd-CPU niet"
 
-#: src/debug.c:177 src/translate.c.po.c:4129
+#: src/debug.c:177 src/translate.c.po.c:4079
 msgid "Trace the drive0 CPU"
 msgstr "Traceer de CPU van drive 0/8"
 
-#: src/debug.c:180 src/translate.c.po.c:4139
+#: src/debug.c:180 src/translate.c.po.c:4089
 msgid "Do not trace the drive0 CPU"
 msgstr "Traceer de CPU van drive 0/8 niet"
 
-#: src/debug.c:183 src/translate.c.po.c:4149
+#: src/debug.c:183 src/translate.c.po.c:4099
 msgid "Trace the drive1 CPU"
 msgstr "Traceer de CPU van drive 1/9"
 
-#: src/debug.c:186 src/translate.c.po.c:4159
+#: src/debug.c:186 src/translate.c.po.c:4109
 msgid "Do not trace the drive1 CPU"
 msgstr "Traceer de CPU van drive 1/9 niet"
 
-#: src/debug.c:190 src/translate.c.po.c:4170
+#: src/debug.c:190 src/translate.c.po.c:4120
 msgid "Trace the drive2 CPU"
 msgstr "Traceer de CPU van drive 2/10"
 
-#: src/debug.c:193 src/translate.c.po.c:4180
+#: src/debug.c:193 src/translate.c.po.c:4130
 msgid "Do not trace the drive2 CPU"
 msgstr "Traceer de CPU van drive 2/10 niet"
 
-#: src/debug.c:198 src/translate.c.po.c:4192
+#: src/debug.c:198 src/translate.c.po.c:4142
 msgid "Trace the drive3 CPU"
 msgstr "Traceer de CPU van drive 3/11"
 
-#: src/debug.c:201 src/translate.c.po.c:4202
+#: src/debug.c:201 src/translate.c.po.c:4152
 msgid "Do not trace the drive3 CPU"
 msgstr "Traceer de CPU van drive 3/11 niet"
 
-#: src/debug.c:205 src/translate.c.po.c:4213
+#: src/debug.c:205 src/translate.c.po.c:4163
 msgid "Trace mode (0=normal 1=small 2=history)"
 msgstr "Traceermodus (0=normaal 1=klein 2=geschiedenis"
 
@@ -384,79 +383,79 @@
 msgid "Playback error: %s different from line %d of file debug%06d"
 msgstr "Afspeelfout: %s is anders dan regel %d van bestand debug%06d"
 
-#: src/network.c:269 src/translate.c.po.c:548
+#: src/network.c:270 src/translate.c.po.c:548
 msgid "Cannot switch IPV4/IPV6 while netplay is active."
 msgstr "Kan niet schakelen tussen IPV4/IPV6 omdat netplay actief is."
 
-#: src/network.c:494 src/translate.c.po.c:397
+#: src/network.c:495 src/translate.c.po.c:397
 msgid "Testing best frame delay..."
 msgstr "Beste framevertraging aan het testen..."
 
-#: src/network.c:544 src/translate.c.po.c:407
+#: src/network.c:545 src/translate.c.po.c:407
 #, c-format
 msgid "Using %d frames delay."
 msgstr "%d frames vertraging in gebruik."
 
-#: src/network.c:569 src/translate.c.po.c:417
+#: src/network.c:570 src/translate.c.po.c:417
 msgid "Cannot load snapshot file for transfer"
 msgstr "Kan het momentopnamebestand voor versturen niet laden"
 
-#: src/network.c:582 src/translate.c.po.c:427
+#: src/network.c:583 src/translate.c.po.c:427
 msgid "Sending snapshot to client..."
 msgstr "Momentopname wordt naar de andere computer verstuurd..."
 
-#: src/network.c:592 src/translate.c.po.c:437
+#: src/network.c:593 src/translate.c.po.c:437
 msgid "Cannot send snapshot to client"
 msgstr "Kan de momentopname niet naar de andere computer versturen"
 
-#: src/network.c:622 src/translate.c.po.c:447
+#: src/network.c:623 src/translate.c.po.c:447
 #, c-format
 msgid "Cannot create snapshot file %s"
 msgstr "Kan het momentopnamebestand %s niet maken"
 
-#: src/network.c:662 src/translate.c.po.c:457
+#: src/network.c:663 src/translate.c.po.c:457
 #, c-format
 msgid "Cannot open snapshot file %s"
 msgstr "Kan het momentopnamebestand %s niet openen"
 
-#: src/network.c:812 src/translate.c.po.c:467
+#: src/network.c:813 src/translate.c.po.c:467
 msgid "Server is waiting for a client..."
 msgstr "De server wacht op de andere computer..."
 
-#: src/network.c:849 src/translate.c.po.c:477
+#: src/network.c:850 src/translate.c.po.c:477
 msgid "Cannot create snapshot file. Select different history directory!"
 msgstr ""
 "Kan het momentopnamebestand niet maken. Selecteer een andere "
 "geschiedenisdirectory!"
 
-#: src/network.c:868 src/translate.c.po.c:487
+#: src/network.c:869 src/translate.c.po.c:487
 #, c-format
 msgid "Cannot resolve %s"
 msgstr "Onbekende host %s"
 
-#: src/network.c:913 src/translate.c.po.c:497
+#: src/network.c:914 src/translate.c.po.c:497
 #, c-format
 msgid "Cannot connect to %s (no server running on port %d)."
 msgstr ""
 "Kan geen verbinding maken met %s (er is geen server aanwezig op poort %d)."
 
-#: src/network.c:927 src/translate.c.po.c:507
+#: src/network.c:928 src/translate.c.po.c:507
 msgid "Receiving snapshot from server..."
 msgstr "Momentopname van de server wordt ontvangen..."
 
-#: src/network.c:1014 src/network.c:1044 src/translate.c.po.c:527
+#: src/network.c:1015 src/network.c:1045 src/translate.c.po.c:527
 msgid "Remote host disconnected."
 msgstr "Andere computer heeft de verbinding verbroken."
 
-#: src/network.c:1056 src/translate.c.po.c:537
+#: src/network.c:1057 src/translate.c.po.c:537
 msgid "Remote host suspending..."
 msgstr "Andere computer halt de netplay..."
 
-#: src/network.c:1100 src/translate.c.po.c:517
+#: src/network.c:1101 src/translate.c.po.c:517
 msgid "Network out of sync - disconnecting."
 msgstr "Netwerk niet synchroon - verbinding wordt verbroken."
 
-#: src/aciacore.c:210 src/translate.c.po.c:3938
+#: src/aciacore.c:210 src/translate.c.po.c:3888
 msgid "Specify RS232 device this ACIA should work on"
 msgstr "Geef het RS232-apparaat waarmee deze ACIA moet werken"
 
@@ -465,59 +464,59 @@
 #: src/drive/iec/c64exp/c64exp-cmdline-options.c:65
 #: src/drive/iec/plus4exp/plus4exp-cmdline-options.c:49
 #: src/printerdrv/interface-serial.c:121 src/printerdrv/interface-serial.c:124
-#: src/translate.c.po.c:2004
+#: src/translate.c.po.c:1984
 msgid "<type>"
 msgstr "<soort>"
 
-#: src/attach.c:164 src/translate.c.po.c:3948
+#: src/attach.c:164 src/translate.c.po.c:3898
 msgid "Set device type for device #8 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 msgstr ""
 "Zet het apparaatsoort voor apparaat #8 (0: GEEN, 1: FS, 2: ECHT, 3: BINAIR"
 
-#: src/attach.c:167 src/translate.c.po.c:3958
+#: src/attach.c:167 src/translate.c.po.c:3908
 msgid "Set device type for device #9 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 msgstr ""
 "Zet het apparaatsoort voor apparaat #9 (0: GEEN, 1: FS, 2: ECHT, 3: BINAIR"
 
-#: src/attach.c:170 src/translate.c.po.c:3968
+#: src/attach.c:170 src/translate.c.po.c:3918
 msgid "Set device type for device #10 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 msgstr ""
 "Zet het apparaatsoort voor apparaat #10 (0: GEEN, 1: FS, 2: ECHT, 3: BINAIR"
 
-#: src/attach.c:173 src/translate.c.po.c:3978
+#: src/attach.c:173 src/translate.c.po.c:3928
 msgid "Set device type for device #11 (0: NONE, 1: FS, 2: REAL, 3: RAW)"
 msgstr ""
 "Zet het apparaatsoort voor apparaat #11 (0: GEEN, 1: FS, 2: ECHT, 3: BINAIR"
 
-#: src/attach.c:176 src/translate.c.po.c:3988
+#: src/attach.c:176 src/translate.c.po.c:3938
 msgid "Attach disk image for drive #8 read only"
 msgstr "Koppel schijfbestand voor drive #8 als alleen-lezen"
 
-#: src/attach.c:179 src/translate.c.po.c:3998
+#: src/attach.c:179 src/translate.c.po.c:3948
 msgid "Attach disk image for drive #8 read write (if possible)"
 msgstr "Koppel schijfbestand voor drive #8 als schrijfbaar (indien mogelijk)"
 
-#: src/attach.c:182 src/translate.c.po.c:4008
+#: src/attach.c:182 src/translate.c.po.c:3958
 msgid "Attach disk image for drive #9 read only"
 msgstr "Koppel schijfbestand voor drive #9 als alleen-lezen"
 
-#: src/attach.c:185 src/translate.c.po.c:4018
+#: src/attach.c:185 src/translate.c.po.c:3968
 msgid "Attach disk image for drive #9 read write (if possible)"
 msgstr "Koppel schijfbestand voor drive #9 als schrijfbaar (indien mogelijk)"
 
-#: src/attach.c:188 src/translate.c.po.c:4028
+#: src/attach.c:188 src/translate.c.po.c:3978
 msgid "Attach disk image for drive #10 read only"
 msgstr "Koppel schijfbestand voor drive #10 als alleen-lezen"
 
-#: src/attach.c:191 src/translate.c.po.c:4038
+#: src/attach.c:191 src/translate.c.po.c:3988
 msgid "Attach disk image for drive #10 read write (if possible)"
 msgstr "Koppel schijfbestand voor drive #10 als schrijfbaar (indien mogelijk)"
 
-#: src/attach.c:194 src/translate.c.po.c:4048
+#: src/attach.c:194 src/translate.c.po.c:3998
 msgid "Attach disk image for drive #11 read only"
 msgstr "Koppel schijfbestand voor drive #11 als alleen-lezen"
 
-#: src/attach.c:197 src/translate.c.po.c:4058
+#: src/attach.c:197 src/translate.c.po.c:4008
 msgid "Attach disk image for drive #11 read write (if possible)"
 msgstr "Koppel schijfbestand voor drive #11 als schrijfbaar (indien mogelijk)"
 
@@ -632,7 +631,7 @@
 #: src/c64/psid.c:164 src/cbm2/cbm2-cmdline-options.c:176
 #: src/pet/pet-cmdline-options.c:161 src/plus4/plus4-cmdline-options.c:102
 #: src/vdc/vdc-cmdline-options.c:68 src/vic20/vic20-cmdline-options.c:226
-#: src/arch/win32/res.rc.po.c:5210 src/translate.c.po.c:896
+#: src/arch/win32/res.rc.po.c:5069 src/translate.c.po.c:896
 msgid "<number>"
 msgstr "<nummer>"
 
@@ -728,127 +727,117 @@
 msgid "Specify name of symbolic German keymap file"
 msgstr "Geef de naam van het symbolische Duitse keymapbestand"
 
-#: src/c64/cart/c64cart.c:240 src/translate.c.po.c:1422
+#: src/c64/cart/c64cart.c:230 src/translate.c.po.c:1422
 msgid "Reset machine if a cartridge is attached or detached"
 msgstr "Reset machine als een cartridge wordt aangekoppeld of ontkoppeld"
 
-#: src/c64/cart/c64cart.c:243 src/translate.c.po.c:1432
+#: src/c64/cart/c64cart.c:233 src/translate.c.po.c:1432
 msgid "Do not reset machine if a cartridge is attached or detached"
 msgstr "Reset machine niet als een cartridge wordt aangekoppeld of ontkoppeld"
 
-#: src/c64/cart/c64cart.c:246 src/arch/win32/res.rc.po.c:5137
-#: src/translate.c.po.c:1442 src/arch/amigaos/intl.c.po.c:2360
+#: src/c64/cart/c64cart.c:236 src/arch/win32/res.rc.po.c:4998
+#: src/translate.c.po.c:1442 src/arch/amigaos/intl.c.po.c:2333
 msgid "Attach CRT cartridge image"
 msgstr "Koppel CRT-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:249 src/translate.c.po.c:1452
+#: src/c64/cart/c64cart.c:239 src/translate.c.po.c:1452
 msgid "Attach generic 8KB cartridge image"
 msgstr "Koppel generiek 8KB-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:252 src/translate.c.po.c:1462
+#: src/c64/cart/c64cart.c:242 src/translate.c.po.c:1462
 msgid "Attach generic 16KB cartridge image"
 msgstr "Koppel generiek 16KB-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:255 src/translate.c.po.c:1502
+#: src/c64/cart/c64cart.c:245 src/translate.c.po.c:1482
 msgid "Attach raw 32KB Action Replay cartridge image"
 msgstr "Koppel binair 32KB Action-Replay-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:258 src/translate.c.po.c:1492
+#: src/c64/cart/c64cart.c:248 src/translate.c.po.c:1472
 msgid "Attach raw 16KB Action Replay III cartridge image"
 msgstr "Koppel binair 16KB Action-Replay-III-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:261
-#, fuzzy
-msgid "Attach raw 32KB Action Replay 4 cartridge image"
-msgstr "Koppel binair 32KB Action-Replay-cartridgebestand aan"
-
-#: src/c64/cart/c64cart.c:264 src/translate.c.po.c:1512
+#: src/c64/cart/c64cart.c:251 src/translate.c.po.c:1492
 msgid "Attach raw 64KB Retro Replay cartridge image"
 msgstr "Koppel binair 64KB Retro-Replay-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:267 src/translate.c.po.c:1522
+#: src/c64/cart/c64cart.c:254 src/translate.c.po.c:1502
 msgid "Attach raw 64KB IDE64 cartridge image"
 msgstr "Koppel binair 64KB IDE64-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:270 src/translate.c.po.c:1532
+#: src/c64/cart/c64cart.c:257 src/translate.c.po.c:1512
 msgid "Attach raw 32KB Atomic Power cartridge image"
 msgstr "Koppel binair 32KB Atomic-Power-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:273 src/translate.c.po.c:1542
+#: src/c64/cart/c64cart.c:260 src/translate.c.po.c:1522
 msgid "Attach raw 8KB Epyx fastload cartridge image"
 msgstr "Koppel binair 8KB Epyx-fastload-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:276 src/translate.c.po.c:1552
+#: src/c64/cart/c64cart.c:263 src/translate.c.po.c:1532
 msgid "Attach raw 32KB Super Snapshot cartridge image"
 msgstr "Koppel binair 32KB Super-Snapshot-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:279 src/translate.c.po.c:1562
+#: src/c64/cart/c64cart.c:266 src/translate.c.po.c:1542
 msgid "Attach raw 64KB Super Snapshot cartridge image"
 msgstr "Koppel binair 64KB Super-Snapshot-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:282 src/translate.c.po.c:1572
+#: src/c64/cart/c64cart.c:269 src/translate.c.po.c:1552
 msgid "Attach CBM IEEE488 cartridge image"
 msgstr "Koppel CBM IEEE488-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:285 src/translate.c.po.c:1582
+#: src/c64/cart/c64cart.c:272 src/translate.c.po.c:1562
 msgid "Attach raw 16KB Westermann learning cartridge image"
 msgstr "Koppel binair 16KB Westermann-learning-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:288 src/translate.c.po.c:4835
+#: src/c64/cart/c64cart.c:275 src/translate.c.po.c:4785
 msgid "Attach raw Structured Basic cartridge image"
 msgstr "Koppel binair Structured-Basic-cartridgebestand aan"
 
-#: src/c64/cart/c64cart.c:291
-#, fuzzy
-msgid "Attach raw StarDOS image"
-msgstr "Koppel een tapebestand"
-
-#: src/c64/cart/c64cart.c:294 src/translate.c.po.c:1592
+#: src/c64/cart/c64cart.c:278 src/translate.c.po.c:1572
 msgid "Enable expert cartridge"
 msgstr "Activeer expertcartridge"
 
-#: src/c64/cart/ide64.c:281 src/translate.c.po.c:1602
+#: src/c64/cart/ide64.c:281 src/translate.c.po.c:1582
 msgid "Specify name of IDE64 image file"
 msgstr "Geef de naam van het IDE64-bestand"
 
-#: src/c64/cart/ide64.c:283 src/translate.c.po.c:1622
+#: src/c64/cart/ide64.c:283 src/translate.c.po.c:1602
 msgid "Set number of cylinders for the IDE64 emulation"
 msgstr "Stel het aantal cylinders voor de IDE64-emulatie in"
 
-#: src/c64/cart/ide64.c:285 src/translate.c.po.c:1632
+#: src/c64/cart/ide64.c:285 src/translate.c.po.c:1612
 msgid "Set number of heads for the IDE64 emulation"
 msgstr "Stel het aantal koppen voor de IDE64-emulatie in"
 
-#: src/c64/cart/ide64.c:287 src/translate.c.po.c:1642
+#: src/c64/cart/ide64.c:287 src/translate.c.po.c:1622
 msgid "Set number of sectors for the IDE64 emulation"
 msgstr "Stel het aantal sectors voor de IDE64-emulatie in"
 
-#: src/c64/cart/ide64.c:290 src/translate.c.po.c:1652
+#: src/c64/cart/ide64.c:290 src/translate.c.po.c:1632
 msgid "Autodetect geometry of formatted images"
 msgstr "Automatisch de grootte van de geformateerde bestanden detecteren"
 
-#: src/c64/cart/ide64.c:293 src/translate.c.po.c:1662
+#: src/c64/cart/ide64.c:293 src/translate.c.po.c:1642
 msgid "Do not autodetect geometry of formatted images"
 msgstr "Niet automatisch de grootte van de geformateerde bestanden detecteren"
 
-#: src/c64/c64_256k.c:206 src/translate.c.po.c:4795
+#: src/c64/c64_256k.c:206 src/translate.c.po.c:4745
 msgid "Enable the 256K RAM expansion"
 msgstr "Activeer de 256K-geheugenuitbreiding"
 
-#: src/c64/c64_256k.c:208 src/translate.c.po.c:4805
+#: src/c64/c64_256k.c:208 src/translate.c.po.c:4755
 msgid "Disable the 256K RAM expansion"
 msgstr "De 256K-geheugenuitbreiding uitschakelen"
 
-#: src/c64/c64_256k.c:210 src/translate.c.po.c:4815
+#: src/c64/c64_256k.c:210 src/translate.c.po.c:4765
 msgid "Specify name of 256K image"
 msgstr "Geef de naam van het 256K-bestand"
 
 #: src/c64/c64_256k.c:212 src/c64/digimax.c:141 src/c64/plus60k.c:251
-#: src/sid/sid-cmdline-options.c:221 src/translate.c.po.c:3436
+#: src/sid/sid-cmdline-options.c:221 src/translate.c.po.c:3386
 msgid "<base address>"
 msgstr "<basisadres>"
 
-#: src/c64/c64_256k.c:212 src/translate.c.po.c:4825
+#: src/c64/c64_256k.c:212 src/translate.c.po.c:4775
 msgid "Base address of the 256K expansion"
 msgstr "Basisadres van de 256K-geheugenuitbreiding"
 
@@ -860,15 +849,15 @@
 "Digmax kan niet gebruikt worden met ReSID\n"
 "Schakel de SID-kern over naar FastSID"
 
-#: src/c64/digimax.c:137 src/translate.c.po.c:4885
+#: src/c64/digimax.c:137 src/translate.c.po.c:4835
 msgid "Enable the digimax cartridge"
 msgstr "Activeer de digimaxcartridge"
 
-#: src/c64/digimax.c:139 src/translate.c.po.c:4895
+#: src/c64/digimax.c:139 src/translate.c.po.c:4845
 msgid "Disable the digimax cartridge"
 msgstr "De digimaxcartridge uitschakelen"
 
-#: src/c64/digimax.c:141 src/translate.c.po.c:4905
+#: src/c64/digimax.c:141 src/translate.c.po.c:4855
 msgid "Base address of the digimax cartridge"
 msgstr "Basisadres van de digimaxcartridge"
 
@@ -884,7 +873,7 @@
 msgid "Specify name of GEORAM image"
 msgstr "Geef de naam van het GEORAM-bestand"
 
-#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:448
+#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:249
 #: src/pet/petreu.c:216 src/translate.c.po.c:1130
 msgid "<size in KB>"
 msgstr "<grootte in KB>"
@@ -921,31 +910,31 @@
 msgid "Save the MMC64 bios when changed"
 msgstr "Sla de MMC64-bios op als er veranderingen zijn gemaakt"
 
-#: src/c64/plus256k.c:171 src/translate.c.po.c:4725
+#: src/c64/plus256k.c:171 src/translate.c.po.c:4675
 msgid "Enable the PLUS256K RAM expansion"
 msgstr "Activeer de PLUS256K-geheugenuitbreiding"
 
-#: src/c64/plus256k.c:173 src/translate.c.po.c:4735
+#: src/c64/plus256k.c:173 src/translate.c.po.c:4685
 msgid "Disable the PLUS256K RAM expansion"
 msgstr "De PLUS256K-geheugenuitbreiding uitschakelen"
 
-#: src/c64/plus256k.c:175 src/translate.c.po.c:4745
+#: src/c64/plus256k.c:175 src/translate.c.po.c:4695
 msgid "Specify name of PLUS256K image"
 msgstr "Geef de naam van het PLUS256K-bestand"
 
-#: src/c64/plus60k.c:245 src/translate.c.po.c:4755
+#: src/c64/plus60k.c:245 src/translate.c.po.c:4705
 msgid "Enable the PLUS60K RAM expansion"
 msgstr "Activeer de PLUS60K-geheugenuitbreiding"
 
-#: src/c64/plus60k.c:247 src/translate.c.po.c:4765
+#: src/c64/plus60k.c:247 src/translate.c.po.c:4715
 msgid "Disable the PLUS60K RAM expansion"
 msgstr "De PLUS60K-geheugenuitbreiding uitschakelen"
 
-#: src/c64/plus60k.c:249 src/translate.c.po.c:4775
+#: src/c64/plus60k.c:249 src/translate.c.po.c:4725
 msgid "Specify name of PLUS60K image"
 msgstr "Geef de naam van het PLUS60K-bestand"
 
-#: src/c64/plus60k.c:251 src/translate.c.po.c:4785
+#: src/c64/plus60k.c:251 src/translate.c.po.c:4735
 msgid "Base address of the PLUS60K expansion"
 msgstr "Basisadres van de PLUS60K-geheugenuitbreiding"
 
@@ -977,19 +966,19 @@
 msgid "Size of the RAMCART expansion"
 msgstr "Grootte van de RAMCART-uitbreiding"
 
-#: src/c64/reu.c:442 src/translate.c.po.c:1330
+#: src/c64/reu.c:243 src/translate.c.po.c:1330
 msgid "Enable the RAM expansion unit"
 msgstr "Activeer de RAM-uitbreidingseenheid (REU)"
 
-#: src/c64/reu.c:444 src/translate.c.po.c:1340
+#: src/c64/reu.c:245 src/translate.c.po.c:1340
 msgid "Disable the RAM expansion unit"
 msgstr "De RAM-uitbreidingseenheid (REU) uitschakelen"
 
-#: src/c64/reu.c:446 src/translate.c.po.c:1350
+#: src/c64/reu.c:247 src/translate.c.po.c:1350
 msgid "Specify name of REU image"
 msgstr "Geef de naam van het REU-bestand"
 
-#: src/c64/reu.c:448 src/translate.c.po.c:1360
+#: src/c64/reu.c:249 src/translate.c.po.c:1360
 msgid "Size of the RAM expansion unit"
 msgstr "Grootte van de RAM-uitbreidingseenheid (REU)"
 
@@ -1014,326 +1003,326 @@
 msgstr "RRNet-modus van de TFE-emulatie uitschakelen"
 
 #: src/cbm2/cbm2-cmdline-options.c:121 src/pet/pet-cmdline-options.c:114
-#: src/translate.c.po.c:1672
+#: src/translate.c.po.c:1652
 msgid "<modelnumber>"
 msgstr "<modelnummer>"
 
-#: src/cbm2/cbm2-cmdline-options.c:121 src/translate.c.po.c:1682
+#: src/cbm2/cbm2-cmdline-options.c:121 src/translate.c.po.c:1662
 msgid "Specify CBM-II model to emulate"
 msgstr "Geef CBM-II-model om te emuleren"
 
-#: src/cbm2/cbm2-cmdline-options.c:123 src/translate.c.po.c:1692
+#: src/cbm2/cbm2-cmdline-options.c:123 src/translate.c.po.c:1672
 msgid "Specify to use VIC-II"
 msgstr "Gebruik de VIC-II"
 
-#: src/cbm2/cbm2-cmdline-options.c:125 src/translate.c.po.c:1702
+#: src/cbm2/cbm2-cmdline-options.c:125 src/translate.c.po.c:1682
 msgid "Specify to use CRTC"
 msgstr "Gebruik de CRTC"
 
-#: src/cbm2/cbm2-cmdline-options.c:127 src/translate.c.po.c:1712
+#: src/cbm2/cbm2-cmdline-options.c:127 src/translate.c.po.c:1692
 msgid "<linenumber>"
 msgstr "<lijnnummer>"
 
-#: src/cbm2/cbm2-cmdline-options.c:127 src/translate.c.po.c:1722
+#: src/cbm2/cbm2-cmdline-options.c:127 src/translate.c.po.c:1702
 msgid "Specify CBM-II model hardware (0=6x0, 1=7x0)"
 msgstr "Geef CBM-II-hardwaremodel (0=6x0, 1=7x0)"
 
 #: src/cbm2/cbm2-cmdline-options.c:129 src/plus4/plus4-cmdline-options.c:99
-#: src/translate.c.po.c:1732
+#: src/translate.c.po.c:1712
 msgid "<ramsize>"
 msgstr "<geheugengrootte>"
 
-#: src/cbm2/cbm2-cmdline-options.c:129 src/translate.c.po.c:1742
+#: src/cbm2/cbm2-cmdline-options.c:129 src/translate.c.po.c:1722
 msgid "Specify size of RAM (64/128/256/512/1024 kByte)"
 msgstr "Geef geheugengrootte (64/128/256/512/1024 kByte)"
 
-#: src/cbm2/cbm2-cmdline-options.c:139 src/translate.c.po.c:1752
+#: src/cbm2/cbm2-cmdline-options.c:139 src/translate.c.po.c:1732
 msgid "Specify name of cartridge ROM image for $1000"
 msgstr "Geef de naam van het cartridge-ROM-bestand voor $1000"
 
-#: src/cbm2/cbm2-cmdline-options.c:141 src/translate.c.po.c:1762
+#: src/cbm2/cbm2-cmdline-options.c:141 src/translate.c.po.c:1742
 msgid "Specify name of cartridge ROM image for $2000-$3fff"
 msgstr "Geef de naam van het cartridge-ROM-bestand voor $2000-$3fff"
 
-#: src/cbm2/cbm2-cmdline-options.c:143 src/translate.c.po.c:1772
+#: src/cbm2/cbm2-cmdline-options.c:143 src/translate.c.po.c:1752
 msgid "Specify name of cartridge ROM image for $4000-$5fff"
 msgstr "Geef de naam van het cartridge-ROM-bestand voor $4000-$5fff"
 
-#: src/cbm2/cbm2-cmdline-options.c:145 src/translate.c.po.c:1782
+#: src/cbm2/cbm2-cmdline-options.c:145 src/translate.c.po.c:1762
 msgid "Specify name of cartridge ROM image for $6000-$7fff"
 msgstr "Geef de naam van het cartridge-ROM-bestand voor $6000-$7fff"
 
-#: src/cbm2/cbm2-cmdline-options.c:147 src/translate.c.po.c:1792
+#: src/cbm2/cbm2-cmdline-options.c:147 src/translate.c.po.c:1772
 msgid "Enable RAM mapping in $0800-$0FFF"
 msgstr "Activeer RAM op adres $0800-$0FFF"
 
-#: src/cbm2/cbm2-cmdline-options.c:149 src/translate.c.po.c:1802
+#: src/cbm2/cbm2-cmdline-options.c:149 src/translate.c.po.c:1782
 msgid "Disable RAM mapping in $0800-$0FFF"
 msgstr "RAM op adres $0800-$0FFF uitschakelen"
 
-#: src/cbm2/cbm2-cmdline-options.c:151 src/translate.c.po.c:1812
+#: src/cbm2/cbm2-cmdline-options.c:151 src/translate.c.po.c:1792
 msgid "Enable RAM mapping in $1000-$1FFF"
 msgstr "Activeer RAM op adres $1000-$1FFF"
 
-#: src/cbm2/cbm2-cmdline-options.c:153 src/translate.c.po.c:1822
+#: src/cbm2/cbm2-cmdline-options.c:153 src/translate.c.po.c:1802
 msgid "Disable RAM mapping in $1000-$1FFF"
 msgstr "RAM op adres $1000-$1FFF uitschakelen"
 
-#: src/cbm2/cbm2-cmdline-options.c:155 src/translate.c.po.c:1832
+#: src/cbm2/cbm2-cmdline-options.c:155 src/translate.c.po.c:1812
 msgid "Enable RAM mapping in $2000-$3FFF"
 msgstr "Activeer RAM op adres $2000-$3FFF"
 
-#: src/cbm2/cbm2-cmdline-options.c:157 src/translate.c.po.c:1842
+#: src/cbm2/cbm2-cmdline-options.c:157 src/translate.c.po.c:1822
 msgid "Disable RAM mapping in $2000-$3FFF"
 msgstr "RAM op adres $2000-$3FFF uitschakelen"
 
-#: src/cbm2/cbm2-cmdline-options.c:159 src/translate.c.po.c:1852
+#: src/cbm2/cbm2-cmdline-options.c:159 src/translate.c.po.c:1832
 msgid "Enable RAM mapping in $4000-$5FFF"
 msgstr "Activeer RAM op adres $4000-$5FFF"
 
-#: src/cbm2/cbm2-cmdline-options.c:161 src/translate.c.po.c:1862
+#: src/cbm2/cbm2-cmdline-options.c:161 src/translate.c.po.c:1842
 msgid "Disable RAM mapping in $4000-$5FFF"
 msgstr "RAM op adres $4000-$5FFF uitchakelen"
 
-#: src/cbm2/cbm2-cmdline-options.c:163 src/translate.c.po.c:1872
+#: src/cbm2/cbm2-cmdline-options.c:163 src/translate.c.po.c:1852
 msgid "Enable RAM mapping in $6000-$7FFF"
 msgstr "Activeer RAM op adres $6000-$7FFF"
 
-#: src/cbm2/cbm2-cmdline-options.c:165 src/translate.c.po.c:1882
+#: src/cbm2/cbm2-cmdline-options.c:165 src/translate.c.po.c:1862
 msgid "Disable RAM mapping in $6000-$7FFF"
 msgstr "RAM op adres $6000-$7FFF uitschakelen"
 
-#: src/cbm2/cbm2-cmdline-options.c:167 src/translate.c.po.c:1892
+#: src/cbm2/cbm2-cmdline-options.c:167 src/translate.c.po.c:1872
 msgid "Enable RAM mapping in $C000-$CFFF"
 msgstr "Activeer RAM op adres $C000-$CFFF"
 
-#: src/cbm2/cbm2-cmdline-options.c:169 src/translate.c.po.c:1902
+#: src/cbm2/cbm2-cmdline-options.c:169 src/translate.c.po.c:1882
 msgid "Disable RAM mapping in $C000-$CFFF"
 msgstr "RAM op adres $C000-$CFFF uitschakelen"
 
 #: src/cbm2/cbm2-cmdline-options.c:176 src/pet/pet-cmdline-options.c:161
-#: src/translate.c.po.c:1913
+#: src/translate.c.po.c:1893
 msgid "Specify index of keymap file"
 msgstr "Geef de index van het keymapbestand"
 
 #: src/cbm2/cbm2-cmdline-options.c:179 src/pet/pet-cmdline-options.c:164
-#: src/translate.c.po.c:1923
+#: src/translate.c.po.c:1903
 msgid "Specify name of graphics keyboard symbolic keymap file"
 msgstr ""
 "Geef de naam van het symbolisch keymapbestand voor het grafische toetsenbord"
 
 #: src/cbm2/cbm2-cmdline-options.c:182 src/pet/pet-cmdline-options.c:167
-#: src/translate.c.po.c:1933
+#: src/translate.c.po.c:1913
 msgid "Specify name of graphics keyboard positional keymap file"
 msgstr ""
 "Geef de naam van het positioneel keymapbestand voor het grafische toetsenbord"
 
 #: src/cbm2/cbm2-cmdline-options.c:185 src/pet/pet-cmdline-options.c:170
-#: src/translate.c.po.c:1943
+#: src/translate.c.po.c:1923
 msgid "Specify name of UK business keyboard symbolic keymap file"
 msgstr ""
 "Geef de naam van het symbolisch keymapbestand voor het UK-businesstoetsenbord"
 
 #: src/cbm2/cbm2-cmdline-options.c:188 src/pet/pet-cmdline-options.c:173
-#: src/translate.c.po.c:1953
+#: src/translate.c.po.c:1933
 msgid "Specify name of UK business keyboard positional keymap file"
 msgstr ""
 "Geef de naam van het positioneel keymapbestand voor het UK-"
 "businesstoetsenbord"
 
 #: src/cbm2/cbm2-cmdline-options.c:191 src/pet/pet-cmdline-options.c:176
-#: src/translate.c.po.c:1963
+#: src/translate.c.po.c:1943
 msgid "Specify name of German business keyboard symbolic keymap file"
 msgstr ""
 "Geef de naam van het symbolisch keymapbestand voor het Duitse "
 "businesstoetsenbord"
 
 #: src/cbm2/cbm2-cmdline-options.c:194 src/pet/pet-cmdline-options.c:179
-#: src/translate.c.po.c:1973
+#: src/translate.c.po.c:1953
 msgid "Specify name of German business keyboard positional keymap file"
 msgstr ""
 "Geef de naam van het positioneel keymapbestand voor het Duitse "
 "businesstoetsenbord"
 
-#: src/datasette.c:175 src/translate.c.po.c:4068
+#: src/datasette.c:175 src/translate.c.po.c:4018
 msgid "Enable automatic Datasette-Reset"
 msgstr "Activeer automatische Datasette-Reset"
 
-#: src/datasette.c:178 src/translate.c.po.c:4078
+#: src/datasette.c:178 src/translate.c.po.c:4028
 msgid "Disable automatic Datasette-Reset"
 msgstr "Automatische Datasette-Reset uitschakelen"
 
-#: src/datasette.c:181 src/translate.c.po.c:4088
+#: src/datasette.c:181 src/translate.c.po.c:4038
 msgid "Set delay in cycles for a zero in the tap"
 msgstr "Zet de vertraging in cycli voor een nul in de tap"
 
-#: src/datasette.c:184 src/translate.c.po.c:4098
+#: src/datasette.c:184 src/translate.c.po.c:4048
 msgid "Set number of cycles added to each gap in the tap"
 msgstr "Ze...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu: [18894] branches/marco/ports/vice/src/arch/unix

[<bla...@us...>]

Revision: 18894
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18894&view=rev
Author:   blackystardust
Date:     2008-06-22 12:51:00 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Improved some of the *nix based make-bindist.sh scripts

Modified Paths:
--------------
    branches/marco/ports/vice/src/arch/unix/qnx6/make-bindist.sh
    branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh
    branches/marco/ports/vice/src/arch/unix/skyos/make-bindist.sh

Modified: branches/marco/ports/vice/src/arch/unix/qnx6/make-bindist.sh
===================================================================
--- branches/marco/ports/vice/src/arch/unix/qnx6/make-bindist.sh	2008-06-22 19:46:03 UTC (rev 18893)
+++ branches/marco/ports/vice/src/arch/unix/qnx6/make-bindist.sh	2008-06-22 19:51:00 UTC (rev 18894)
@@ -32,7 +32,8 @@
 
 echo Generating QNX 6 port binary distribution.
 rm -f -r VICE-$VICEVERSION
-$MAKECOMMAND prefix=VICE-$VERSION/opt VICEDIR=VICE-$VERSION/opt/lib/vice install
+curdir=`pwd`
+$MAKECOMMAND prefix=$curdir/VICE-$VERSION/opt $curdir/VICEDIR=VICE-$VERSION/opt/lib/vice install
 $STRIP VICE-$VICEVERSION/opt/bin/x64
 $STRIP VICE-$VICEVERSION/opt/bin/x128
 $STRIP VICE-$VICEVERSION/opt/bin/xvic

Modified: branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh
===================================================================
--- branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh	2008-06-22 19:46:03 UTC (rev 18893)
+++ branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh	2008-06-22 19:51:00 UTC (rev 18894)
@@ -53,7 +53,8 @@
 
 echo Generating $PLATFORM port binary distribution.
 rm -f -r VICE-$VICEVERSION
-$MAKECOMMAND prefix=VICE-$VICEVERSION/usr/local VICEDIR=VICE-$VICEVERSION/usr/local/lib/vice install
+curdir=`pwd`
+$MAKECOMMAND prefix=$curdir/VICE-$VICEVERSION/usr/local VICEDIR=$curdir/VICE-$VICEVERSION/usr/local/lib/vice install
 $STRIP VICE-$VICEVERSION/usr/local/bin/x64
 $STRIP VICE-$VICEVERSION/usr/local/bin/x128
 $STRIP VICE-$VICEVERSION/usr/local/bin/xvic

Modified: branches/marco/ports/vice/src/arch/unix/skyos/make-bindist.sh
===================================================================
--- branches/marco/ports/vice/src/arch/unix/skyos/make-bindist.sh	2008-06-22 19:46:03 UTC (rev 18893)
+++ branches/marco/ports/vice/src/arch/unix/skyos/make-bindist.sh	2008-06-22 19:51:00 UTC (rev 18894)
@@ -26,7 +26,8 @@
 
 echo Generating SkyOS port binary distribution.
 rm -f -r VICE-$VERSION
-$MAKECOMMAND prefix=VICE-$VERSION/programs/VICE VICEDIR=VICE-$VERSION/programs/VICE/lib/vice install
+curdir=`pwd`
+$MAKECOMMAND prefix=$curdir/VICE-$VERSION/programs/VICE VICEDIR=$curdir/VICE-$VERSION/programs/VICE/lib/vice install
 mv VICE-$VERSION/programs/VICE/bin/x64 VICE-$VERSION/programs/VICE/bin/x64.app
 $STRIP VICE-$VERSION/programs/VICE/bin/x64.app
 mv VICE-$VERSION/programs/VICE/bin/x128 VICE-$VERSION/programs/VICE/bin/x128.app


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18893] branches/marco/ports

[<bla...@us...>]

Revision: 18893
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18893&view=rev
Author:   blackystardust
Date:     2008-06-22 12:46:03 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Updated to 1.22.19

Modified Paths:
--------------
    branches/marco/ports/vice/ChangeLog
    branches/marco/ports/vice/Makefile.am
    branches/marco/ports/vice/configure.in
    branches/marco/ports/vice/po/de.po
    branches/marco/ports/vice/po/fr.po
    branches/marco/ports/vice/po/hu.po
    branches/marco/ports/vice/po/it.po
    branches/marco/ports/vice/po/pl.po
    branches/marco/ports/vice/po/sv.po
    branches/marco/ports/vice/src/ChangeLog
    branches/marco/ports/vice/src/arch/unix/qnx6/make-bindist.sh
    branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh
    branches/marco/ports/vice/src/arch/unix/skyos/make-bindist.sh
    branches/marco/ports/vice/src/c64/c64io.c
    branches/marco/ports/vice/src/c64/reu.c
    branches/marco/ports/vice/src/version.h

Added Paths:
-----------
    branches/marco/ports/svn-instructions.txt
    branches/marco/ports/vice/Doxyfile

Copied: branches/marco/ports/svn-instructions.txt (from rev 18892, tags/v1.22/v1.22.19/svn-instructions.txt)
===================================================================
--- branches/marco/ports/svn-instructions.txt	                        (rev 0)
+++ branches/marco/ports/svn-instructions.txt	2008-06-22 19:46:03 UTC (rev 18893)
@@ -0,0 +1,373 @@
+
+Note that I am describing how to handle everything with a command-line
+SVN client. For GUI clients, it should be possible in a similar way.
+
+Additionally note that this is not a full introducion in Subversion, and
+it is not intended to be. Please, read the SVN book
+(http://svnbook.red-bean.com/) to get used to SVN.
+
+
+1. Reading the SVN repository
+=============================
+
+1.1 Naming scheme of releases:
+------------------------------
+
+The base name of the URL to retrieve working copies (cf. 1.2 below) is 
+   https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/
+
+This will be called $BASE in the sequel.
+
+The naming for the releases is rather easy, but a little bit different
+from what you might be used to with SVN: First the trunk - that is,
+always the latest version - is named trunk. It can be found at
+
+   $BASE/trunk/
+
+All releases (developer releases as well a real releases) are put into
+'directories' at $BASE/tags/... . The main release name is next, and the
+developer releases is last. Here are some examples:
+
+  v1.13:      $BASE/tags/v1.13/v1.13/
+  v1.13.5:    $BASE/tags/v1.13/v1.13.5/
+  v1.22:      $BASE/tags/v1.22/v1.22/
+  v1.22.9:    $BASE/tags/v1.22/v1.22.9/
+
+Note that with the v0.xx releases, the main version had three numbers in
+it, thus:
+
+  v0.14.0:    $BASE/tags/v0.14.0/v0.14.0/
+  v0.14.1:    $BASE/tags/v0.14.1/v0.14.1/
+  v0.14.1.5:  $BASE/tags/v0.14.1/v0.14.1.5/
+
+
+There are exceptions to this rule, though. These are:
+
+  v1.0.0.1:   $BASE/tags/v1.0/v1.0.0.1/
+  v1.0.0.2:   $BASE/tags/v1.0/v1.0.0.2/
+
+  (these two versions are the only ones of v1.xxx where the numbering
+  scheme of v0.xxx was still used)
+
+Additionally, there are the following releases:
+  v1.9a:      $BASE/tags/v1.9/v1.9a/
+  v1.11-old:  $BASE/tags/v1.11/v1.11-old/
+  v1.13a:     $BASE/tags/v1.13/v1.13a/
+
+These are because releases v1.9 and v1.13 were replaced with their "a"
+counterparts shortly after release. v1.11-old was never released, but it
+was planned to release that one.
+
+Additionally note that there have been v0.14.2.74 and v0.14.2.75;
+unfortunately, I do not have these, only a patch from v0.14.2.74 ->
+v0.14.2.75, which is not sufficient to recreate these old ones, as the
+patches v0.14.2.73 -> v0.14.2.74 as well as the patch v0.14.2.75 ->
+v0.15.0 are missing, too.
+
+
+The directory "devel" is used for development work. In branches/,
+every user should create his own working directory with his name (spiro,
+andreasm, tibor, ...). In this directory, additional directories are
+created that resemble actual work.
+
+In tags/, every user should have his own working directory, too
+(names spiro, andreasm, tibor, ...). In this directories, tags are
+applied that resemble some milestones in development. For example, these
+tags are the basis for integration in the next developer release.
+
+
+
+Whenever you are in doubt about the directory structure, it might be a
+good idea to have a look into the online browseable directory on
+SourceForge:
+
+  http://vice-emu.svn.sourceforge.net/viewvc/vice-emu/tags/
+
+or the complete repository:
+
+  http://vice-emu.svn.sourceforge.net/viewvc/vice-emu/
+
+You can also use the "svn ls" command to see the contents of a
+directory. For example,
+
+$ svn ls https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/
+
+will print out everything that is in the tags/ subdirectory.
+
+
+
+1.2. Initial checkout
+---------------------
+
+If you want to start working on VICE, you first have to check out a
+working version of VICE. For example, to get the latest version of VICE,
+just enter:
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/ vice
+
+This will check out the "trunk" version of VICE - that is, always the
+latest - into a new directory called vice (last parameter). If you want
+to get a different version (for example, v1.22.3), just change the URL
+part of the command to:
+
+https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.3
+
+That is, the full command is:
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.3 vice
+
+to put everything into a new directory named "vice".
+
+
+
+1.3. Changing your workspace to another release
+-----------------------------------------------
+
+Sometimes, it might be convenient to be able to change your working copy
+to the one from another release. For example, you are hunting for the
+release where a certain bug was introduced. Of course, you can always
+check out specific releases (cf. 1.2). Unfortunately, this will always
+pull ALL files from the server, which takes time and network bandwidth.
+
+Instead, you might want to change a specific directory to another one.
+This can be done with the "svn switch" statement. Take, for example, you
+want to change to v1.20.5. You can do this with:
+
+~/vice$ svn switch https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.20/v1.20.5
+
+Note that you must be IN the directory where you previously checked out
+VICE!
+
+You can switch multiple times, as you want to. Note that any changed
+file will get the timestamp of the time this file was written while
+switching. This is to ensure (as good as possible) that the Makefile
+will recognize the changes, so you will be able to compile from that
+working set as soon as possible.
+
+You can switch back to the trunk using:
+
+~/vice$ svn switch https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/
+
+
+Note: If you have made local changes, svn switch will try to merge your
+changes into your working set.
+
+
+1.4. Reverting your workspace to what is on the server
+------------------------------------------------------
+
+Take that you have made changed to your workspace and compiled files.
+Now, you want to delete all files that are not under version control.
+The following file outputs these extra files to be deleted:
+
+~/vice$ svn status --no-ignore|sed -n -e "s/^[I|\?]//p"|xargs -n 1 echo rm -rf --
+
+If you run this command, it will output every file not under control,
+prepended by "rm -rf --". If you are really sure these files are all ok,
+you can delete them by removing the "echo" there.
+
+NOTE: THIS COMMAND DOES NOT HANDLE ALL CASES CORRECTLY! For example,
+files with SPACES will not be handled correctly. I would never recommend
+to use this command without actually having a look at what is to be
+deleted beforehand. USE AT YOUR OWN RISK!
+
+
+Another thing often encountered is that you have made some changes which
+you do not like anymore. For this, you can undo the changes made with
+the command:
+
+~/vice$ svn revert <PATHTOFILE>
+
+This will undo the local change completely, and you will have a copy of
+what is on the server.
+
+If you want to revert anything done, use
+
+~/vice$ svn revert --recursive .
+
+to revert everything in the current directory and its sub-directories.
+
+
+1.5 Get the newest version from the server
+------------------------------------------
+
+If someone has done any changes on the repository, you might want to get
+the latest changes. For this, you can use the "svn update" command which
+will retrieve the latest versions of all the files from the server.
+
+If you want to know beforehand what has changed, the "svn status"
+command is helpful.
+
+For both commands, have a look at the SVN book, or to the online help
+(svn --help update, for example, or info sed on Unixoid machines).
+
+
+
+2. Making your changes
+======================
+
+If you want to start development, you have to perform the following
+steps:
+
+a. Create your own workspace in a branch
+b. Change to this branch
+c. Make you local changes
+d. Commit your local changes
+e. repeat steps c. and d. as often as you like
+
+
+2.1. Creating your own workspace
+--------------------------------
+
+Whenever you want to make a change to VICE, you should perform these
+steps in your own branch. For this, generate a copy of the latest
+version. For this, generate a branch to work on:
+
+~/$ svn copy https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.10 https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro/v1.22.10-MYFEATURE
+
+This is too long for you? If you are in a working copy, you can also
+abbreviate this:
+
+~/vice$ svn copy tags/v1.22/v1.22.10 branches/spiro/v1.22.10-MYFEATURE
+
+Of course, replace my name "spiro" with you own, and replace the version
+(v1.22, v1.22.10) with the latest version, and replace MYFEATURE with
+something that makes more sense - that is, with what you are doing.
+
+The above naming would be equivalent to what was named
+spiro-1.22.10-MYFEATURE.diff with our old naming scheme.
+
+
+Make sure you have generated your own working directory before
+performing the above step, however. That is, for the first time you want
+to create a branch, you have to perform:
+
+
+~/vice$ svn mkdir branches/spiro
+
+or
+
+~/$ svn mkdir https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro
+
+Note that you must give a revision message; that is, a message where you
+are describing what you have done. You can do this either after pressing
+enter, or append it directly to the command:
+
+~/vice$ svn mkdir branches/spiro -m "Generated Spiro's working branch"
+
+
+NOTE: While one may be tempted to use the trunk to branch from, I would
+not recommend it here. The reason is simple: The maintainer might
+already be doing some integration work on the trunk, in which case you
+would branch from an intermediate version, which might not be a good
+idea. Additionally, it is harder (but not impossible) to find out from
+which version you just branched off if you do it from the branch. So, it
+is better to use the tags to branch from!
+
+
+2.2 Changing to your working branch
+-----------------------------------
+
+Now, either checkout a new working copy (cf. 1.2) or revert your current
+one (cf. 1.3.):
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro/v1.22.10-MYFEATURE/
+
+or 
+
+~/vice$ svn switch branches/spiro/v1.22.10-MYFEATURE/
+
+
+2.3 Make your local changes
+---------------------------
+
+Yes - now, you are allowed to do whatevery you like in your working
+copy. Change the VICE code any way you like it.
+
+There are some commands which might be helpful, however:
+
+- svn status - let's you find out which files you have changed locally
+- svn diff   - you can do a diff against the version of the server,
+               so you can find out what you have changed in the
+               meantime in detail.
+
+
+2.4 Commit you local changes
+----------------------------
+
+This is the important step. As long as you do not commit, no one will be
+able to see what you have changed.
+
+It is best to start with a
+
+~/vice$ svn status
+
+which will show you which files you have changed.
+
+Files which are prepended with an "?" are the files which are not under
+version control yet. If you have added some files, these will be shown
+with the "?". Now, you must add them:
+
+~/vice$ svn add NEWFILE
+
+The same applies for the directories, by the way.
+
+Again, these changes will not show up until you commit:
+
+~/vice$ svn commit
+
+You will be asked for your log message, which you should enter here.
+
+
+2.5 Marking milestones
+----------------------
+
+Whenever you have a milestone reached, you can tag the current version.
+Additionally, if you want your latest changes to be included in the next
+official version of VICE, you MUST tag the current version. A tag is
+just a convenient way to remember the state you were working on.
+
+To create a tag, you must create a (virtual) copy of your current
+workspace. First, make sure you have committed any changes (by issuing a
+"cvs status" command). Then, tag your workspace by:
+
+~/vice$ svn copy branches/spiro/v1.22.10-MYFEATURE tags/spiro/v1.22.10-MYFEATURE
+
+(you can use the full URL, too)
+
+You can append numbers to the "MYFEATURE" if you want to have multiple
+milestones.
+
+
+If you want the feature to be added for the next release, just write a
+mail on the mailing list, mentioning the full path to the tag.
+
+
+
+3. Some maintainance work documentation
+=======================================
+
+(to be continued, just some snippets so far)
+
+3.1 Creating a source distribution
+----------------------------------
+
+a. Add all patches to be included
+b. Change the version number of the distribution in configure.in,
+   VICE_VERSION_MAJOR, VICE_VERSION_MINOR, VICE_VERSION_BUILD. Also,
+   define/undefine UNSTABLE there if this is a release, or not.
+c. Add entries in ChangeLog, src/ChangeLog
+d. Execute: autoreconf; ./configure; make dist
+e. svn commit
+f. svn copy https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/ https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/vX.YY/vX.YY.ZZ
+g. copy vice-X.YY.ZZ to viceteam.org/devel/
+
+
+
+4. Misc
+=======
+
+Make sure that the code you change:
+- has proper line endings (svn properties set correctly)
+- only uses C style comments (/* ... */), not C++ style - at least for
+  platform independant ("common") code.

Modified: branches/marco/ports/vice/ChangeLog
===================================================================
--- branches/marco/ports/vice/ChangeLog	2008-06-22 15:27:33 UTC (rev 18892)
+++ branches/marco/ports/vice/ChangeLog	2008-06-22 19:46:03 UTC (rev 18893)
@@ -1,3 +1,12 @@
+2008-06-22  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.19
+
+2008-06-17  Spiro Trikaliotis  <spi...@gm...>
+
+	* Doxyfile: new file to allow to auto-generate doxygen
+	documentation.
+
 2008-06-15  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.18

Copied: branches/marco/ports/vice/Doxyfile (from rev 18892, tags/v1.22/v1.22.19/vice/Doxyfile)
===================================================================
--- branches/marco/ports/vice/Doxyfile	                        (rev 0)
+++ branches/marco/ports/vice/Doxyfile	2008-06-22 19:46:03 UTC (rev 18893)
@@ -0,0 +1,1163 @@
+# Doxyfile 1.3.9.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = VICE
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = .doxygen/
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of source 
+# files, where putting all generated files in the same directory would otherwise 
+# cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
+# Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# This tag can be used to specify the encoding used in the generated output. 
+# The encoding is not always determined by the language that is chosen, 
+# but also whether or not the output is meant for Windows or non-Windows users. 
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
+# forces the Windows encoding (this is the default for the Windows binary), 
+# whereas setting the tag to NO uses a Unix-style encoding (the default for 
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING   = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is used 
+# as the annotated text. Otherwise, the brief description is used as-is. If left 
+# blank, the following values are used ("$name" is automatically replaced with the 
+# name of the entity): "The $name class" "The $name widget" "The $name file" 
+# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
+# members of a class in the documentation of that class as if those members were 
+# ordinary class members. Constructors, destructors and assignment operators of 
+# the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like the Qt-style comments (thus requiring an 
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
+# only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
+# only. Doxygen will then generate output that is more tailored for Java. 
+# For instance, namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation.
+
+SHOW_DIRECTORIES       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = src/ \
+
+ 
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
+# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
+
+FILE_PATTERNS          = *.c* \
+                         *.h*
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
+# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories.
+
+EXCLUDE_PATTERNS       = */.svn/* 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse the 
+# parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
+# super classes. Setting the tag to NO turns the diagrams off. Note that this 
+# option is superseded by the HAVE_DOT option below. This is only a fallback. It is 
+# recommended to install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu: [18892] trunk/vice

[<st...@us...>]

Revision: 18892
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18892&view=rev
Author:   strik
Date:     2008-06-22 08:27:33 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
More svn:ignore properties (for building Win32 with MingW from Linux).

Property Changed:
----------------
    trunk/vice/build/mingw32/
    trunk/vice/src/
    trunk/vice/src/arch/win32/
    trunk/vice/src/lib/lpng/
    trunk/vice/src/lib/zlib/


Property changes on: trunk/vice/build/mingw32
___________________________________________________________________
Name: svn:ignore
   + source
mingw32-3.4.2-20040916-1



Property changes on: trunk/vice/src
___________________________________________________________________
Name: svn:ignore
   - c1541
cartconv
config.h
config.h.in
.deps
Makefile
Makefile.in
petcat
stamp-h1
translate.c.po.c
translate.h
translate_table.h
x128
x64
xcbm2
xpet
xplus4
xvic

   + c1541
c1541.exe
cartconv
cartconv.exe
config.h
config.h.in
.deps
Makefile
Makefile.in
petcat
petcat.exe
stamp-h1
translate.c.po.c
translate.h
translate_table.h
x128
x128.exe
x64
x64.exe
xcbm2
xcbm2.exe
xpet
xpet.exe
xplus4
xplus4.exe
xvic
xvic.exe



Property changes on: trunk/vice/src/arch/win32
___________________________________________________________________
Name: svn:ignore
   - *.plg
.deps
Debug
libs
Makefile
Makefile.in
menuid.h
res.h
resacia.rc.po.c
resc128.rc.po.c
resc128cat.RES
resc128cat.rc
resc64_256k.rc.po.c
resc64.rc.po.c
resc64cat.RES
resc64cat.rc
rescbm2.rc.po.c
rescbm2cat.RES
rescbm2cat.rc
resdigimax.rc.po.c
resdrivec128.rc.po.c
resdrivec64.rc.po.c
resdrivepetcbm2.rc.po.c
resdriveplus4.rc.po.c
resdrivevic20.rc.po.c
resgeoram.rc.po.c
reside64.rc.po.c
resmmc64.rc.po.c
resmouse.rc.po.c
respet.rc.po.c
respetcat.RES
respetcat.rc
respetreu.rc.po.c
resplus256k.rc.po.c
resplus4.rc.po.c
resplus4cat.RES
resplus4cat.rc
resplus60k.rc.po.c
resramcart.rc.po.c
res.rc.po.c
resreu.rc.po.c
resrs232user.rc.po.c
ressidcart.rc.po.c
ressid.rc.po.c
restfe.rc.po.c
resvic20.rc.po.c
resvic20cat.RES
resvic20cat.rc
resvicii.rc.po.c
vice.ncb
vice.opt

   + *.plg
.deps
Debug
libarch.a
libs
Makefile
Makefile.in
menuid.h
res.h
resacia.rc.po.c
resc128.rc.po.c
resc128cat.RES
resc128cat.rc
resc64_256k.rc.po.c
resc64.rc.po.c
resc64cat.RES
resc64cat.rc
rescbm2.rc.po.c
rescbm2cat.RES
rescbm2cat.rc
resdigimax.rc.po.c
resdrivec128.rc.po.c
resdrivec64.rc.po.c
resdrivepetcbm2.rc.po.c
resdriveplus4.rc.po.c
resdrivevic20.rc.po.c
resgeoram.rc.po.c
reside64.rc.po.c
resmmc64.rc.po.c
resmouse.rc.po.c
respet.rc.po.c
respetcat.RES
respetcat.rc
respetreu.rc.po.c
resplus256k.rc.po.c
resplus4.rc.po.c
resplus4cat.RES
resplus4cat.rc
resplus60k.rc.po.c
resramcart.rc.po.c
res.rc.po.c
resreu.rc.po.c
resrs232user.rc.po.c
ressidcart.rc.po.c
ressid.rc.po.c
restfe.rc.po.c
resvic20.rc.po.c
resvic20cat.RES
resvic20cat.rc
resvicii.rc.po.c
vice.ncb
vice.opt



Property changes on: trunk/vice/src/lib/lpng
___________________________________________________________________
Name: svn:ignore
   - .deps
Makefile
Makefile.in

   + .deps
libpng.a
Makefile
Makefile.in



Property changes on: trunk/vice/src/lib/zlib
___________________________________________________________________
Name: svn:ignore
   - .deps
Makefile
Makefile.in

   + .deps
libz.a
Makefile
Makefile.in



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18891] branches/spiro/v1.22.19-reu/vice/src/c64/reu. c

[<st...@us...>]

Revision: 18891
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18891&view=rev
Author:   strik
Date:     2008-06-22 08:19:36 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Implement the special wrap-around of the 1700 when it uses 64Kx1 DRAMs.
That is, the bank register behaves like the other REUs (with the special
wrap around), but the DRAM access itself is limited to 0x00000-0x1ffff.

Modified Paths:
--------------
    branches/spiro/v1.22.19-reu/vice/src/c64/reu.c

Modified: branches/spiro/v1.22.19-reu/vice/src/c64/reu.c
===================================================================
--- branches/spiro/v1.22.19-reu/vice/src/c64/reu.c	2008-06-22 15:03:44 UTC (rev 18890)
+++ branches/spiro/v1.22.19-reu/vice/src/c64/reu.c	2008-06-22 15:19:36 UTC (rev 18891)
@@ -819,6 +819,7 @@
 inline static
 void store_to_reu(unsigned int reu_addr, BYTE value)
 {
+    reu_addr &= rec_options.special_wrap_around_1700 - 1;
     if (reu_addr < rec_options.not_backedup_addresses) {
         assert(reu_addr < reu_size);
         reu_ram[reu_addr] = value;
@@ -852,6 +853,7 @@
 {
     BYTE value = 0xff; /* dummy value to return if not DRAM is available */
 
+    reu_addr &= rec_options.special_wrap_around_1700 - 1;
     if (reu_addr < rec_options.not_backedup_addresses) {
         assert(reu_addr < reu_size);
         value = reu_ram[reu_addr];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18890] branches/spiro/v1.22.19-reu/

[<st...@us...>]

Revision: 18890
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18890&view=rev
Author:   strik
Date:     2008-06-22 08:03:44 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Continue work on the REU emulation.

Added Paths:
-----------
    branches/spiro/v1.22.19-reu/

Copied: branches/spiro/v1.22.19-reu (from rev 18889, tags/v1.22/v1.22.19)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18889] tags/v1.22/v1.22.19/

[<st...@us...>]

Revision: 18889
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18889&view=rev
Author:   strik
Date:     2008-06-22 07:15:56 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Tagged version 1.22.19\.

Added Paths:
-----------
    tags/v1.22/v1.22.19/

Copied: tags/v1.22/v1.22.19 (from rev 18888, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18888] trunk/vice

[<st...@us...>]

Revision: 18888
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18888&view=rev
Author:   strik
Date:     2008-06-22 07:15:33 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
2008-06-22  Spiro Trikaliotis  <spi...@gm...>

	* Version 1.22.19

Modified Paths:
--------------
    trunk/vice/ChangeLog
    trunk/vice/configure.in
    trunk/vice/po/de.po
    trunk/vice/po/fr.po
    trunk/vice/po/hu.po
    trunk/vice/po/it.po
    trunk/vice/po/nl.po
    trunk/vice/po/pl.po
    trunk/vice/po/sv.po
    trunk/vice/src/ChangeLog
    trunk/vice/src/version.h

Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog	2008-06-22 13:56:33 UTC (rev 18887)
+++ trunk/vice/ChangeLog	2008-06-22 14:15:33 UTC (rev 18888)
@@ -1,3 +1,7 @@
+2008-06-22  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.19
+
 2008-06-17  Spiro Trikaliotis  <spi...@gm...>
 
 	* Doxyfile: new file to allow to auto-generate doxygen

Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in	2008-06-22 13:56:33 UTC (rev 18887)
+++ trunk/vice/configure.in	2008-06-22 14:15:33 UTC (rev 18888)
@@ -9,7 +9,7 @@
 
 VICE_VERSION_MAJOR=1
 VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=18
+VICE_VERSION_BUILD=19
 
 AC_SUBST(VICE_VERSION_MAJOR)
 AC_SUBST(VICE_VERSION_MINOR)

Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po	2008-06-22 13:56:33 UTC (rev 18887)
+++ trunk/vice/po/de.po	2008-06-22 14:15:33 UTC (rev 18888)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-15 16:40+0200\n"
+"POT-Creation-Date: 2008-06-22 16:06+0200\n"
 "PO-Revision-Date: 2008-01-02 16:46+0100\n"
 "Last-Translator: Martin Pottendorfer (pot...@ut...)\n"
 "Language-Team: de <de...@li...>\n"
@@ -95,7 +95,7 @@
 #: src/c64/cart/c64cart.c:288 src/c64/cart/c64cart.c:291
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
-#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
+#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:446
 #: src/c64/tfe.c:1934 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
@@ -882,7 +882,7 @@
 msgid "Specify name of GEORAM image"
 msgstr "GEORAM Image Datei definieren"
 
-#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:249
+#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:448
 #: src/pet/petreu.c:216 src/translate.c.po.c:1130
 msgid "<size in KB>"
 msgstr "<Gr\xF6\xDFe in KB>"
@@ -975,19 +975,19 @@
 msgid "Size of the RAMCART expansion"
 msgstr "Gr\xF6\xDFe der RAMCART Erweiterung"
 
-#: src/c64/reu.c:243 src/translate.c.po.c:1330
+#: src/c64/reu.c:442 src/translate.c.po.c:1330
 msgid "Enable the RAM expansion unit"
 msgstr "RAM Speichererweiterung aktivieren"
 
-#: src/c64/reu.c:245 src/translate.c.po.c:1340
+#: src/c64/reu.c:444 src/translate.c.po.c:1340
 msgid "Disable the RAM expansion unit"
 msgstr "RAM Speichererweiterung deaktivieren"
 
-#: src/c64/reu.c:247 src/translate.c.po.c:1350
+#: src/c64/reu.c:446 src/translate.c.po.c:1350
 msgid "Specify name of REU image"
 msgstr "Namen f\xFCr REU Image Datei definieren"
 
-#: src/c64/reu.c:249 src/translate.c.po.c:1360
+#: src/c64/reu.c:448 src/translate.c.po.c:1360
 msgid "Size of the RAM expansion unit"
 msgstr "Gr\xF6\xDFe der RAM Speichererweiterung"
 

Modified: trunk/vice/po/fr.po
===================================================================
--- trunk/vice/po/fr.po	2008-06-22 13:56:33 UTC (rev 18887)
+++ trunk/vice/po/fr.po	2008-06-22 14:15:33 UTC (rev 18888)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-15 16:40+0200\n"
+"POT-Creation-Date: 2008-06-22 16:06+0200\n"
 "PO-Revision-Date: 2007-07-26 11:57+0200\n"
 "Last-Translator: Paul Dub\xE9 <dub...@gm...>\n"
 "Language-Team: fr <fr...@li...>\n"
@@ -99,7 +99,7 @@
 #: src/c64/cart/c64cart.c:288 src/c64/cart/c64cart.c:291
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
-#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
+#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:446
 #: src/c64/tfe.c:1934 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
@@ -914,7 +914,7 @@
 msgid "Specify name of GEORAM image"
 msgstr "Sp\xE9cifier le nom de l'image GEORAM"
 
-#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:249
+#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:448
 #: src/pet/petreu.c:216 src/translate.c.po.c:1130
 msgid "<size in KB>"
 msgstr "<taille en KO>"
@@ -1018,19 +1018,19 @@
 msgid "Size of the RAMCART expansion"
 msgstr "Taille de l'expansion RAMCART"
 
-#: src/c64/reu.c:243 src/translate.c.po.c:1330
+#: src/c64/reu.c:442 src/translate.c.po.c:1330
 msgid "Enable the RAM expansion unit"
 msgstr "Activer l'unit\xE9 d'expansion RAM"
 
-#: src/c64/reu.c:245 src/translate.c.po.c:1340
+#: src/c64/reu.c:444 src/translate.c.po.c:1340
 msgid "Disable the RAM expansion unit"
 msgstr "D\xE9sactiver l'unit\xE9 d'expansion RAM"
 
-#: src/c64/reu.c:247 src/translate.c.po.c:1350
+#: src/c64/reu.c:446 src/translate.c.po.c:1350
 msgid "Specify name of REU image"
 msgstr "Sp\xE9cifier le nom de l'image REU"
 
-#: src/c64/reu.c:249 src/translate.c.po.c:1360
+#: src/c64/reu.c:448 src/translate.c.po.c:1360
 msgid "Size of the RAM expansion unit"
 msgstr "Taille de l'unit\xE9 d'expansion RAM"
 

Modified: trunk/vice/po/hu.po
===================================================================
--- trunk/vice/po/hu.po	2008-06-22 13:56:33 UTC (rev 18887)
+++ trunk/vice/po/hu.po	2008-06-22 14:15:33 UTC (rev 18888)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-15 16:40+0200\n"
+"POT-Creation-Date: 2008-06-22 16:06+0200\n"
 "PO-Revision-Date: 2007-07-27 15:58+0200\n"
 "Last-Translator: Karai Csaba <cs...@fr...>\n"
 "Language-Team: Hungarian <hu...@li...>\n"
@@ -96,7 +96,7 @@
 #: src/c64/cart/c64cart.c:288 src/c64/cart/c64cart.c:291
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
-#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
+#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:446
 #: src/c64/tfe.c:1934 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
@@ -888,7 +888,7 @@
 msgid "Specify name of GEORAM image"
 msgstr "Adja meg a GEORAM k\xE9pm\xE1s nev\xE9t"
 
-#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:249
+#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:448
 #: src/pet/petreu.c:216 src/translate.c.po.c:1130
 msgid "<size in KB>"
 msgstr "<m\xE9ret KB-ban>"
@@ -981,19 +981,19 @@
 msgid "Size of the RAMCART expansion"
 msgstr "RAMCART b\xF5v\xEDt\xE9s m\xE9rete"
 
-#: src/c64/reu.c:243 src/translate.c.po.c:1330
+#: src/c64/reu.c:442 src/translate.c.po.c:1330
 msgid "Enable the RAM expansion unit"
 msgstr "RAM Expansion Unit enged\xE9lyez\xE9se"
 
-#: src/c64/reu.c:245 src/translate.c.po.c:1340
+#: src/c64/reu.c:444 src/translate.c.po.c:1340
 msgid "Disable the RAM expansion unit"
 msgstr "RAM Expansion Unit tilt\xE1sa"
 
-#: src/c64/reu.c:247 src/translate.c.po.c:1350
+#: src/c64/reu.c:446 src/translate.c.po.c:1350
 msgid "Specify name of REU image"
 msgstr "Adja meg a REU k\xE9pm\xE1s nev\xE9t"
 
-#: src/c64/reu.c:249 src/translate.c.po.c:1360
+#: src/c64/reu.c:448 src/translate.c.po.c:1360
 msgid "Size of the RAM expansion unit"
 msgstr "RAM Expansion Unit m\xE9rete"
 

Modified: trunk/vice/po/it.po
===================================================================
--- trunk/vice/po/it.po	2008-06-22 13:56:33 UTC (rev 18887)
+++ trunk/vice/po/it.po	2008-06-22 14:15:33 UTC (rev 18888)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-15 16:40+0200\n"
+"POT-Creation-Date: 2008-06-22 16:06+0200\n"
 "PO-Revision-Date: 2007-07-28 14:26+0100\n"
 "Last-Translator: Andrea Musuruane <mus...@gm...>\n"
 "Language-Team: it <it...@li...>\n"
@@ -95,7 +95,7 @@
 #: src/c64/cart/c64cart.c:288 src/c64/cart/c64cart.c:291
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
-#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
+#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:446
 #: src/c64/tfe.c:1934 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
@@ -908,7 +908,7 @@
 msgid "Specify name of GEORAM image"
 msgstr "Specifica il nome dell'immagine GEORAM"
 
-#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:249
+#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:448
 #: src/pet/petreu.c:216 src/translate.c.po.c:1130
 msgid "<size in KB>"
 msgstr "<dimensione in KB>"
@@ -1003,19 +1003,19 @@
 msgid "Size of the RAMCART expansion"
 msgstr "Dimensione dell'espansione RAMCART"
 
-#: src/c64/reu.c:243 src/translate.c.po.c:1330
+#: src/c64/reu.c:442 src/translate.c.po.c:1330
 msgid "Enable the RAM expansion unit"
 msgstr "Attiva l'espansione di RAM"
 
-#: src/c64/reu.c:245 src/translate.c.po.c:1340
+#: src/c64/reu.c:444 src/translate.c.po.c:1340
 msgid "Disable the RAM expansion unit"
 msgstr "Disattiva l'espansione di RAM"
 
-#: src/c64/reu.c:247 src/translate.c.po.c:1350
+#: src/c64/reu.c:446 src/translate.c.po.c:1350
 msgid "Specify name of REU image"
 msgstr "Specifica il nome dell'immagine REU"
 
-#: src/c64/reu.c:249 src/translate.c.po.c:1360
+#: src/c64/reu.c:448 src/translate.c.po.c:1360
 msgid "Size of the RAM expansion unit"
 msgstr "Dimensione dell'espansione di RAM"
 

Modified: trunk/vice/po/nl.po
===================================================================
--- trunk/vice/po/nl.po	2008-06-22 13:56:33 UTC (rev 18887)
+++ trunk/vice/po/nl.po	2008-06-22 14:15:33 UTC (rev 18888)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-15 16:40+0200\n"
+"POT-Creation-Date: 2008-06-22 16:06+0200\n"
 "PO-Revision-Date: 2007-07-26 11:57+0200\n"
 "Last-Translator: Marco van den Heuvel <bla...@ya...>\n"
 "Language-Team: nl <nl...@li...>\n"
@@ -95,7 +95,7 @@
 #: src/c64/cart/c64cart.c:288 src/c64/cart/c64cart.c:291
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
-#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
+#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:446
 #: src/c64/tfe.c:1934 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
@@ -884,7 +884,7 @@
 msgid "Specify name of GEORAM image"
 msgstr "Geef de naam van het GEORAM-bestand"
 
-#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:249
+#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:448
 #: src/pet/petreu.c:216 src/translate.c.po.c:1130
 msgid "<size in KB>"
 msgstr "<grootte in KB>"
@@ -977,19 +977,19 @@
 msgid "Size of the RAMCART expansion"
 msgstr "Grootte van de RAMCART-uitbreiding"
 
-#: src/c64/reu.c:243 src/translate.c.po.c:1330
+#: src/c64/reu.c:442 src/translate.c.po.c:1330
 msgid "Enable the RAM expansion unit"
 msgstr "Activeer de RAM-uitbreidingseenheid (REU)"
 
-#: src/c64/reu.c:245 src/translate.c.po.c:1340
+#: src/c64/reu.c:444 src/translate.c.po.c:1340
 msgid "Disable the RAM expansion unit"
 msgstr "De RAM-uitbreidingseenheid (REU) uitschakelen"
 
-#: src/c64/reu.c:247 src/translate.c.po.c:1350
+#: src/c64/reu.c:446 src/translate.c.po.c:1350
 msgid "Specify name of REU image"
 msgstr "Geef de naam van het REU-bestand"
 
-#: src/c64/reu.c:249 src/translate.c.po.c:1360
+#: src/c64/reu.c:448 src/translate.c.po.c:1360
 msgid "Size of the RAM expansion unit"
 msgstr "Grootte van de RAM-uitbreidingseenheid (REU)"
 

Modified: trunk/vice/po/pl.po
===================================================================
--- trunk/vice/po/pl.po	2008-06-22 13:56:33 UTC (rev 18887)
+++ trunk/vice/po/pl.po	2008-06-22 14:15:33 UTC (rev 18888)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-15 16:40+0200\n"
+"POT-Creation-Date: 2008-06-22 16:06+0200\n"
 "PO-Revision-Date: 2007-07-26 11:55+0200\n"
 "Last-Translator: Mariusz M\xB3ynek <fl...@go...>\n"
 "Language-Team: pl <pl...@li...>\n"
@@ -99,7 +99,7 @@
 #: src/c64/cart/c64cart.c:288 src/c64/cart/c64cart.c:291
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
-#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
+#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:446
 #: src/c64/tfe.c:1934 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
@@ -968,7 +968,7 @@
 msgid "Specify name of GEORAM image"
 msgstr "Okre\xB6l nazw\xEA pliku symbolicznej mapy klawiatury"
 
-#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:249
+#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:448
 #: src/pet/petreu.c:216 src/translate.c.po.c:1130
 msgid "<size in KB>"
 msgstr ""
@@ -1077,22 +1077,22 @@
 msgid "Size of the RAMCART expansion"
 msgstr "Rozszerzenie RAM nap\xEAdu #9"
 
-#: src/c64/reu.c:243 src/translate.c.po.c:1330
+#: src/c64/reu.c:442 src/translate.c.po.c:1330
 #, fuzzy
 msgid "Enable the RAM expansion unit"
 msgstr "Jednostka rozszerzenia RAM"
 
-#: src/c64/reu.c:245 src/translate.c.po.c:1340
+#: src/c64/reu.c:444 src/translate.c.po.c:1340
 #, fuzzy
 msgid "Disable the RAM expansion unit"
 msgstr "Rozszerzenie RAM nap\xEAdu #9"
 
-#: src/c64/reu.c:247 src/translate.c.po.c:1350
+#: src/c64/reu.c:446 src/translate.c.po.c:1350
 #, fuzzy
 msgid "Specify name of REU image"
 msgstr "Okre\xB6l nazw\xEA pliku symbolicznej mapy klawiatury"
 
-#: src/c64/reu.c:249 src/translate.c.po.c:1360
+#: src/c64/reu.c:448 src/translate.c.po.c:1360
 #, fuzzy
 msgid "Size of the RAM expansion unit"
 msgstr "Jednostka rozszerzenia RAM"

Modified: trunk/vice/po/sv.po
===================================================================
--- trunk/vice/po/sv.po	2008-06-22 13:56:33 UTC (rev 18887)
+++ trunk/vice/po/sv.po	2008-06-22 14:15:33 UTC (rev 18888)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-15 16:40+0200\n"
+"POT-Creation-Date: 2008-06-22 16:06+0200\n"
 "PO-Revision-Date: 2007-07-30 20:49+0100\n"
 "Last-Translator: Peter Karlsson <pe...@so...>\n"
 "Language-Team: Swedish <tp...@li...>\n"
@@ -94,7 +94,7 @@
 #: src/c64/cart/c64cart.c:288 src/c64/cart/c64cart.c:291
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
-#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
+#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:446
 #: src/c64/tfe.c:1934 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
@@ -879,7 +879,7 @@
 msgid "Specify name of GEORAM image"
 msgstr "Ange namn p\xE5 GEORAM-avbildning"
 
-#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:249
+#: src/c64/georam.c:211 src/c64/ramcart.c:241 src/c64/reu.c:448
 #: src/pet/petreu.c:216 src/translate.c.po.c:1130
 msgid "<size in KB>"
 msgstr "<storlek i KB>"
@@ -972,19 +972,19 @@
 msgid "Size of the RAMCART expansion"
 msgstr "Storlek p\xE5 RAMCART-expansion"
 
-#: src/c64/reu.c:243 src/translate.c.po.c:1330
+#: src/c64/reu.c:442 src/translate.c.po.c:1330
 msgid "Enable the RAM expansion unit"
 msgstr "Aktivera RAM-expansionsenhet"
 
-#: src/c64/reu.c:245 src/translate.c.po.c:1340
+#: src/c64/reu.c:444 src/translate.c.po.c:1340
 msgid "Disable the RAM expansion unit"
 msgstr "Inaktivera RAM-expansionsenhet"
 
-#: src/c64/reu.c:247 src/translate.c.po.c:1350
+#: src/c64/reu.c:446 src/translate.c.po.c:1350
 msgid "Specify name of REU image"
 msgstr "Ange namn p\xE5 REU-avbildning"
 
-#: src/c64/reu.c:249 src/translate.c.po.c:1360
+#: src/c64/reu.c:448 src/translate.c.po.c:1360
 msgid "Size of the RAM expansion unit"
 msgstr "Storlek p\xE5 RAM-expansionsenhet"
 

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-06-22 13:56:33 UTC (rev 18887)
+++ trunk/vice/src/ChangeLog	2008-06-22 14:15:33 UTC (rev 18888)
@@ -1,5 +1,9 @@
 2008-06-22  Spiro Trikaliotis  <spi...@gm...>
 
+	* Version 1.22.19
+
+2008-06-22  Spiro Trikaliotis  <spi...@gm...>
+
 	* c64/c64io.c: Give the full address to the REU module, so that
 	it can decide itself how much memory it occupies in the memory
 	map.

Modified: trunk/vice/src/version.h
===================================================================
--- trunk/vice/src/version.h	2008-06-22 13:56:33 UTC (rev 18887)
+++ trunk/vice/src/version.h	2008-06-22 14:15:33 UTC (rev 18888)
@@ -28,11 +28,11 @@
 #define __VERSION_H__
 
 #ifndef VERSION
-#define VERSION "1.22.18"
+#define VERSION "1.22.19"
 #endif
 
 #ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,18,0
+#define VERSION_RC_NUMBER 1,22,19,0
 #endif
 
 #ifndef PACKAGE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18887] trunk/vice

[<st...@us...>]

Revision: 18887
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18887&view=rev
Author:   strik
Date:     2008-06-22 06:56:33 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
2008-06-22  Spiro Trikaliotis  <spi...@gm...>

	* src/c64/c64io.c: Give the full address to the REU module, so
	that it can decide itself how much memory it occupies in the
	memory map.

	* src/c64/reu.c: Emulate more aspects of the REU now, according
	the Wolfgang Moser's CSG8726 document, revision 0.9. Added
	doxygen information and more fine-granular debugging output.

	* added some svn:ignore properties for cleaner output of "svn
	status"

Revision Links:
--------------
    http://vice-emu.svn.sourceforge.net/vice-emu/?rev=0&view=rev

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/c64/c64io.c
    trunk/vice/src/c64/reu.c
    trunk/vice/src/version.h

Property Changed:
----------------
    trunk/vice/
    trunk/vice/build/
    trunk/vice/data/
    trunk/vice/data/C128/
    trunk/vice/data/C64/
    trunk/vice/data/CBM-II/
    trunk/vice/data/DRIVES/
    trunk/vice/data/PET/
    trunk/vice/data/PLUS4/
    trunk/vice/data/PRINTER/
    trunk/vice/data/VIC20/
    trunk/vice/data/fonts/
    trunk/vice/doc/
    trunk/vice/doc/html/
    trunk/vice/man/
    trunk/vice/po/
    trunk/vice/src/
    trunk/vice/src/arch/
    trunk/vice/src/arch/amigaos/
    trunk/vice/src/arch/beos/
    trunk/vice/src/arch/msdos/
    trunk/vice/src/arch/os2/
    trunk/vice/src/arch/os2/dialogs/
    trunk/vice/src/arch/os2/kbd/
    trunk/vice/src/arch/os2/snippets/
    trunk/vice/src/arch/os2/vac++/
    trunk/vice/src/arch/riscos/
    trunk/vice/src/arch/unix/
    trunk/vice/src/arch/unix/gp2x/
    trunk/vice/src/arch/unix/gui/
    trunk/vice/src/arch/unix/macosx/
    trunk/vice/src/arch/unix/macosx/Resources/
    trunk/vice/src/arch/unix/macosx/Resources/English.lproj/
    trunk/vice/src/arch/unix/macosx/cocoa/
    trunk/vice/src/arch/unix/macosx/cocoa/dialog/
    trunk/vice/src/arch/unix/macosx/cocoa/menu/
    trunk/vice/src/arch/unix/macosx/cocoa/view/
    trunk/vice/src/arch/unix/readline/
    trunk/vice/src/arch/unix/x11/
    trunk/vice/src/arch/unix/x11/gnome/
    trunk/vice/src/arch/unix/x11/xaw/
    trunk/vice/src/arch/unix/x11/xaw/widgets/
    trunk/vice/src/arch/win32/
    trunk/vice/src/arch/win32/msvc/
    trunk/vice/src/arch/win32/utils/
    trunk/vice/src/c128/
    trunk/vice/src/c64/
    trunk/vice/src/c64/cart/
    trunk/vice/src/cbm2/
    trunk/vice/src/core/
    trunk/vice/src/crtc/
    trunk/vice/src/diskimage/
    trunk/vice/src/drive/
    trunk/vice/src/drive/iec/
    trunk/vice/src/drive/iec/c64exp/
    trunk/vice/src/drive/iec/plus4exp/
    trunk/vice/src/drive/iec128dcr/
    trunk/vice/src/drive/iecieee/
    trunk/vice/src/drive/ieee/
    trunk/vice/src/drive/tcbm/
    trunk/vice/src/fileio/
    trunk/vice/src/fsdevice/
    trunk/vice/src/gfxoutputdrv/
    trunk/vice/src/iecbus/
    trunk/vice/src/imagecontents/
    trunk/vice/src/lib/
    trunk/vice/src/lib/lpng/
    trunk/vice/src/lib/zlib/
    trunk/vice/src/monitor/
    trunk/vice/src/parallel/
    trunk/vice/src/pet/
    trunk/vice/src/plus4/
    trunk/vice/src/printerdrv/
    trunk/vice/src/raster/
    trunk/vice/src/resid/
    trunk/vice/src/rs232drv/
    trunk/vice/src/serial/
    trunk/vice/src/sid/
    trunk/vice/src/sounddrv/
    trunk/vice/src/tape/
    trunk/vice/src/vdc/
    trunk/vice/src/vdrive/
    trunk/vice/src/vic20/
    trunk/vice/src/vicii/
    trunk/vice/src/video/


Property changes on: trunk/vice
___________________________________________________________________
Name: svn:ignore
   + aclocal.m4
.aclocal.out
.autoconf.out
.autoheader.out
autom4te.cache
.automake.out
config.log
config.status
config.status.lineno
configure
depcomp
Makefile
Makefile.in
missing



Property changes on: trunk/vice/build
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/data
___________________________________________________________________
Name: svn:ignore
   + c1541.exe
c1541.ilk
c1541.pdb
cartconv.exe
cartconv.ilk
cartconv.pdb
genmsvcver.exe
genmsvcver.ilk
genmsvcver.pdb
gentranslate.exe
gentranslate.ilk
gentranslate.pdb
genwinres.exe
genwinres.ilk
genwinres.pdb
Makefile
Makefile.in
petcat.exe
petcat.ilk
petcat.pdb
vice.ini
vice.log
x128.exe
x128.ilk
x128.pdb
x64.exe
x64.ilk
x64.pdb
xcbm2.exe
xcbm2.ilk
xcbm2.pdb
xpet.exe
xpet.ilk
xpet.pdb
xplus4.exe
xplus4.ilk
xplus4.pdb
xvic.exe
xvic.ilk
xvic.pdb



Property changes on: trunk/vice/data/C128
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/data/C64
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/data/CBM-II
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/data/DRIVES
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/data/PET
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/data/PLUS4
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/data/PRINTER
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/data/VIC20
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/data/fonts
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/doc
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
texinfo.tex



Property changes on: trunk/vice/doc/html
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/man
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/po
___________________________________________________________________
Name: svn:ignore
   + cat-id-tbl.c
de.gmo
fr.gmo
hu.gmo
intl2po
it.gmo
Makefile
Makefile.in
nl.gmo
pl.gmo
POTFILES
stamp-cat-id
sv.gmo
vice.pot



Property changes on: trunk/vice/src
___________________________________________________________________
Name: svn:ignore
   + c1541
cartconv
config.h
config.h.in
.deps
Makefile
Makefile.in
petcat
stamp-h1
translate.c.po.c
translate.h
translate_table.h
x128
x64
xcbm2
xpet
xplus4
xvic


Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-06-22 13:14:28 UTC (rev 18886)
+++ trunk/vice/src/ChangeLog	2008-06-22 13:56:33 UTC (rev 18887)
@@ -1,3 +1,13 @@
+2008-06-22  Spiro Trikaliotis  <spi...@gm...>
+
+	* c64/c64io.c: Give the full address to the REU module, so that
+	it can decide itself how much memory it occupies in the memory
+	map.
+
+	* c64/reu.c: Emulate more aspects of the REU now, according the
+	Wolfgang Moser's CSG8726 document, revision 0.9. Added doxygen
+	information and more fine-granular debugging output.
+
 2008-06-15  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.18


Property changes on: trunk/vice/src/arch
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/amigaos
___________________________________________________________________
Name: svn:ignore
   + .deps
intl.c.po.c
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/beos
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/msdos
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/os2
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/os2/dialogs
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/os2/kbd
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/os2/snippets
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/os2/vac++
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/riscos
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix
___________________________________________________________________
Name: svn:ignore
   + .deps
libarch.a
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/gp2x
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/gui
___________________________________________________________________
Name: svn:ignore
   + .deps
libarchgui.a
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/macosx
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/macosx/Resources
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/macosx/Resources/English.lproj
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/macosx/cocoa
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/macosx/cocoa/dialog
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/macosx/cocoa/menu
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/macosx/cocoa/view
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/readline
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/x11
___________________________________________________________________
Name: svn:ignore
   + .deps
libx11ui.a
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/x11/gnome
___________________________________________________________________
Name: svn:ignore
   + .deps
libgnomeui.a
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/x11/xaw
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/unix/x11/xaw/widgets
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/arch/win32
___________________________________________________________________
Name: svn:ignore
   + *.plg
.deps
Debug
libs
Makefile
Makefile.in
menuid.h
res.h
resacia.rc.po.c
resc128.rc.po.c
resc128cat.RES
resc128cat.rc
resc64_256k.rc.po.c
resc64.rc.po.c
resc64cat.RES
resc64cat.rc
rescbm2.rc.po.c
rescbm2cat.RES
rescbm2cat.rc
resdigimax.rc.po.c
resdrivec128.rc.po.c
resdrivec64.rc.po.c
resdrivepetcbm2.rc.po.c
resdriveplus4.rc.po.c
resdrivevic20.rc.po.c
resgeoram.rc.po.c
reside64.rc.po.c
resmmc64.rc.po.c
resmouse.rc.po.c
respet.rc.po.c
respetcat.RES
respetcat.rc
respetreu.rc.po.c
resplus256k.rc.po.c
resplus4.rc.po.c
resplus4cat.RES
resplus4cat.rc
resplus60k.rc.po.c
resramcart.rc.po.c
res.rc.po.c
resreu.rc.po.c
resrs232user.rc.po.c
ressidcart.rc.po.c
ressid.rc.po.c
restfe.rc.po.c
resvic20.rc.po.c
resvic20cat.RES
resvic20cat.rc
resvicii.rc.po.c
vice.ncb
vice.opt



Property changes on: trunk/vice/src/arch/win32/msvc
___________________________________________________________________
Name: svn:ignore
   + msvc_ver.h



Property changes on: trunk/vice/src/arch/win32/utils
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: trunk/vice/src/c128
___________________________________________________________________
Name: svn:ignore
   + .deps
libc128.a
Makefile
Makefile.in



Property changes on: trunk/vice/src/c64
___________________________________________________________________
Name: svn:ignore
   + .deps
libc64.a
libc64c128.a
Makefile
Makefile.in


Modified: trunk/vice/src/c64/c64io.c
===================================================================
--- trunk/vice/src/c64/c64io.c	2008-06-22 13:14:28 UTC (rev 18886)
+++ trunk/vice/src/c64/c64io.c	2008-06-22 13:56:33 UTC (rev 18887)
@@ -405,7 +405,7 @@
         io_source_counter++;
     }
     if (reu_enabled) {
-        return_value = reu_read((WORD)(addr & 0x0f));
+        return_value = reu_read(addr);
         io_source_check(io_source_counter);
         io_source_counter++;
     }
@@ -473,7 +473,7 @@
         digimax_sound_store((WORD)(addr & 0x03), value);
     }
     if (reu_enabled) {
-        reu_store((WORD)(addr & 0x0f), value);
+        reu_store(addr, value);
     }
     if (georam_enabled && addr >= 0xdf80) {
         georam_reg_store((WORD)(addr & 1), value);


Property changes on: trunk/vice/src/c64/cart
___________________________________________________________________
Name: svn:ignore
   + .deps
libc64cart.a
Makefile
Makefile.in


Modified: trunk/vice/src/c64/reu.c
===================================================================
--- trunk/vice/src/c64/reu.c	2008-06-22 13:14:28 UTC (rev 18886)
+++ trunk/vice/src/c64/reu.c	2008-06-22 13:56:33 UTC (rev 18887)
@@ -1,8 +1,12 @@
-/*
+/*! \file reu.c\n
+ *  \author Andreas Boose, Spiro Trikaliotis, Jouko Valta, Richard Hable, Ettore Perazzoli\n
+ *  \brief   REU emulation.
+ *
  * reu.c - REU emulation.
  *
  * Written by
  *  Andreas Boose <vic...@t-...>
+ *  Spiro Trikaliotis <spi...@gm...>
  * 
  * Based on old code by
  *  Jouko Valta <jo...@st...>
@@ -31,6 +35,7 @@
 
 #include "vice.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -56,9 +61,46 @@
 
 
 /**
-#define REU_DEBUG
-**/
+#define REU_DEBUG 1 /*!< define this if you want to get debugging output for the REU. */
 
+/*! the debug levels to use when REU_DEBUG is defined */
+enum {
+    DEBUG_LEVEL_NONE = 0,              /*!< do not output debugging information */
+    DEBUG_LEVEL_REGISTER,              /*!< output debugging information concerning the REU registers */
+    DEBUG_LEVEL_TRANSFER_HIGH_LEVEL,   /*!< output debugging information on transfers, on a high-level (per operation) */
+    DEBUG_LEVEL_NO_DRAM,               /*!< output debugging information whenever an address is accessed where no DRAM is available  */
+    DEBUG_LEVEL_TRANSFER_LOW_LEVEL     /*!< output debugging information on transfers, on a low-level (per single byte) */
+} debug_level_e;
+
+#ifdef REU_DEBUG
+    /*! dynamically define the debugging level */
+    static enum debug_level_e DEBUG_LEVEL = 0;
+
+    /*! \brief output debugging information
+      \param _level
+         The debugging level on which this data appears
+
+      \param _x
+        The complete log_message parameter, including the braces
+    */
+    #define DEBUG_LOG( _level, _x ) do { if ( _level <= (DEBUG_LEVEL) ) { log_message _x; } } while (0)
+
+#else
+
+    /*! \brief output debugging information
+      \param _level
+         The debugging level on which this data appears
+
+      \param _x
+        The complete log_message parameter, including the braces
+
+      \remark
+        This implementation is the dummy if debugging output is disabled
+    */
+    #define DEBUG_LOG( _level, _x )
+
+#endif
+
 /*
  * Status and Command Registers
  * bit  7       6       5       4       3       2       1       0
@@ -66,36 +108,112 @@
  * 01   Exec    0       Load    Delayed 0       0          Mode
  */
 
-/*
- Offsets of the different REU registers
-*/
-#define REU_REG_R_STATUS         0x00
-#define REU_REG_W_COMMAND        0x01
-#define REU_REG_RW_BASEADDR_LOW  0x02
-#define REU_REG_RW_BASEADDR_HIGH 0x03
-#define REU_REG_RW_RAMADDR_LOW   0x04
-#define REU_REG_RW_RAMADDR_HIGH  0x05
-#define REU_REG_RW_BANK          0x06
-#define REU_REG_RW_BLOCKLEN_LOW  0x07
-#define REU_REG_RW_BLOCKLEN_HIGH 0x08
-#define REU_REG_RW_INTERRUPT     0x09
-#define REU_REG_RW_ADDRCONTROL   0x0A
+/*! Offsets of the different REU registers */
+enum {
+    REU_REG_R_STATUS         = 0x00, /*!< the REU status register */
+    REU_REG_RW_COMMAND       = 0x01, /*!< the REU command register */
+    REU_REG_RW_BASEADDR_LOW  = 0x02, /*!< the REU base low address register (computer side) */
+    REU_REG_RW_BASEADDR_HIGH = 0x03, /*!< the REU base high address register (computer side) */
+    REU_REG_RW_RAMADDR_LOW   = 0x04, /*!< the REU RAM low address register (expansion side) */
+    REU_REG_RW_RAMADDR_HIGH  = 0x05, /*!< the REU RAM high address register (expansion side) */
+    REU_REG_RW_BANK          = 0x06, /*!< the REU RAM bank address register (expansion side) */
+    REU_REG_RW_BLOCKLEN_LOW  = 0x07, /*!< the REU transfer length low register */
+    REU_REG_RW_BLOCKLEN_HIGH = 0x08, /*!< the REU transfer length high register */
+    REU_REG_RW_INTERRUPT     = 0x09, /*!< the REU interrupt register */
+    REU_REG_RW_ADDR_CONTROL  = 0x0A, /*!< the REU address register */
+    REU_REG_RW_UNUSED        = 0x0B, /*!< the first unused REU address. The unused area fills up to REU_REG_LAST_REG */
+    REU_REG_LAST_REG         = 0x1F  /*!< the last register of the REU */
+};
 
+/*! bit definitions for the REU status register at offset REU_REG_R_STATUS */
+enum {
+    REU_REG_R_STATUS_CHIPVERSION_MASK  = 0x0F, /*!< bit mask the extract the chip version no. */
+    REU_REG_R_STATUS_256K_CHIPS        = 0x10, /*!< set if 256K DRAMs (256Kx1) are used (1764, 1750), if unset, 64K DRAMs (64Kx1) are used (1700) */
+    REU_REG_R_STATUS_VERIFY_ERROR      = 0x20, /*!< set if an verify error occurred. Cleared on read. */
+    REU_REG_R_STATUS_END_OF_BLOCK      = 0x40, /*!< set of the operation ended. Cleared on read. */
+    REU_REG_R_STATUS_INTERRUPT_PENDING = 0x80  /*!< set if an interrupt is pending. Cleared on read. */
+};
+
+/*! bit definitions for the REU command register at offset REU_REG_RW_COMMAND */
+enum {
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_MASK    = 0x03,    /*!< bit mask to extract the transfer type */
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_TO_REU     = 0x00, /*!< transfer type is C64 -> REU */
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_FROM_REU   = 0x01, /*!< transfer type is REU -> C64 */
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_SWAP       = 0x02, /*!< transfer type is swap between C64 and REU */
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_VERIFY     = 0x03, /*!< transfer type is verify between C64 and REU */
+    REU_REG_RW_COMMAND_RESERVED_MASK         = 0x4C,    /*!< the bits defined here are writeable, but unused */
+    REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED = 0x10,    /*!< if set, $FF00 trigger is disabled. */
+    REU_REG_RW_COMMAND_AUTOLOAD              = 0x20,    /*!< if set, the address registers should be autoloaded after an operation */
+    REU_REG_RW_COMMAND_EXECUTE               = 0x80     /*!< is set, the specified operation should start. */
+};
+
+/*! bit definitions for the REU bank register at offset REU_REG_RW_BANK */
+enum {
+    REU_REG_RW_BANK_UNUSED = 0xF8  /*!< these bits are unused and always read as 1 */
+};
+
+/*! bit definitions for the REU interrupt register at offset REU_REG_RW_INTERRUPT */
+enum {
+    REU_REG_RW_INTERRUPT_UNUSED_MASK          = 0x1F, /*!< these bits are unused and always read as 1 */
+    REU_REG_RW_INTERRUPT_VERIFY_ENABLED       = 0x20, /*!< if set (and REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED is set, too), generate an interrupt if verify fails */
+    REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED = 0x40, /*!< if set (and REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED is set, too), generate an interrupt if operation finished */
+    REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED   = 0x80  /*!< is set, the REU can generate an interrupt. If unset, no interrupts can be generated */
+};
+
+/*! bit definitions for the REU address control register at offset REU_REG_RW_ADDR_CONTROL */
+enum {
+    REU_REG_RW_ADDR_CONTROL_UNUSED_MASK       = 0x3f, /*!< these bits are unused and always read as 1 */
+    REU_REG_RW_ADDR_CONTROL_FIX_REC           = 0x40, /*!< if set, the REU address is fixed, it does not increment */
+    REU_REG_RW_ADDR_CONTROL_FIX_C64           = 0x80  /*!< if set, the C64 address is fixed, it does not increment */
+};
+
 /* REU registers */
-static BYTE reu[16];
 
-/* shadow registers for implementing the "Half-Autoload-Bug"
-   Thanks to Wolfgang Moser for pointing this out
-*/
-static BYTE reu_baseaddr_low_shadow;
-static BYTE reu_ramaddr_low_shadow;
-static BYTE reu_blocklen_low_shadow;
+/*! define a complete set of REC registers */
+struct rec_s {
+    BYTE status;              /*!< status register at offset REU_REG_R_STATUS */
+    BYTE command;             /*!< command register at offset REU_REG_RW_COMMAND */
 
-/* REU image.  */
+    WORD base_computer;       /*!< C64 base address as defined at offsets REU_REG_RW_BASEADDR_LOW and REU_REG_RW_BASEADDR_HIGH */
+    WORD base_reu;            /*!< REU base address as defined at offsets REU_REG_RW_RAMADDR_LOW and REU_REG_RW_RAMADDR_HIGH */
+    BYTE bank_reu;            /*!< REU bank address as defined at offset REU_REG_RW_BANK */
+    WORD transfer_length;     /*!< transfer length as defined at offsets REU_REG_RW_BLOCKLEN_LOW and REU_REG_RW_BLOCKLEN_HIGH */
+
+    BYTE int_mask_reg;        /*! interrupt mask register as defined at offset REU_REG_RW_INTERRUPT */
+    BYTE address_control_reg; /*! address control register as defined at offset REU_REG_RW_ADDR_CONTROL */
+
+    /* shadow registers for implementing the "Half-Autoload-Bug" */
+
+    WORD base_computer_shadow;   /*!< shadow register of base_computer */
+    WORD base_reu_shadow;        /*!< shadow register of base_reu */
+    WORD transfer_length_shadow; /*!< shadow register of transfer_length */
+};
+
+/*! a complete REC description */
+static struct rec_s rec;
+
+/*! some rec options which define the special behaviour */
+struct rec_options_s {
+    unsigned int wrap_around;                   /*!< address where the REU has a wrap around */
+    unsigned int special_wrap_around_1700;      /*!< address where the special 1700 wrap around occurs; if no 1700, the same avalue as wrap_around */
+    unsigned int not_backedup_addresses;        /*!< beginning from this address up to wrap_around, there is no DRAM at all */
+    unsigned int wrap_around_mask_when_storing; /*!< mask for the wrap around of REU address when putting result back in base_reu and bank_reu */
+    unsigned int reg_bank_unused;               /*!< the unused bits (stuck at 1) of REU_REG_RW_BANK; for original REU, it is REU_REG_RW_BANK_UNUSED */
+    BYTE         status_preset;                 /*!< preset value for the status (can be 0 or REU_REG_R_STATUS_256K_CHIPS) */
+};
+
+/*! a complete REC options description */
+static struct rec_options_s rec_options;
+
+
+
+/*! buffer which holds the REU image.  */
 static BYTE *reu_ram = NULL;
-static int old_reu_ram_size = 0;
+/*! holds the old ram size of reu_ram. Used to determine if and how much of the 
+    buffer has to cleared when resizing the REU. */
+static unsigned int old_reu_ram_size = 0;
 
-static log_t reu_log = LOG_ERR;
+static log_t reu_log = LOG_ERR; /*!< the log output for the REU */
 
 static int reu_activate(void);
 static int reu_deactivate(void);
@@ -104,19 +222,30 @@
 
 /* ------------------------------------------------------------------------- */
 
-/* Flag: Do we enable the external REU?  */
+/*! Flag: Do we enable the external REU?  */
 int reu_enabled;
 
-/* Size of the REU.  */
-static int reu_size = 0;
+/*! Size of the REU.  */
+static unsigned int reu_size = 0;
 
-/* Size of the REU in KB.  */
+/*! Size of the REU in KB.  */
 static int reu_size_kb = 0;
 
-/* Filename of the REU image.  */
+/*! Filename of the REU image.  */
 static char *reu_filename = NULL;
 
 
+/*! \internal set the reu to the enabled or disabled state
+
+ \param val
+   if 0, disable the REU; else, enable it.
+
+ \param param
+   unused
+
+ \return
+   0 on success. else -1.
+*/
 static int set_reu_enabled(int val, void *param)
 {
     if (!val) {
@@ -139,6 +268,20 @@
     }
 }
 
+/*! \internal set the size of the reu
+
+ \param val
+   the size of the REU, in KB
+
+ \param param
+   unused
+
+ \return
+   0 on success, else -1.
+
+ \remark
+   val must be one of 128, 256, 512, 1024, 2048, 4096, 8192, or 16384.
+*/
 static int set_reu_size(int val, void *param)
 {
     if (val == reu_size_kb)
@@ -161,17 +304,62 @@
 
     if (reu_enabled) {
         reu_deactivate();
-        reu_size_kb = val;
-        reu_size = reu_size_kb << 10;
+    }
+
+    reu_size_kb = val;
+    reu_size = reu_size_kb << 10;
+
+    rec_options.wrap_around = 0x80000;
+    rec_options.special_wrap_around_1700 = rec_options.wrap_around;
+    rec_options.not_backedup_addresses = reu_size;
+    rec_options.wrap_around_mask_when_storing = rec_options.wrap_around - 1;
+    rec_options.reg_bank_unused = REU_REG_RW_BANK_UNUSED;
+    rec_options.status_preset = REU_REG_R_STATUS_256K_CHIPS;
+
+    switch (val) {
+      case 128:
+        /* special handling to mimic a 1700 as good as possible */
+        rec_options.status_preset = 0; /* we do not have 256K chips, but only 64K chips */
+        rec_options.special_wrap_around_1700 = 0x20000; /* the 1700 has a special wrap around, mimic that one */
+        break;
+      case 256:
+        /* special handling to mimic a 1764 as good as possible */
+        break;
+      case 512:
+        /* special handling to mimic a 1750 as good as possible */
+        break;
+      default:
+        /* for the other (fictive) REUs, assume the bank register would be fully 8 bits wide */
+        rec_options.wrap_around = 
+        rec_options.special_wrap_around_1700 = 0;
+        rec_options.wrap_around_mask_when_storing = 0xffffffff;
+        rec_options.reg_bank_unused = 0;
+        break;
+    }
+ 
+    if (reu_enabled) {
         reu_activate();
-    } else {
-        reu_size_kb = val;
-        reu_size = reu_size_kb << 10;
     }
 
     return 0;
 }
 
+/*! \internal set the file name of the REU data
+
+ \param name
+   pointer to a buffer which holds the file name.
+   If NULL, the REU data will not be backed on the disk.
+
+ \param param
+   unused
+
+ \return
+   0 on success, else -1.
+
+ \remark
+   The file name of the REU data is the name of the file which is
+   used to store the REU data onto disk.
+*/
 static int set_reu_filename(const char *name, void *param)
 {
     if (reu_filename != NULL && name != NULL
@@ -185,21 +373,24 @@
 
     if (reu_enabled) {
         reu_deactivate();
-        util_string_set(&reu_filename, name);
+    }
+    util_string_set(&reu_filename, name);
+
+    if (reu_enabled) {
         reu_activate();
-    } else {
-        util_string_set(&reu_filename, name);
     }
 
     return 0;
 }
 
+/*! string resources used by the REU module */
 static const resource_string_t resources_string[] = {
     { "REUfilename", "", RES_EVENT_NO, NULL,
       &reu_filename, set_reu_filename, NULL },
     { NULL }
 };
 
+/*! integer resources used by the REU module */
 static const resource_int_t resources_int[] = {
     { "REU", 0, RES_EVENT_STRICT, (resource_value_t)0,
       &reu_enabled, set_reu_enabled, NULL },
@@ -208,6 +399,13 @@
     { NULL }
 };
 
+/*! initialize the reu resources
+ \return
+   0 on success, else -1.
+
+ \remark
+   Registers the string and the integer resources
+*/
 int reu_resources_init(void)
 {
     if (resources_register_string(resources_string) < 0)
@@ -216,6 +414,7 @@
     return resources_register_int(resources_int);
 }
 
+/*! uninitialize the reu resources */
 void reu_resources_shutdown(void)
 {
     lib_free(reu_filename);
@@ -251,6 +450,13 @@
 };
 #endif
 
+/*! initialize the command-line options'
+ \return
+   0 on success, else -1.
+
+ \remark
+   Registers the command-line options
+*/
 int reu_cmdline_options_init(void)
 {
     return cmdline_register_options(cmdline_options);
@@ -258,6 +464,7 @@
 
 /* ------------------------------------------------------------------------- */
 
+/*! initialize the REU */
 void reu_init(void)
 {
     reu_log = log_open("REU");
@@ -265,27 +472,24 @@
     reu_int_num = interrupt_cpu_status_int_new(maincpu_int_status, "REU");
 }
 
+/*! reset the REU */
 void reu_reset(void)
 {
-    int i;
+    memset(&rec, 0, sizeof rec);
 
-    for (i = 0; i < 16; i++)
-        reu[i] = 0;
+    rec.status = (rec.status & ~ REU_REG_R_STATUS_256K_CHIPS) 
+                  | rec_options.status_preset;
 
-    /* clear the shadow registers */
-    reu_baseaddr_low_shadow =
-    reu_ramaddr_low_shadow =
-    reu_blocklen_low_shadow = 0;
+    rec.command = REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED;
 
-    if (reu_size >= (256 << 10))
-        reu[REU_REG_R_STATUS] = 0x10;
-    else
-        reu[REU_REG_R_STATUS] = 0x00;
+    rec.transfer_length =
+    rec.transfer_length_shadow = 0xffff;
 
-    reu[REU_REG_W_COMMAND] = 0x10;
+    rec.bank_reu = rec_options.reg_bank_unused;
 
-    reu[REU_REG_RW_BLOCKLEN_LOW]  = 0xFF;
-    reu[REU_REG_RW_BLOCKLEN_HIGH] = 0xFF;
+    rec.int_mask_reg = REU_REG_RW_INTERRUPT_UNUSED_MASK;
+
+    rec.address_control_reg = REU_REG_RW_ADDR_CONTROL_UNUSED_MASK;
 }
 
 static int reu_activate(void)
@@ -293,7 +497,7 @@
     if (!reu_size)
         return 0;
 
-    reu_ram = (BYTE *)lib_realloc((void *)reu_ram, (size_t)reu_size);
+    reu_ram = lib_realloc(reu_ram, reu_size);
 
     /* Clear newly allocated RAM.  */
     if (reu_size > old_reu_ram_size)
@@ -350,262 +554,553 @@
 }
 
 /* ------------------------------------------------------------------------- */
+/* helper functions */
 
-BYTE REGPARM1 reu_read(WORD addr)
+/*! \brief read the REU register values without side effects
+  This function reads the REU values, so they can be accessed like
+  an array of bytes. No side-effects that would be performed if a real
+  read access would occur are executed.
+
+  \param addr
+    The address of the REC register to read
+
+  \return
+    The value the register has
+
+  \remark
+    address must be in the valid range 0..0x1f
+*/
+static BYTE reu_read_without_sideeffects(WORD addr)
 {
-    BYTE retval;
+    BYTE retval = 0xff;
 
+    assert(addr <= REU_REG_LAST_REG);
+
     switch (addr) {
       case REU_REG_R_STATUS:
-        io_source=IO_SOURCE_REU;
-        retval = reu[REU_REG_R_STATUS];
+        retval = rec.status;
+        break;
 
-        /* Bits 7-5 are cleared when register is read, and pending IRQs are
-           removed. */
-        reu[REU_REG_R_STATUS] &= ~0xe0;
-        maincpu_set_irq(reu_int_num, 0);
+      case REU_REG_RW_COMMAND:
+        retval = rec.command;
         break;
 
+      case REU_REG_RW_BASEADDR_LOW:
+        retval = rec.base_computer & 0xff;
+        break;
+
+      case REU_REG_RW_BASEADDR_HIGH:
+        retval = (rec.base_computer >> 8) & 0xff;
+        break;
+
+      case REU_REG_RW_RAMADDR_LOW:
+        retval = rec.base_reu & 0xff;
+        break;
+
+      case REU_REG_RW_RAMADDR_HIGH:
+        retval = (rec.base_reu >> 8) & 0xff;
+        break;
+
       case REU_REG_RW_BANK:
-        io_source=IO_SOURCE_REU;
-        retval = reu[REU_REG_RW_BANK] | 0xf8;
+        retval = rec.bank_reu | rec_options.reg_bank_unused;
         break;
 
-      case REU_REG_RW_INTERRUPT:
-        io_source=IO_SOURCE_REU;
-        retval = reu[REU_REG_RW_INTERRUPT] | 0x1f;
+      case REU_REG_RW_BLOCKLEN_LOW:
+        retval = rec.transfer_length & 0xff;
         break;
 
-      case REU_REG_RW_ADDRCONTROL:
-        io_source=IO_SOURCE_REU;
-        retval = reu[REU_REG_RW_ADDRCONTROL] | 0x3f;
+      case REU_REG_RW_BLOCKLEN_HIGH:
+        retval = (rec.transfer_length >> 8) & 0xff;
         break;
 
-      case 0xb:
-      case 0xc:
-      case 0xd:
-      case 0xe:
-      case 0xf:
-        retval = 0xff;
+      case REU_REG_RW_INTERRUPT:
+        assert((rec.int_mask_reg & REU_REG_RW_INTERRUPT_UNUSED_MASK) == REU_REG_RW_INTERRUPT_UNUSED_MASK);
+        retval = rec.int_mask_reg;
         break;
 
-      default:
-        io_source=IO_SOURCE_REU;
-        retval = reu[addr];
+      case REU_REG_RW_ADDR_CONTROL:
+        assert((rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_UNUSED_MASK) == REU_REG_RW_ADDR_CONTROL_UNUSED_MASK);
+        retval = rec.address_control_reg;
+        break;
     }
 
-#ifdef REU_DEBUG
-    log_message(reu_log, "read [$%02X] => $%02X.", addr, retval);
-#endif
     return retval;
 }
 
+/*! \brief write the REU register values without side effects
+  This function writes the REU values, so they can be accessed like
+  an array of bytes. No side-effects that would be performed if a real
+  write access would occur are executed.
 
-void REGPARM2 reu_store(WORD addr, BYTE byte)
+  \param addr
+    The address of the REC register to write
+
+  \param byte
+    The value to set the register to
+
+  \remark
+    address must be in the valid range 0..0x1f
+*/
+static void reu_store_without_sideeffects(WORD addr, BYTE byte)
 {
+    assert(addr <= REU_REG_LAST_REG);
+
     switch (addr)
     {
     case REU_REG_R_STATUS:
         /* REC status register is Read Only */
         break;
 
+    case REU_REG_RW_COMMAND:
+        rec.command = byte;
+        break;
+
     case REU_REG_RW_BASEADDR_LOW:
-        /* update shadow register, too */
-        reu_baseaddr_low_shadow =
-        reu[addr] = byte;
+        rec.base_computer = 
+        rec.base_computer_shadow = (rec.base_computer_shadow & 0xff00) | byte;
         break;
 
     case REU_REG_RW_BASEADDR_HIGH:
-        /* also set low register from shadow register */
-        reu[REU_REG_RW_BASEADDR_LOW] = reu_baseaddr_low_shadow;
-        reu[addr] = byte;
+        rec.base_computer = 
+        rec.base_computer_shadow = (rec.base_computer_shadow & 0xff) | (byte << 8);
         break;
 
     case REU_REG_RW_RAMADDR_LOW:
-        /* update shadow register, too */
-        reu_ramaddr_low_shadow =
-        reu[addr] = byte;
+        rec.base_reu =
+        rec.base_reu_shadow = (rec.base_reu_shadow & 0xff00) | byte;
         break;
 
     case REU_REG_RW_RAMADDR_HIGH:
-        /* also set low register from shadow register */
-        reu[REU_REG_RW_RAMADDR_LOW] = reu_ramaddr_low_shadow;
-        reu[addr] = byte;
+        rec.base_reu =
+        rec.base_reu_shadow = (rec.base_reu_shadow & 0xff) | (byte << 8);
         break;
 
+    case REU_REG_RW_BANK:
+        rec.bank_reu = byte;
+        break;
+
     case REU_REG_RW_BLOCKLEN_LOW:
-        /* update shadow register, too */
-        reu_blocklen_low_shadow =
-        reu[addr] = byte;
+        rec.transfer_length =
+        rec.transfer_length_shadow = (rec.transfer_length_shadow & 0xff00) | byte;
         break;
 
     case REU_REG_RW_BLOCKLEN_HIGH:
-        /* also set low register from shadow register */
-        reu[REU_REG_RW_BLOCKLEN_LOW] = reu_blocklen_low_shadow;
-        reu[addr] = byte;
+        rec.transfer_length =
+        rec.transfer_length_shadow = (rec.transfer_length_shadow & 0xff) | (byte << 8);
         break;
 
+    case REU_REG_RW_INTERRUPT:
+        rec.int_mask_reg = byte | REU_REG_RW_INTERRUPT_UNUSED_MASK;
+        break;
+
+    case REU_REG_RW_ADDR_CONTROL:
+        rec.address_control_reg = byte | REU_REG_RW_ADDR_CONTROL_UNUSED_MASK;
+        break;
+
     default:
-        reu[addr] = byte;
+        break;
     }
+}
 
-#ifdef REU_DEBUG
-    log_message(reu_log, "store [$%02X] <= $%02X.", addr, (int)byte);
-#endif
+/* ------------------------------------------------------------------------- */
 
+/*! \brief read the REU register values
+  This function is used to read the REU values from the computer.
+  All side-effects are executed.
+
+  \param addr
+    The address of the REC register to read
+
+  \return
+    The value the register has
+*/
+BYTE REGPARM1 reu_read(WORD addr)
+{
+    BYTE retval;
+
+    addr &= REU_REG_LAST_REG;
+
+    if (addr < REU_REG_RW_UNUSED) {
+        io_source = IO_SOURCE_REU;
+    }
+
+    retval = reu_read_without_sideeffects(addr);
+
+    switch (addr) {
+      case REU_REG_R_STATUS:
+        /* Bits 7-5 are cleared when register is read, and pending IRQs are
+           removed. */
+        rec.status &= 
+            ~(REU_REG_R_STATUS_VERIFY_ERROR 
+              | REU_REG_R_STATUS_END_OF_BLOCK 
+              | REU_REG_R_STATUS_INTERRUPT_PENDING
+             );
+
+        maincpu_set_irq(reu_int_num, 0);
+        break;
+      default:
+        break;
+    }
+
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "read [$%02X] => $%02X.", addr, retval) );
+    return retval;
+}
+
+
+/*! \brief write the REU register values
+  This function is used to write the REU values from the computer.
+
+  \param addr
+    The address of the REC register to write
+
+  \param byte
+    The value to set the register to
+*/
+void REGPARM2 reu_store(WORD addr, BYTE byte)
+{
+    addr &= REU_REG_LAST_REG;
+
+    reu_store_without_sideeffects(addr, byte);
+
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "store [$%02X] <= $%02X.", addr, (int)byte) );
+
     /* write REC command register
      * DMA only if execution bit (7) set  - RH */
-    if ((addr == REU_REG_W_COMMAND) && (byte & 0x80))
-        reu_dma(byte & 0x10);
+    if ((addr == REU_REG_RW_COMMAND) && (rec.command & REU_REG_RW_COMMAND_EXECUTE)) {
+        reu_dma(rec.command & REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED);
+    }
 }
 
 /* ------------------------------------------------------------------------- */
 
+/*! \brief increment the reu address, taking wrap around into account
+  This function increments the reu address by the specified step.
+  If a wrap around should occur, perform it, too.
+
+  \param reu_addr
+     The address to be incremented
+
+  \param reu_step
+     The increment. Must be either 0 or 1. If 0, reu_addr is not changed at all.
+
+  \return
+     The incremented reu_addr, taking into account the wrap-around
+*/
+inline static
+unsigned int increment_reu_with_wrap_around(unsigned int reu_addr, unsigned int reu_step)
+{
+    assert(((reu_step == 0) || (reu_step == 1)));
+
+    reu_addr += reu_step;
+
+    if ( (reu_addr == rec_options.special_wrap_around_1700) 
+        || (reu_addr == rec_options.wrap_around))
+    {
+        reu_addr = 0;
+    }
+
+    return reu_addr;
+}
+
+/*! \brief store a value into the REU
+  This function stores a byte value into the specified location of the REU.
+  It takes into account addresses of the REU not backed up by DRAM.
+
+  \param reu_addr
+     The REU address where to store the value
+
+  \param value
+     The value to write into the REU.
+
+  \remark
+     If the location reu_addr is not backed up by DRAM, the store is simply
+     ignored.
+*/
+inline static
+void store_to_reu(unsigned int reu_addr, BYTE value)
+{
+    if (reu_addr < rec_options.not_backedup_addresses) {
+        assert(reu_addr < reu_size);
+        reu_ram[reu_addr] = value;
+    }
+    else {
+        DEBUG_LOG( DEBUG_LEVEL_NO_DRAM, (reu_log,
+            "--> writing to REU address %05X, but no DRAM!",
+            reu_addr) );
+    }
+}
+
+/*! \brief read a value from the REU
+  This function reads a byte value from the specified location of the REU.
+  It takes into account addresses of the REU not backed up by DRAM.
+
+  \param reu_addr
+     The REU address where to read the value from
+
+  \remark value
+     The value read from the REU.
+
+  \remark
+     If the location reu_addr is not backed up by DRAM, a dummy
+     value is returned.
+  
+  \todo
+     Check the values a real 17xx returns.
+*/
+inline static
+BYTE read_from_reu(unsigned int reu_addr)
+{
+    BYTE value = 0xff; /* dummy value to return if not DRAM is available */
+
+    if (reu_addr < rec_options.not_backedup_addresses) {
+        assert(reu_addr < reu_size);
+        value = reu_ram[reu_addr];
+    }
+    else {
+        DEBUG_LOG( DEBUG_LEVEL_NO_DRAM, (reu_log,
+            "--> read from REU address %05X, but no DRAM!",
+            reu_addr) );
+    }
+
+    return value;
+}
+
+/* ------------------------------------------------------------------------- */
+
+/*! \brief update the REU registers after a DMA operation
+
+  \param host_addr
+    The host (computer) address the operation stopped at
+
+  \param reu_addr
+    The REU address the operation stopped at
+
+  \param len
+    The transfer length the operation stopped at
+
+  \remark
+    if autoload is enabled, nothing is stored in the REU registers.
+*/
 static void reu_dma_update_regs(WORD host_addr, unsigned int reu_addr,
                                 int len)
 {
-    if (!(reu[REU_REG_W_COMMAND] & 0x20)) {
+    reu_addr &= rec_options.wrap_around_mask_when_storing;
+
+    if (!(rec.command & REU_REG_RW_COMMAND_AUTOLOAD)) {
         /* not autoload
          * incr. of addr. disabled, as already pointing to correct addr.
          * address changes only if not fixed, correct reu base registers  -RH
          */
-#ifdef REU_DEBUG
-        log_message(reu_log, "No autoload.");
-#endif
-        if (!(reu[REU_REG_RW_ADDRCONTROL] & 0x80)) {
-            reu[REU_REG_RW_BASEADDR_LOW] = host_addr & 0xff;
-            reu[REU_REG_RW_BASEADDR_HIGH] = (host_addr >> 8) & 0xff;
+        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "No autoload.") );
+        if ( (rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_FIX_C64) == 0) {
+            rec.base_computer = host_addr;
         }
-        if (!(reu[REU_REG_RW_ADDRCONTROL] & 0x40)) {
-            reu[REU_REG_RW_RAMADDR_LOW] = reu_addr & 0xff;
-            reu[REU_REG_RW_RAMADDR_HIGH] = (reu_addr >> 8) & 0xff;
-            reu[REU_REG_RW_BANK] = (reu_addr >> 16);
+
+        if ( (rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_FIX_REC) == 0) {
+            rec.base_reu = reu_addr & 0xffff;
+            rec.bank_reu = (reu_addr >> 16) & 0xff;
         }
 
-        reu[REU_REG_RW_BLOCKLEN_LOW] = len & 0xff;
-        reu[REU_REG_RW_BLOCKLEN_HIGH] = (len >> 8) & 0xff;
+        rec.transfer_length = len;
     }
+    else {
+        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Autoload.") );
+    }
 }
 
+/*! \brief DMA operation writing from the host to the REU
+
+  \param host_addr
+    The host (computer) address where the operation starts 
+
+  \param reu_addr
+    The REU address where the operation starts
+
+  \param host_step
+    The increment to use for the host address; must be either 0 or 1
+
+  \param reu_step
+    The increment to use for the REU address; must be either 0 or 1
+
+  \param len
+    The transfer length of the operation
+*/
 static void reu_dma_host_to_reu(WORD host_addr, unsigned int reu_addr, 
                                 int host_step, int reu_step, int len)
 {
     BYTE value;
-#ifdef REU_DEBUG
-    log_message(reu_log,
+    assert(((host_step == 0) || (host_step == 1)));
+    assert(((reu_step == 0) || (reu_step == 1)));
+    DEBUG_LOG( DEBUG_LEVEL_TRANSFER_HIGH_LEVEL, (reu_log,
                 "copy ext $%05X %s<= main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
-                host_step ? "" : " (fixed)", len, len);
-#endif
+                host_step ? "" : " (fixed)", len, len) );
 
-    for (; len--; reu_addr += reu_step) {
+    for (; len--; reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step)) {
         maincpu_clk++;
         machine_handle_pending_alarms(0);
         value = mem_read(host_addr);
-
-#ifdef REU_DEBUG
-        log_message(reu_log,
+        DEBUG_LOG( DEBUG_LEVEL_TRANSFER_LOW_LEVEL, (reu_log,
                     "Transferring byte: %x from main $%04X to ext $%05X.",
-                    value, host_addr, reu_addr);
-#endif
+                    value, host_addr, reu_addr) );
 
-        reu_ram[reu_addr % reu_size] = value;
+        store_to_reu(reu_addr, value);
         host_addr = (host_addr + host_step) & 0xffff;
     }
     len = 0x1;
-    reu[REU_REG_R_STATUS] |= 0x40;
+    rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
+/*! \brief DMA operation writing from the REU to the host
+
+  \param host_addr
+    The host (computer) address where the operation starts 
+
+  \param reu_addr
+    The REU address where the operation starts
+
+  \param host_step
+    The increment to use for the host address; must be either 0 or 1
+
+  \param reu_step
+    The increment to use for the REU address; must be either 0 or 1
+
+  \param len
+    The transfer length of the operation
+*/
 static void reu_dma_reu_to_host(WORD host_addr, unsigned int reu_addr,
                                 int host_step, int reu_step, int len)
 {
-#ifdef REU_DEBUG
-    log_message(reu_log,
+    BYTE value;
+    DEBUG_LOG( DEBUG_LEVEL_TRANSFER_HIGH_LEVEL, (reu_log,
                 "copy ext $%05X %s=> main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
-                host_step ? "" : " (fixed)", len, len);
-#endif
+                host_step ? "" : " (fixed)", len, len) );
 
-    for (; len--; reu_addr += reu_step) {
-#ifdef REU_DEBUG
-        log_message(reu_log,
+    for (; len--; reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step)) {
+        DEBUG_LOG( DEBUG_LEVEL_TRANSFER_LOW_LEVEL, (reu_log,
                     "Transferring byte: %x from ext $%05X to main $%04X.",
-                    reu_ram[reu_addr % reu_size], reu_addr, host_addr);
-#endif
+                    reu_ram[reu_addr % reu_size], reu_addr, host_addr) );
         maincpu_clk++;
-        mem_store(host_addr, reu_ram[reu_addr % reu_size]);
+        value = read_from_reu(reu_addr);
+        mem_store(host_addr, value);
         machine_handle_pending_alarms(0);
         host_addr = (host_addr + host_step) & 0xffff;
     }
     len = 1;
-    reu[REU_REG_R_STATUS] |= 0x40;
+    rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
+/*! \brief DMA operation swaping data between host and REU
+
+  \param host_addr
+    The host (computer) address where the operation starts 
+
+  \param reu_addr
+    The REU address where the operation starts
+
+  \param host_step
+    The increment to use for the host address; must be either 0 or 1
+
+  \param reu_step
+    The increment to use for the REU address; must be either 0 or 1
+
+  \param len
+    The transfer length of the operation
+*/
 static void reu_dma_swap(WORD host_addr, unsigned int reu_addr,
                          int host_step, int reu_step, int len)
 {
-    BYTE c;
-#ifdef REU_DEBUG
-    log_message(reu_log,
+    BYTE value_from_reu;
+    BYTE value_from_c64;
+    DEBUG_LOG( DEBUG_LEVEL_TRANSFER_HIGH_LEVEL, (reu_log,
                 "swap ext $%05X %s<=> main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
-                host_step ? "" : " (fixed)", len, len);
-#endif
+                host_step ? "" : " (fixed)", len, len) );
 
-    for (; len--; reu_addr += reu_step ) {
-        c = reu_ram[reu_addr % reu_size];
+    for (; len--; reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step) ) {
+        value_from_reu = read_from_reu(reu_addr);
         maincpu_clk++;
         machine_handle_pending_alarms(0);
-        reu_ram[reu_addr % reu_size] = mem_read(host_addr);
-        mem_store(host_addr, c);
+        value_from_c64 = mem_read(host_addr);
+        DEBUG_LOG( DEBUG_LEVEL_TRANSFER_LOW_LEVEL, (reu_log,
+                    "Exchanging bytes: %x from main $%04X with %x from ext $%05X.",
+                    value_from_c64, host_addr, value_from_reu, reu_addr) );
+        store_to_reu(reu_addr, value_from_c64);
+        mem_store(host_addr, value_from_reu);
         maincpu_clk++;
         machine_handle_pending_alarms(0);
         host_addr = (host_addr + host_step) & 0xffff;
     }
     len = 1;
-    reu[REU_REG_R_STATUS] |= 0x40;
+    rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
+/*! \brief DMA operation comparing data between host and REU
+
+  \param host_addr
+    The host (computer) address where the operation starts 
+
+  \param reu_addr
+    The REU address where the operation starts
+
+  \param host_step
+    The increment to use for the host address; must be either 0 or 1
+
+  \param reu_step
+    The increment to use for the REU address; must be either 0 or 1
+
+  \param len
+    The transfer length of the operation
+*/
 static void reu_dma_compare(WORD host_addr, unsigned int reu_addr,
                             int host_step, int reu_step, int len)
 {
-#ifdef REU_DEBUG
-    log_message(reu_log,
+    BYTE value_from_reu;
+    BYTE value_from_c64;
+
+    DEBUG_LOG( DEBUG_LEVEL_TRANSFER_HIGH_LEVEL, (reu_log,
                 "compare ext $%05X %s<=> main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
-                host_step ? "" : " (fixed)", len, len);
-#endif
+                host_step ? "" : " (fixed)", len, len) );
 
-    reu[REU_REG_R_STATUS] &= ~0x60;
+    rec.status &= ~ (REU_REG_R_STATUS_VERIFY_ERROR | REU_REG_R_STATUS_END_OF_BLOCK);
 
     while (len--) {
         maincpu_clk++;
         machine_handle_pending_alarms(0);
-        if (reu_ram[reu_addr % reu_size] != mem_read(host_addr)) {
-            host_addr = (host_addr + host_step) & 0xffff;
-            reu_addr += reu_step;
+        value_from_reu = read_from_reu(reu_addr);
+        value_from_c64 = mem_read(host_addr);
+        DEBUG_LOG( DEBUG_LEVEL_TRANSFER_LOW_LEVEL, (reu_log,
+                    "Comparing bytes: %x from main $%04X with %x from ext $%05X.",
+                    value_from_c64, host_addr, value_from_reu, reu_addr) );
+        reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step);
+        host_addr = (host_addr + host_step) & 0xffff;
+        if (value_from_reu != value_from_c64) {
 
-            reu[REU_REG_R_STATUS] |=  0x20; /* FAULT */
+            DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "VERIFY ERROR") );
+            rec.status |= REU_REG_R_STATUS_VERIFY_ERROR;
 
-            /* Bit 7: interrupt enable
-               Bit 5: interrupt on verify error */
-            if (reu[REU_REG_RW_INTERRUPT] & 0xa0) {
-                reu[REU_REG_R_STATUS] |= 0x80;
+            if (rec.int_mask_reg & (REU_REG_RW_INTERRUPT_VERIFY_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) {
+                DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Verify Interrupt pending") );
+                rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
                 maincpu_set_irq(reu_int_num, 1);
             }
             break;
         }
-        host_addr = (host_addr + host_step) & 0xffff;;
-        reu_addr += reu_step;
     }
 
     if (len < 0) {
         /* all bytes are equal, mark End Of Block */
-        reu[REU_REG_R_STATUS] |= 0x40;
+        rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
         len = 1;
+        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
     }
 
     reu_dma_update_regs(host_addr, reu_addr, len);
@@ -613,90 +1108,119 @@
 
 /* ------------------------------------------------------------------------- */
 
-/* This function is called when write to REC command register or memory
- * location FF00 is detected.
- *
- * If host address exceeds ffff transfer contiues at 0000.
- * If reu address exceeds 7ffff transfer continues at 00000.
- * If address is fixed the same value is used during the whole transfer.
- */
-/* Added correct handling of fixed addresses with transfer length 1  - RH */
-/* Added fixed address support - [EP] */
+/*! \brief perform REU DMA
+ 
+ This function is called when a write to REC command register or memory
+ location FF00 is detected.
 
-void reu_dma(int immed)
+ \param immediate
+   If 0, the DMA should not started immediately. It is only prepared, so it
+   can be executed when the next call to reu_dma() occurs with something different
+   than immediate == 0.
+
+ \remark
+   If the REC command register is written and 
+   REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED is *not* set, this function is called
+   with immediate == 0. In this case, this function is armed for an execution of
+   the DMA as soon as it is called with immediate == -1.\n
+   If the REC command register is written and
+   REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED *is* set, this function is called with
+   immediate == 1. In this case, the DMA is executed immediately.\n
+   If a write to $FF00 is encountered, this function is called with immediate == -1.
+   If it has been previously armed (with immediate == 0), then the DMA operation is
+   executed.
+*/
+void reu_dma(int immediate)
 {
     static int delay = 0;
     int len;
     int reu_step, host_step;
     WORD host_addr;
-    unsigned int reu_addr, reu6_mask;
+    unsigned int reu_addr;
 
     if (!reu_enabled)
         return;
 
-    if (!immed) {
+    if (!immediate) {
         delay = 1;
         return;
     } else {
-        if (!delay && immed < 0)
+        if (!delay && immediate < 0)
             return;
         delay = 0;
     }
 
-    reu6_mask = (reu_size >> 16) - 1;
-
     /* wrong address of bank register & calculations corrected  - RH */
-    host_addr = (WORD)reu[REU_REG_RW_BASEADDR_LOW] 
-                | ((WORD)reu[REU_REG_RW_BASEADDR_HIGH] << 8);
-    reu_addr = ((unsigned int)reu[REU_REG_RW_RAMADDR_LOW]
-               | ((unsigned int)reu[REU_REG_RW_RAMADDR_HIGH] << 8)
-               | (((unsigned int)reu[REU_REG_RW_BANK] & reu6_mask) << 16));
+    host_addr = rec.base_computer;
+    reu_addr = rec.base_reu | (rec.bank_reu << 16);
+    len = rec.transfer_length ? rec.transfer_length : 0x10000;
 
-    len = (int)(reu[REU_REG_RW_BLOCKLEN_LOW])
-          | ((int)(reu[REU_REG_RW_BLOCKLEN_HIGH]) << 8);
-
-    if (len == 0)
-        len = 0x10000;
-
     /* Fixed addresses implemented -- [EP] 04-16-97. */
-    host_step = (reu[REU_REG_RW_ADDRCONTROL] & 0x80) ? 0 : 1;
-    reu_step = (reu[REU_REG_RW_ADDRCONTROL] & 0x40) ? 0 : 1;
+    host_step = rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_FIX_C64 ? 0 : 1;
+    reu_step  = rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_FIX_REC ? 0 : 1;
 
-    switch (reu[REU_REG_W_COMMAND] & 0x03) {
-      case 0:
+    switch (rec.command & REU_REG_RW_COMMAND_TRANSFER_TYPE_MASK) {
+      case REU_REG_RW_COMMAND_TRANSFER_TYPE_TO_REU:
         reu_dma_host_to_reu(host_addr, reu_addr, host_step, reu_step, len);
         break;
-      case 1:
+      case REU_REG_RW_COMMAND_TRANSFER_TYPE_FROM_REU:
         reu_dma_reu_to_host(host_addr, reu_addr, host_step, reu_step, len);
         break;
-      case 2:
+      case REU_REG_RW_COMMAND_TRANSFER_TYPE_SWAP:
         reu_dma_swap(host_addr, reu_addr, host_step, reu_step, len);
         break;
-      case 3:
+      case REU_REG_RW_COMMAND_TRANSFER_TYPE_VERIFY:
         reu_dma_compare(host_addr, reu_addr, host_step, reu_step, len);
         break;
     }
 
-    reu[REU_REG_W_COMMAND] &= 0x7f;
+    rec.command = (rec.command & ~ REU_REG_RW_COMMAND_EXECUTE) 
+                  | REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED;
 
-    /* Bit 7: interrupt enable.  */
-    /* Bit 6: interrupt on end of block */
-    if ((reu[REU_REG_RW_INTERRUPT] & 0xc0) == 0xc0) {
-        reu[REU_REG_R_STATUS] |= 0x80;
+    if ((rec.int_mask_reg 
+            & (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) 
+           == (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED))
+    {
+        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Interrupt pending") );
+        rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
         maincpu_set_irq(reu_int_num, 1);
     }
 }
 
 /* ------------------------------------------------------------------------- */
 
-static char snap_module_name[] = "REU1764";
-#define SNAP_MAJOR 0
-#define SNAP_MINOR 0
+static char snap_module_name[] = "REU1764"; /*!< the name of the module for the snapshot */
+#define SNAP_MAJOR 0 /*!< version number for this module, major number */
+#define SNAP_MINOR 0 /*!< version number for this module, minor number */
 
+/*! \brief type for the REU data as being stored in the snapshot.
+ \remark
+   Here, 16 byte are used (instead of only 11, which would be enough) to be
+   compatible with the original implementation. Otherwise, we would have to
+   change the version number. This way, it is much simpler.
+ */
+typedef BYTE reu_as_stored_in_snapshot_t[16];
+
+/*! \brief write the REU module data to the snapshot
+ \param s
+    The snapshot data where to add the information for this module.
+
+ \return
+    0 on success, else -1.
+*/
 int reu_write_snapshot_module(snapshot_t *s)
 {
     snapshot_module_t *m;
 
+    reu_as_stored_in_snapshot_t reu;
+    WORD reu_address;
+
+    memset(reu, 0xff, sizeof reu);
+
+    for (reu_address = 0; reu_address < sizeof(reu); reu_address++) {
+        reu[reu_address] = reu_read_without_sideeffects(reu_address);
+    }
+
     m = snapshot_module_create(s, snap_module_name, SNAP_MAJOR, SNAP_MINOR);
     if (m == NULL)
         return -1;
@@ -712,12 +1236,24 @@
     return 0;
 }
 
+/*! \brief read the REU module data from the snapshot
+ \param s
+    The snapshot data from where to read the information for this module.
+
+ \return
+    0 on success, else -1.
+ */
 int reu_read_snapshot_module(snapshot_t *s)
 {
     BYTE major_version, minor_version;
     snapshot_module_t *m;
     DWORD size;
 
+    reu_as_stored_in_snapshot_t reu;
+    WORD reu_address;
+
+    memset(reu, 0xff, sizeof reu);
+
     m = snapshot_module_open(s, snap_module_name,
                              &major_version, &minor_version);
     if (m == NULL)
@@ -751,6 +1287,11 @@
     else
         interrupt_restore_irq(maincpu_int_status, reu_int_num, 0);
 
+    for (reu_address = 0; reu_address < sizeof(reu); reu_address++) {
+         reu_store_without_sideeffects(reu_address, reu[reu_address]);
+    }
+
+
     snapshot_module_close(m);
     return 0;
 
@@ -758,4 +1299,3 @@
     snapshot_module_close(m);
     return -1;
 }
-


Property changes on: trunk/vice/src/cbm2
___________________________________________________________________
Name: svn:ignore
   + .deps
libcbm2.a
Makefile
Makefile.in



Property changes on: trunk/vice/src/core
___________________________________________________________________
Name: svn:ignore
   + .deps
libcore.a
Makefile
Makefile.in



Property changes on: trunk/vice/src/crtc
___________________________________________________________________
Name: svn:ignore
   + .deps
libcrtc.a
Makefile
Makefile.in



Property changes on: trunk/vice/src/diskimage
___________________________________________________________________
Name: svn:ignore
   + .deps
libdiskimage.a
Makefile
Makefile.in



Property changes on: trunk/vice/src/drive
___________________________________________________________________
Name: svn:ignore
   + .deps
libdrive.a
Makefile
Makefile.in



Property changes on: trunk/vice/src/driv...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu: [18886] tags/spiro/v1.22.18-reu/

[<st...@us...>]

Revision: 18886
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18886&view=rev
Author:   strik
Date:     2008-06-22 06:14:28 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Tagged REU fixes for merge.

Added Paths:
-----------
    tags/spiro/v1.22.18-reu/

Copied: tags/spiro/v1.22.18-reu (from rev 18885, branches/spiro/vice-1.22.18-reu)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18885] tags/spiro/

[<st...@us...>]

Revision: 18885
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18885&view=rev
Author:   strik
Date:     2008-06-22 06:13:19 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Directory for Spiro's tags.

Added Paths:
-----------
    tags/spiro/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18884] branches/spiro/vice-1.22.18-reu/vice

[<st...@us...>]

Revision: 18884
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18884&view=rev
Author:   strik
Date:     2008-06-22 05:33:57 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Started setting svn:ignore property.

Property Changed:
----------------
    branches/spiro/vice-1.22.18-reu/vice/data/
    branches/spiro/vice-1.22.18-reu/vice/src/
    branches/spiro/vice-1.22.18-reu/vice/src/arch/win32/
    branches/spiro/vice-1.22.18-reu/vice/src/arch/win32/msvc/
    branches/spiro/vice-1.22.18-reu/vice/src/resid/
    branches/spiro/vice-1.22.18-reu/vice/src/sid/


Property changes on: branches/spiro/vice-1.22.18-reu/vice/data
___________________________________________________________________
Name: svn:ignore
   + c1541.exe
c1541.ilk
c1541.pdb
cartconv.exe
cartconv.ilk
cartconv.pdb
genmsvcver.exe
genmsvcver.ilk
genmsvcver.pdb
gentranslate.exe
gentranslate.ilk
gentranslate.pdb
genwinres.exe
genwinres.ilk
genwinres.pdb
petcat.exe
petcat.ilk
petcat.pdb
vice.ini
vice.log
x128.exe
x128.ilk
x128.pdb
x64.exe
x64.ilk
x64.pdb
xcbm2.exe
xcbm2.ilk
xcbm2.pdb
xpet.exe
xpet.ilk
xpet.pdb
xplus4.exe
xplus4.ilk
xplus4.pdb
xvic.exe
xvic.ilk
xvic.pdb



Property changes on: branches/spiro/vice-1.22.18-reu/vice/src
___________________________________________________________________
Name: svn:ignore
   + translate.h
translate_table.h



Property changes on: branches/spiro/vice-1.22.18-reu/vice/src/arch/win32
___________________________________________________________________
Name: svn:ignore
   + *.plg
Debug
libs
menuid.h
res.h
resc128cat.RES
resc128cat.rc
resc64cat.RES
resc64cat.rc
rescbm2cat.RES
rescbm2cat.rc
respetcat.RES
respetcat.rc
resplus4cat.RES
resplus4cat.rc
resvic20cat.RES
resvic20cat.rc
vice.ncb
vice.opt



Property changes on: branches/spiro/vice-1.22.18-reu/vice/src/arch/win32/msvc
___________________________________________________________________
Name: svn:ignore
   + msvc_ver.h



Property changes on: branches/spiro/vice-1.22.18-reu/vice/src/resid
___________________________________________________________________
Name: svn:ignore
   + envelope.cpp
extfilt.cpp
filter.cpp
pot.cpp
sid.cpp
version.cpp
voice.cpp
wave.cpp
wave6581_PST.cpp
wave6581_PS_.cpp
wave6581_P_T.cpp
wave6581__ST.cpp
wave8580_PST.cpp
wave8580_PS_.cpp
wave8580_P_T.cpp
wave8580__ST.cpp



Property changes on: branches/spiro/vice-1.22.18-reu/vice/src/sid
___________________________________________________________________
Name: svn:ignore
   + resid.cpp



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18879] branches/spiro/vice-1.22.18-reu/vice/src/c64/ reu.c

[<st...@us...>]

Revision: 18879
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18879&view=rev
Author:   strik
Date:     2008-06-21 09:30:36 -0700 (Sat, 21 Jun 2008)

Log Message:
-----------
Reactived snapshot writing and reading.

Modified Paths:
--------------
    branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c

Modified: branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c
===================================================================
--- branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c	2008-06-21 15:53:57 UTC (rev 18878)
+++ branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c	2008-06-21 16:30:36 UTC (rev 18879)
@@ -401,30 +401,15 @@
 }
 
 /* ------------------------------------------------------------------------- */
+/* helper functions */
 
-BYTE REGPARM1 reu_read(WORD addr)
+static BYTE reu_read_without_sideeffects(WORD addr)
 {
     BYTE retval = 0xff;
 
-    addr &= REU_REG_LAST_REG;
-
-    if (addr < 0x0b) { /*! \TODO remove magic number! */
-        io_source = IO_SOURCE_REU;
-    }
-
     switch (addr) {
       case REU_REG_R_STATUS:
         retval = rec.status;
-
-        /* Bits 7-5 are cleared when register is read, and pending IRQs are
-           removed. */
-        rec.status &= 
-            ~(REU_REG_R_STATUS_VERIFY_ERROR 
-              | REU_REG_R_STATUS_END_OF_BLOCK 
-              | REU_REG_R_STATUS_INTERRUPT_PENDING
-             );
-
-        maincpu_set_irq(reu_int_num, 0);
         break;
 
       case REU_REG_RW_COMMAND:
@@ -470,17 +455,11 @@
         break;
     }
 
-#ifdef REU_DEBUG
-    log_message(reu_log, "read [$%02X] => $%02X.", addr, retval);
-#endif
     return retval;
 }
 
-
-void REGPARM2 reu_store(WORD addr, BYTE byte)
+static void reu_store_without_sideeffects(WORD addr, BYTE byte)
 {
-    addr &= REU_REG_LAST_REG;
-
     switch (addr)
     {
     case REU_REG_R_STATUS:
@@ -537,8 +516,52 @@
     default:
         break;
     }
+}
 
+/* ------------------------------------------------------------------------- */
+
+BYTE REGPARM1 reu_read(WORD addr)
+{
+    BYTE retval;
+
+    addr &= REU_REG_LAST_REG;
+
+    if (addr < 0x0b) { /*! \TODO remove magic number! */
+        io_source = IO_SOURCE_REU;
+    }
+
+    retval = reu_read_without_sideeffects(addr);
+
+    switch (addr) {
+      case REU_REG_R_STATUS:
+        /* Bits 7-5 are cleared when register is read, and pending IRQs are
+           removed. */
+        rec.status &= 
+            ~(REU_REG_R_STATUS_VERIFY_ERROR 
+              | REU_REG_R_STATUS_END_OF_BLOCK 
+              | REU_REG_R_STATUS_INTERRUPT_PENDING
+             );
+
+        maincpu_set_irq(reu_int_num, 0);
+        break;
+      default:
+        break;
+    }
+
 #ifdef REU_DEBUG
+    log_message(reu_log, "read [$%02X] => $%02X.", addr, retval);
+#endif
+    return retval;
+}
+
+
+void REGPARM2 reu_store(WORD addr, BYTE byte)
+{
+    addr &= REU_REG_LAST_REG;
+
+    reu_store_without_sideeffects(addr, byte);
+
+#ifdef REU_DEBUG
     log_message(reu_log, "store [$%02X] <= $%02X.", addr, (int)byte);
 #endif
 
@@ -775,13 +798,21 @@
 #define SNAP_MAJOR 0
 #define SNAP_MINOR 0
 
+typedef BYTE reu_as_stored_in_snapshot_t[16];
+
 int reu_write_snapshot_module(snapshot_t *s)
 {
     snapshot_module_t *m;
-    BYTE reu[16];
 
+    reu_as_stored_in_snapshot_t reu;
+    WORD reu_address;
+
     memset(reu, 0xff, sizeof reu);
 
+    for (reu_address = 0; reu_address < sizeof(reu); reu_address++) {
+        reu[reu_address] = reu_read_without_sideeffects(reu_address);
+    }
+
     m = snapshot_module_create(s, snap_module_name, SNAP_MAJOR, SNAP_MINOR);
     if (m == NULL)
         return -1;
@@ -802,8 +833,10 @@
     BYTE major_version, minor_version;
     snapshot_module_t *m;
     DWORD size;
-    BYTE reu[16];
 
+    reu_as_stored_in_snapshot_t reu;
+    WORD reu_address;
+
     memset(reu, 0xff, sizeof reu);
 
     m = snapshot_module_open(s, snap_module_name,
@@ -839,8 +872,11 @@
     else
         interrupt_restore_irq(maincpu_int_status, reu_int_num, 0);
 
-    /*! \TODO restore the reu registers */
+    for (reu_address = 0; reu_address < sizeof(reu); reu_address++) {
+         reu_store_without_sideeffects(reu_address, reu[reu_address]);
+    }
 
+
     snapshot_module_close(m);
     return 0;
 
@@ -848,4 +884,3 @@
     snapshot_module_close(m);
     return -1;
 }
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18880] branches/spiro/vice-1.22.18-reu/vice/src/c64/ reu.c

[<st...@us...>]

Revision: 18880
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18880&view=rev
Author:   strik
Date:     2008-06-21 12:52:21 -0700 (Sat, 21 Jun 2008)

Log Message:
-----------
Added doxygen commentary;
implemented wrap-around, but it may be wrong (wording in 8726 document
from Wolfgang Moser is not clear to me).

Modified Paths:
--------------
    branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c

Modified: branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c
===================================================================
--- branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c	2008-06-21 16:30:36 UTC (rev 18879)
+++ branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c	2008-06-21 19:52:21 UTC (rev 18880)
@@ -1,4 +1,7 @@
-/*
+/*! \file reu.c\n
+ *  \author Andreas Boose, Spiro Trikaliotis, Jouko Valta, Richard Hable, Ettore Perazzoli\n
+ *  \brief   REU emulation.
+ *
  * reu.c - REU emulation.
  *
  * Written by
@@ -58,9 +61,12 @@
 
 
 /**
-#define REU_DEBUG
-**/
+#define REU_DEBUG 1 /*!< define this if you want to get debugging output for the REU. */
 
+#ifdef REU_DEBUG
+static int DO_DEBUG = 0;
+#endif
+
 /*
  * Status and Command Registers
  * bit  7       6       5       4       3       2       1       0
@@ -68,87 +74,111 @@
  * 01   Exec    0       Load    Delayed 0       0          Mode
  */
 
-/*
- Offsets of the different REU registers
-*/
+/*! Offsets of the different REU registers */
 enum {
-    REU_REG_R_STATUS         = 0x00,
-    REU_REG_RW_COMMAND       = 0x01,
-    REU_REG_RW_BASEADDR_LOW  = 0x02,
-    REU_REG_RW_BASEADDR_HIGH = 0x03,
-    REU_REG_RW_RAMADDR_LOW   = 0x04,
-    REU_REG_RW_RAMADDR_HIGH  = 0x05,
-    REU_REG_RW_BANK          = 0x06,
-    REU_REG_RW_BLOCKLEN_LOW  = 0x07,
-    REU_REG_RW_BLOCKLEN_HIGH = 0x08,
-    REU_REG_RW_INTERRUPT     = 0x09,
-    REU_REG_RW_ADDR_CONTROL  = 0x0A,
-    REU_REG_LAST_REG         = 0x1F
+    REU_REG_R_STATUS         = 0x00, /*!< the REU status register */
+    REU_REG_RW_COMMAND       = 0x01, /*!< the REU command register */
+    REU_REG_RW_BASEADDR_LOW  = 0x02, /*!< the REU base low address register (computer side) */
+    REU_REG_RW_BASEADDR_HIGH = 0x03, /*!< the REU base high address register (computer side) */
+    REU_REG_RW_RAMADDR_LOW   = 0x04, /*!< the REU RAM low address register (expansion side) */
+    REU_REG_RW_RAMADDR_HIGH  = 0x05, /*!< the REU RAM high address register (expansion side) */
+    REU_REG_RW_BANK          = 0x06, /*!< the REU RAM bank address register (expansion side) */
+    REU_REG_RW_BLOCKLEN_LOW  = 0x07, /*!< the REU transfer length low register */
+    REU_REG_RW_BLOCKLEN_HIGH = 0x08, /*!< the REU transfer length high register */
+    REU_REG_RW_INTERRUPT     = 0x09, /*!< the REU interrupt register */
+    REU_REG_RW_ADDR_CONTROL  = 0x0A, /*!< the REU address register */
+    REU_REG_RW_UNUSED        = 0x0B, /*!< the first unused REU address. The unused area fills up to REU_REG_LAST_REG */
+    REU_REG_LAST_REG         = 0x1F  /*!< the last register of the REU */
 };
 
+/*! bit definitions for the REU status register at offset REU_REG_R_STATUS */
 enum {
-    REU_REG_R_STATUS_CHIPVERSION_MASK  = 0x0F,
-    REU_REG_R_STATUS_64K_CHIPS         = 0x10,
-    REU_REG_R_STATUS_VERIFY_ERROR      = 0x20,
-    REU_REG_R_STATUS_END_OF_BLOCK      = 0x40,
-    REU_REG_R_STATUS_INTERRUPT_PENDING = 0x80
+    REU_REG_R_STATUS_CHIPVERSION_MASK  = 0x0F, /*!< bit mask the extract the chip version no. */
+    REU_REG_R_STATUS_256K_CHIPS        = 0x10, /*!< set if 256K DRAMs (256Kx1) are used (1764, 1750), if unset, 64K DRAMs (64Kx1) are used (1700) */
+    REU_REG_R_STATUS_VERIFY_ERROR      = 0x20, /*!< set if an verify error occurred. Cleared on read. */
+    REU_REG_R_STATUS_END_OF_BLOCK      = 0x40, /*!< set of the operation ended. Cleared on read. */
+    REU_REG_R_STATUS_INTERRUPT_PENDING = 0x80  /*!< set if an interrupt is pending. Cleared on read. */
 };
 
+/*! bit definitions for the REU command register at offset REU_REG_RW_COMMAND */
 enum {
-    REU_REG_RW_COMMAND_TRANSFER_TYPE_MASK    = 0x03,
-    REU_REG_RW_COMMAND_TRANSFER_TYPE_TO_REU     = 0x00,
-    REU_REG_RW_COMMAND_TRANSFER_TYPE_FROM_REU   = 0x01,
-    REU_REG_RW_COMMAND_TRANSFER_TYPE_SWAP       = 0x02,
-    REU_REG_RW_COMMAND_TRANSFER_TYPE_VERIFY     = 0x03,
-    REU_REG_RW_COMMAND_RESERVED_MASK         = 0x4C,
-    REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED = 0x10,
-    REU_REG_RW_COMMAND_AUTOLOAD              = 0x20,
-    REU_REG_RW_COMMAND_EXECUTE               = 0x80
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_MASK    = 0x03,    /*!< bit mask to extract the transfer type */
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_TO_REU     = 0x00, /*!< transfer type is C64 -> REU */
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_FROM_REU   = 0x01, /*!< transfer type is REU -> C64 */
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_SWAP       = 0x02, /*!< transfer type is swap between C64 and REU */
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_VERIFY     = 0x03, /*!< transfer type is verify between C64 and REU */
+    REU_REG_RW_COMMAND_RESERVED_MASK         = 0x4C,    /*!< the bits defined here are writeable, but unused */
+    REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED = 0x10,    /*!< if set, $FF00 trigger is disabled. */
+    REU_REG_RW_COMMAND_AUTOLOAD              = 0x20,    /*!< if set, the address registers should be autoloaded after an operation */
+    REU_REG_RW_COMMAND_EXECUTE               = 0x80     /*!< is set, the specified operation should start. */
 };
 
+/*! bit definitions for the REU bank register at offset REU_REG_RW_BANK */
 enum {
-    REU_REG_RW_INTERRUPT_UNUSED_MASK          = 0x1F,
-    REU_REG_RW_INTERRUPT_VERIFY_ENABLED       = 0x20,
-    REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED = 0x40,
-    REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED   = 0x80
+    REU_REG_RW_BANK_UNUSED = 0xF8  /*!< these bits are unused and always read as 1 */
 };
 
+/*! bit definitions for the REU interrupt register at offset REU_REG_RW_INTERRUPT */
 enum {
-    REU_REG_RW_ADDR_CONTROL_UNUSED_MASK       = 0x3f,
-    REU_REG_RW_ADDR_CONTROL_FIX_REC           = 0x40,
-    REU_REG_RW_ADDR_CONTROL_FIX_C64           = 0x80
+    REU_REG_RW_INTERRUPT_UNUSED_MASK          = 0x1F, /*!< these bits are unused and always read as 1 */
+    REU_REG_RW_INTERRUPT_VERIFY_ENABLED       = 0x20, /*!< if set (and REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED is set, too), generate an interrupt if verify fails */
+    REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED = 0x40, /*!< if set (and REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED is set, too), generate an interrupt if operation finished */
+    REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED   = 0x80  /*!< is set, the REU can generate an interrupt. If unset, no interrupts can be generated */
 };
 
+/*! bit definitions for the REU address control register at offset REU_REG_RW_ADDR_CONTROL */
+enum {
+    REU_REG_RW_ADDR_CONTROL_UNUSED_MASK       = 0x3f, /*!< these bits are unused and always read as 1 */
+    REU_REG_RW_ADDR_CONTROL_FIX_REC           = 0x40, /*!< if set, the REU address is fixed, it does not increment */
+    REU_REG_RW_ADDR_CONTROL_FIX_C64           = 0x80  /*!< if set, the C64 address is fixed, it does not increment */
+};
+
 /* REU registers */
 
-typedef
+/*! define a complete set of REC registers */
 struct rec_s {
-    BYTE status;
-    BYTE command;
+    BYTE status;              /*!< status register at offset REU_REG_R_STATUS */
+    BYTE command;             /*!< command register at offset REU_REG_RW_COMMAND */
 
-    WORD base_computer;
-    WORD base_reu;
-    BYTE bank_reu;
-    WORD transfer_length;
+    WORD base_computer;       /*!< C64 base address as defined at offsets REU_REG_RW_BASEADDR_LOW and REU_REG_RW_BASEADDR_HIGH */
+    WORD base_reu;            /*!< REU base address as defined at offsets REU_REG_RW_RAMADDR_LOW and REU_REG_RW_RAMADDR_HIGH */
+    BYTE bank_reu;            /*!< REU bank address as defined at offset REU_REG_RW_BANK */
+    WORD transfer_length;     /*!< transfer length as defined at offsets REU_REG_RW_BLOCKLEN_LOW and REU_REG_RW_BLOCKLEN_HIGH */
 
-    BYTE int_mask_reg;
-    BYTE address_control_reg;
+    BYTE int_mask_reg;        /*! interrupt mask register as defined at offset REU_REG_RW_INTERRUPT */
+    BYTE address_control_reg; /*! address control register as defined at offset REU_REG_RW_ADDR_CONTROL */
 
     /* shadow registers for implementing the "Half-Autoload-Bug" */
-    WORD base_computer_shadow;
-    WORD base_reu_shadow;
-    BYTE bank_reu_shadow;
-    WORD transfer_length_shadow;
-} rec_t;
 
-static rec_t rec;
+    WORD base_computer_shadow;   /*!< shadow register of base_computer */
+    WORD base_reu_shadow;        /*!< shadow register of base_reu */
+    WORD transfer_length_shadow; /*!< shadow register of transfer_length */
+};
 
+/*! a complete REC description */
+static struct rec_s rec;
 
-/* REU image.  */
+/*! some rec options which define the special behaviour */
+struct rec_options_s {
+    unsigned int wrap_around_mask;              /*!< mask for the wrap around for this REU */
+    unsigned int not_backedup_addresses;        /*!< beginning from this address up to wrap_around, there is no DRAM at all */
+    unsigned int wrap_around_mask_when_storing; /*!< mask for the wrap around of REU address when putting result back in base_reu and bank_reu */
+    unsigned int reg_bank_unused;               /*!< the unused bits (stuck at 1) of REU_REG_RW_BANK; for original REU, it is REU_REG_RW_BANK_UNUSED */
+    BYTE         status_preset;                 /*!< preset value for the status (can be 0 or REU_REG_R_STATUS_256K_CHIPS) */
+};
+
+/*! a complete REC options description */
+static struct rec_options_s rec_options;
+
+
+
+/*! buffer which holds the REU image.  */
 static BYTE *reu_ram = NULL;
+/*! holds the old ram size of reu_ram. Used to determine if and how much of the 
+    buffer has to cleared when resizing the REU. */
 static int old_reu_ram_size = 0;
 
-static log_t reu_log = LOG_ERR;
+static log_t reu_log = LOG_ERR; /*!< the log output for the REU */
 
 static int reu_activate(void);
 static int reu_deactivate(void);
@@ -157,19 +187,30 @@
 
 /* ------------------------------------------------------------------------- */
 
-/* Flag: Do we enable the external REU?  */
+/*! Flag: Do we enable the external REU?  */
 int reu_enabled;
 
-/* Size of the REU.  */
+/*! Size of the REU.  */
 static int reu_size = 0;
 
-/* Size of the REU in KB.  */
+/*! Size of the REU in KB.  */
 static int reu_size_kb = 0;
 
-/* Filename of the REU image.  */
+/*! Filename of the REU image.  */
 static char *reu_filename = NULL;
 
 
+/*! \internal set the reu to the enabled or disabled state
+
+ \param val
+   if 0, disable the REU; else, enable it.
+
+ \param param
+   unused
+
+ \return
+   0 on success. else -1.
+*/
 static int set_reu_enabled(int val, void *param)
 {
     if (!val) {
@@ -192,6 +233,20 @@
     }
 }
 
+/*! \internal set the size of the reu
+
+ \param val
+   the size of the REU, in KB
+
+ \param param
+   unused
+
+ \return
+   0 on success, else -1.
+
+ \remark
+   val must be one of 128, 256, 512, 1024, 2048, 4096, 8192, or 16384.
+*/
 static int set_reu_size(int val, void *param)
 {
     if (val == reu_size_kb)
@@ -214,17 +269,56 @@
 
     if (reu_enabled) {
         reu_deactivate();
-        reu_size_kb = val;
-        reu_size = reu_size_kb << 10;
+    }
+
+    reu_size_kb = val;
+    reu_size = reu_size_kb << 10;
+
+    rec_options.wrap_around_mask = reu_size - 1;
+    rec_options.not_backedup_addresses = reu_size;
+    rec_options.wrap_around_mask_when_storing = rec_options.wrap_around_mask & 0x7ffff;
+    rec_options.reg_bank_unused = REU_REG_RW_BANK_UNUSED;
+    rec_options.status_preset = REU_REG_R_STATUS_256K_CHIPS;
+
+    switch (val) {
+      case 128:
+        /* special handling to mimic a 1700 as good as possible */
+        rec_options.status_preset = 0; /* we do not have 256K chips, but only 64K chips */
+        break;
+      case 256:
+        /* special handling to mimic a 1764 as good as possible */
+        rec_options.wrap_around_mask = (2 * reu_size) - 1;
+        break;
+      case 512:
+        /* special handling to mimic a 1750 as good as possible */
+        break;
+      default:
+        break;
+    }
+ 
+    if (reu_enabled) {
         reu_activate();
-    } else {
-        reu_size_kb = val;
-        reu_size = reu_size_kb << 10;
     }
 
     return 0;
 }
 
+/*! \internal set the file name of the REU data
+
+ \param name
+   pointer to a buffer which holds the file name.
+   If NULL, the REU data will not be backed on the disk.
+
+ \param param
+   unused
+
+ \return
+   0 on success, else -1.
+
+ \remark
+   The file name of the REU data is the name of the file which is
+   used to store the REU data onto disk.
+*/
 static int set_reu_filename(const char *name, void *param)
 {
     if (reu_filename != NULL && name != NULL
@@ -238,21 +332,24 @@
 
     if (reu_enabled) {
         reu_deactivate();
-        util_string_set(&reu_filename, name);
+    }
+    util_string_set(&reu_filename, name);
+
+    if (reu_enabled) {
         reu_activate();
-    } else {
-        util_string_set(&reu_filename, name);
     }
 
     return 0;
 }
 
+/*! string resources used by the REU module */
 static const resource_string_t resources_string[] = {
     { "REUfilename", "", RES_EVENT_NO, NULL,
       &reu_filename, set_reu_filename, NULL },
     { NULL }
 };
 
+/*! integer resources used by the REU module */
 static const resource_int_t resources_int[] = {
     { "REU", 0, RES_EVENT_STRICT, (resource_value_t)0,
       &reu_enabled, set_reu_enabled, NULL },
@@ -261,6 +358,13 @@
     { NULL }
 };
 
+/*! initialize the reu resources
+ \return
+   0 on success, else -1.
+
+ \remark
+   Registers the string and the integer resources
+*/
 int reu_resources_init(void)
 {
     if (resources_register_string(resources_string) < 0)
@@ -269,6 +373,7 @@
     return resources_register_int(resources_int);
 }
 
+/*! uninitialize the reu resources */
 void reu_resources_shutdown(void)
 {
     lib_free(reu_filename);
@@ -304,6 +409,13 @@
 };
 #endif
 
+/*! initialize the command-line options'
+ \return
+   0 on success, else -1.
+
+ \remark
+   Registers the command-line options
+*/
 int reu_cmdline_options_init(void)
 {
     return cmdline_register_options(cmdline_options);
@@ -311,6 +423,7 @@
 
 /* ------------------------------------------------------------------------- */
 
+/*! initialize the REU */
 void reu_init(void)
 {
     reu_log = log_open("REU");
@@ -318,21 +431,20 @@
     reu_int_num = interrupt_cpu_status_int_new(maincpu_int_status, "REU");
 }
 
+/*! reset the REU */
 void reu_reset(void)
 {
     memset(&rec, 0, sizeof rec);
 
-    if (reu_size >= (256 << 10)) {
-        rec.status |= REU_REG_R_STATUS_64K_CHIPS;
-    }
+    rec.status = (rec.status & ~ REU_REG_R_STATUS_256K_CHIPS) 
+                  | rec_options.status_preset;
 
     rec.command = REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED;
 
     rec.transfer_length =
     rec.transfer_length_shadow = 0xffff;
 
-    rec.bank_reu =
-    rec.bank_reu_shadow = 0xf8;
+    rec.bank_reu = rec_options.reg_bank_unused;
 
     rec.int_mask_reg = REU_REG_RW_INTERRUPT_UNUSED_MASK;
 
@@ -344,7 +456,7 @@
     if (!reu_size)
         return 0;
 
-    reu_ram = (BYTE *)lib_realloc((void *)reu_ram, (size_t)reu_size);
+    reu_ram = lib_realloc(reu_ram, reu_size);
 
     /* Clear newly allocated RAM.  */
     if (reu_size > old_reu_ram_size)
@@ -403,10 +515,26 @@
 /* ------------------------------------------------------------------------- */
 /* helper functions */
 
+/*! \brief read the REU register values without side effects
+  This function reads the REU values, so they can be accessed like
+  an array of bytes. No side-effects that would be performed if a real
+  read access would occur are executed.
+
+  \param addr
+    The address of the REC register to read
+
+  \return
+    The value the register has
+
+  \remark
+    address must be in the valid range 0..0x1f
+*/
 static BYTE reu_read_without_sideeffects(WORD addr)
 {
     BYTE retval = 0xff;
 
+    assert(addr <= REU_REG_LAST_REG);
+
     switch (addr) {
       case REU_REG_R_STATUS:
         retval = rec.status;
@@ -429,11 +557,11 @@
         break;
 
       case REU_REG_RW_RAMADDR_HIGH:
-        retval = (rec.bank_reu >> 8) & 0xff;
+        retval = (rec.base_reu >> 8) & 0xff;
         break;
 
       case REU_REG_RW_BANK:
-        retval = rec.bank_reu | 0xf8;
+        retval = rec.bank_reu | rec_options.reg_bank_unused;
         break;
 
       case REU_REG_RW_BLOCKLEN_LOW:
@@ -458,8 +586,24 @@
     return retval;
 }
 
+/*! \brief write the REU register values without side effects
+  This function writes the REU values, so they can be accessed like
+  an array of bytes. No side-effects that would be performed if a real
+  write access would occur are executed.
+
+  \param addr
+    The address of the REC register to write
+
+  \param byte
+    The value to set the register to
+
+  \remark
+    address must be in the valid range 0..0x1f
+*/
 static void reu_store_without_sideeffects(WORD addr, BYTE byte)
 {
+    assert(addr <= REU_REG_LAST_REG);
+
     switch (addr)
     {
     case REU_REG_R_STATUS:
@@ -491,7 +635,6 @@
         break;
 
     case REU_REG_RW_BANK:
-        //! \TODO handle different expansions
         rec.bank_reu = byte;
         break;
 
@@ -520,13 +663,23 @@
 
 /* ------------------------------------------------------------------------- */
 
+/*! \brief read the REU register values
+  This function is used to read the REU values from the computer.
+  All side-effects are executed.
+
+  \param addr
+    The address of the REC register to read
+
+  \return
+    The value the register has
+*/
 BYTE REGPARM1 reu_read(WORD addr)
 {
     BYTE retval;
 
     addr &= REU_REG_LAST_REG;
 
-    if (addr < 0x0b) { /*! \TODO remove magic number! */
+    if (addr < REU_REG_RW_UNUSED) {
         io_source = IO_SOURCE_REU;
     }
 
@@ -549,12 +702,22 @@
     }
 
 #ifdef REU_DEBUG
+    if (DO_DEBUG)
     log_message(reu_log, "read [$%02X] => $%02X.", addr, retval);
 #endif
     return retval;
 }
 
 
+/*! \brief write the REU register values
+  This function is used to write the REU values from the computer.
+
+  \param addr
+    The address of the REC register to write
+
+  \param byte
+    The value to set the register to
+*/
 void REGPARM2 reu_store(WORD addr, BYTE byte)
 {
     addr &= REU_REG_LAST_REG;
@@ -562,28 +725,45 @@
     reu_store_without_sideeffects(addr, byte);
 
 #ifdef REU_DEBUG
+    if (DO_DEBUG)
     log_message(reu_log, "store [$%02X] <= $%02X.", addr, (int)byte);
 #endif
 
     /* write REC command register
      * DMA only if execution bit (7) set  - RH */
-    /*! \BUG What if FF00 option is enabled? */
-    if ((addr == REU_REG_RW_COMMAND) && (rec.command &  REU_REG_RW_COMMAND_EXECUTE)) {
+    if ((addr == REU_REG_RW_COMMAND) && (rec.command & REU_REG_RW_COMMAND_EXECUTE)) {
         reu_dma(rec.command & REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED);
     }
 }
 
 /* ------------------------------------------------------------------------- */
 
+/*! \brief update the REU registers after a DMA operation
+
+  \param host_addr
+    The host (computer) address the operation stopped at
+
+  \param reu_addr
+    The REU address the operation stopped at
+
+  \param len
+    The transfer length the operation stopped at
+
+  \remark
+    if autoload is enabled, nothing is stored in the REU registers.
+*/
 static void reu_dma_update_regs(WORD host_addr, unsigned int reu_addr,
                                 int len)
 {
+    reu_addr &= rec_options.wrap_around_mask_when_storing;
+
     if (!(rec.command & REU_REG_RW_COMMAND_AUTOLOAD)) {
         /* not autoload
          * incr. of addr. disabled, as already pointing to correct addr.
          * address changes only if not fixed, correct reu base registers  -RH
          */
 #ifdef REU_DEBUG
+        if (DO_DEBUG)
         log_message(reu_log, "No autoload.");
 #endif
         if ( (rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_FIX_C64) == 0) {
@@ -592,18 +772,38 @@
 
         if ( (rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_FIX_REC) == 0) {
             rec.base_reu = reu_addr & 0xffff;
-            rec.bank_reu = (reu_addr >> 8) & 0xff;
+            rec.bank_reu = (reu_addr >> 16) & 0xff;
         }
 
         rec.transfer_length = len;
     }
 }
 
+/*! \brief DMA operation writing from the host to the REU
+
+  \param host_addr
+    The host (computer) address where the operation starts 
+
+  \param reu_addr
+    The REU address where the operation starts
+
+  \param host_step
+    The increment to use for the host address; must be either 0 or 1
+
+  \param reu_step
+    The increment to use for the REU address; must be either 0 or 1
+
+  \param len
+    The transfer length of the operation
+*/
 static void reu_dma_host_to_reu(WORD host_addr, unsigned int reu_addr, 
                                 int host_step, int reu_step, int len)
 {
     BYTE value;
+    assert(((host_step == 0) || (host_step == 1)));
+    assert(((reu_step == 0) || (reu_step == 1)));
 #ifdef REU_DEBUG
+    if (DO_DEBUG)
     log_message(reu_log,
                 "copy ext $%05X %s<= main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
@@ -614,14 +814,18 @@
         maincpu_clk++;
         machine_handle_pending_alarms(0);
         value = mem_read(host_addr);
+        reu_addr &= rec_options.wrap_around_mask;
 
 #ifdef REU_DEBUG
+        if (DO_DEBUG)
         log_message(reu_log,
                     "Transferring byte: %x from main $%04X to ext $%05X.",
                     value, host_addr, reu_addr);
 #endif
 
-        reu_ram[reu_addr % reu_size] = value;
+        if (reu_addr < rec_options.not_backedup_addresses) {
+            reu_ram[reu_addr] = value;
+        }
         host_addr = (host_addr + host_step) & 0xffff;
     }
     len = 0x1;
@@ -629,10 +833,29 @@
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
+/*! \brief DMA operation writing from the REU to the host
+
+  \param host_addr
+    The host (computer) address where the operation starts 
+
+  \param reu_addr
+    The REU address where the operation starts
+
+  \param host_step
+    The increment to use for the host address; must be either 0 or 1
+
+  \param reu_step
+    The increment to use for the REU address; must be either 0 or 1
+
+  \param len
+    The transfer length of the operation
+*/
 static void reu_dma_reu_to_host(WORD host_addr, unsigned int reu_addr,
                                 int host_step, int reu_step, int len)
 {
+    BYTE value;
 #ifdef REU_DEBUG
+    if (DO_DEBUG)
     log_message(reu_log,
                 "copy ext $%05X %s=> main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
@@ -641,12 +864,21 @@
 
     for (; len--; reu_addr += reu_step) {
 #ifdef REU_DEBUG
+        if (DO_DEBUG)
         log_message(reu_log,
                     "Transferring byte: %x from ext $%05X to main $%04X.",
                     reu_ram[reu_addr % reu_size], reu_addr, host_addr);
 #endif
         maincpu_clk++;
-        mem_store(host_addr, reu_ram[reu_addr % reu_size]);
+        reu_addr &= rec_options.wrap_around_mask;
+        if (reu_addr < rec_options.not_backedup_addresses) {
+            value = reu_ram[reu_addr];
+        }
+        else {
+            /*! \TODO which values are read by the computer? Assume 0xFF for the moment! */
+            value = 0xff;
+        }
+        mem_store(host_addr, value);
         machine_handle_pending_alarms(0);
         host_addr = (host_addr + host_step) & 0xffff;
     }
@@ -655,11 +887,30 @@
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
+/*! \brief DMA operation swaping data between host and REU
+
+  \param host_addr
+    The host (computer) address where the operation starts 
+
+  \param reu_addr
+    The REU address where the operation starts
+
+  \param host_step
+    The increment to use for the host address; must be either 0 or 1
+
+  \param reu_step
+    The increment to use for the REU address; must be either 0 or 1
+
+  \param len
+    The transfer length of the operation
+*/
 static void reu_dma_swap(WORD host_addr, unsigned int reu_addr,
                          int host_step, int reu_step, int len)
 {
-    BYTE c;
+    BYTE value_from_reu;
+    BYTE value_from_c64;
 #ifdef REU_DEBUG
+    if (DO_DEBUG)
     log_message(reu_log,
                 "swap ext $%05X %s<=> main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
@@ -667,11 +918,21 @@
 #endif
 
     for (; len--; reu_addr += reu_step ) {
-        c = reu_ram[reu_addr % reu_size];
+        reu_addr &= rec_options.wrap_around_mask;
+        if (reu_addr < rec_options.not_backedup_addresses) {
+            value_from_reu = reu_ram[reu_addr];
+        }
+        else {
+            /*! \TODO which values are read by the computer? Assume 0xFF for the moment! */
+            value_from_reu = 0xff;
+        }
         maincpu_clk++;
         machine_handle_pending_alarms(0);
-        reu_ram[reu_addr % reu_size] = mem_read(host_addr);
-        mem_store(host_addr, c);
+        value_from_c64 = mem_read(host_addr);
+        if (reu_addr < rec_options.not_backedup_addresses) {
+            reu_ram[reu_addr] = value_from_c64;
+        }
+        mem_store(host_addr, value_from_reu);
         maincpu_clk++;
         machine_handle_pending_alarms(0);
         host_addr = (host_addr + host_step) & 0xffff;
@@ -681,10 +942,30 @@
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
+/*! \brief DMA operation comparing data between host and REU
+
+  \param host_addr
+    The host (computer) address where the operation starts 
+
+  \param reu_addr
+    The REU address where the operation starts
+
+  \param host_step
+    The increment to use for the host address; must be either 0 or 1
+
+  \param reu_step
+    The increment to use for the REU address; must be either 0 or 1
+
+  \param len
+    The transfer length of the operation
+*/
 static void reu_dma_compare(WORD host_addr, unsigned int reu_addr,
                             int host_step, int reu_step, int len)
 {
+    BYTE value_from_reu;
+
 #ifdef REU_DEBUG
+    if (DO_DEBUG)
     log_message(reu_log,
                 "compare ext $%05X %s<=> main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
@@ -696,7 +977,15 @@
     while (len--) {
         maincpu_clk++;
         machine_handle_pending_alarms(0);
-        if (reu_ram[reu_addr % reu_size] != mem_read(host_addr)) {
+        reu_addr &= rec_options.wrap_around_mask;
+        if (reu_addr < rec_options.not_backedup_addresses) {
+            value_from_reu = reu_ram[reu_addr];
+        }
+        else {
+            /*! \TODO which values are read by the computer? Assume 0xFF for the moment! */
+            value_from_reu = 0xff;
+        }
+        if (value_from_reu != mem_read(host_addr)) {
             host_addr = (host_addr + host_step) & 0xffff;
             reu_addr += reu_step;
 
@@ -723,38 +1012,48 @@
 
 /* ------------------------------------------------------------------------- */
 
-/* This function is called when write to REC command register or memory
- * location FF00 is detected.
- *
- * If host address exceeds ffff transfer contiues at 0000.
- * If reu address exceeds 7ffff transfer continues at 00000.
- * If address is fixed the same value is used during the whole transfer.
- */
-/* Added correct handling of fixed addresses with transfer length 1  - RH */
-/* Added fixed address support - [EP] */
+/*! \brief perform REU DMA
+ 
+ This function is called when a write to REC command register or memory
+ location FF00 is detected.
 
-void reu_dma(int immed)
+ \param immediate
+   If 0, the DMA should not started immediately. It is only prepared, so it
+   can be executed when the next call to reu_dma() occurs with something different
+   than immediate == 0.
+
+ \remark
+   If the REC command register is written and 
+   REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED is *not* set, this function is called
+   with immediate == 0. In this case, this function is armed for an execution of
+   the DMA as soon as it is called with immediate == -1.\n
+   If the REC command register is written and
+   REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED *is* set, this function is called with
+   immediate == 1. In this case, the DMA is executed immediately.\n
+   If a write to $FF00 is encountered, this function is called with immediate == -1.
+   If it has been previously armed (with immediate == 0), then the DMA operation is
+   executed.
+*/
+void reu_dma(int immediate)
 {
     static int delay = 0;
     int len;
     int reu_step, host_step;
     WORD host_addr;
-    unsigned int reu_addr, reu6_mask;
+    unsigned int reu_addr;
 
     if (!reu_enabled)
         return;
 
-    if (!immed) {
+    if (!immediate) {
         delay = 1;
         return;
     } else {
-        if (!delay && immed < 0)
+        if (!delay && immediate < 0)
             return;
         delay = 0;
     }
 
-    reu6_mask = (reu_size >> 16) - 1;
-
     /* wrong address of bank register & calculations corrected  - RH */
     host_addr = rec.base_computer;
     reu_addr = rec.base_reu | (rec.bank_reu << 16);
@@ -779,10 +1078,9 @@
         break;
     }
 
-    rec.command &= ~ REU_REG_RW_COMMAND_EXECUTE;
+    rec.command = (rec.command & ~ REU_REG_RW_COMMAND_EXECUTE) 
+                  | REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED;
 
-    /* Bit 7: interrupt enable.  */
-    /* Bit 6: interrupt on end of block */
     if ((rec.int_mask_reg 
             & (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) 
            == (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED))
@@ -794,12 +1092,25 @@
 
 /* ------------------------------------------------------------------------- */
 
-static char snap_module_name[] = "REU1764";
-#define SNAP_MAJOR 0
-#define SNAP_MINOR 0
+static char snap_module_name[] = "REU1764"; /*!< the name of the module for the snapshot */
+#define SNAP_MAJOR 0 /*!< version number for this module, major number */
+#define SNAP_MINOR 0 /*!< version number for this module, minor number */
 
+/*! \brief type for the REU data as being stored in the snapshot.
+ \remark
+   Here, 16 byte are used (instead of only 11, which would be enough) to be
+   compatible with the original implementation. Otherwise, we would have to
+   change the version number. This way, it is much simpler.
+ */
 typedef BYTE reu_as_stored_in_snapshot_t[16];
 
+/*! \brief write the REU module data to the snapshot
+ \param s
+    The snapshot data where to add the information for this module.
+
+ \return
+    0 on success, else -1.
+*/
 int reu_write_snapshot_module(snapshot_t *s)
 {
     snapshot_module_t *m;
@@ -828,6 +1139,13 @@
     return 0;
 }
 
+/*! \brief read the REU module data from the snapshot
+ \param s
+    The snapshot data from where to read the information for this module.
+
+ \return
+    0 on success, else -1.
+ */
 int reu_read_snapshot_module(snapshot_t *s)
 {
     BYTE major_version, minor_version;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18883] branches/spiro/vice-1.22.18-reu/vice/src/c64/ reu.c

[<st...@us...>]

Revision: 18883
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18883&view=rev
Author:   strik
Date:     2008-06-22 03:21:58 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Fixed wrap-around processing for original 17xx according to Wolfgang
Moser's document, version 0.9;
more fine-granular debugging output available.

Modified Paths:
--------------
    branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c

Modified: branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c
===================================================================
--- branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c	2008-06-22 08:13:27 UTC (rev 18882)
+++ branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c	2008-06-22 10:21:58 UTC (rev 18883)
@@ -63,8 +63,42 @@
 /**
 #define REU_DEBUG 1 /*!< define this if you want to get debugging output for the REU. */
 
+/*! the debug levels to use when REU_DEBUG is defined */
+enum {
+    DEBUG_LEVEL_NONE = 0,              /*!< do not output debugging information */
+    DEBUG_LEVEL_REGISTER,              /*!< output debugging information concerning the REU registers */
+    DEBUG_LEVEL_TRANSFER_HIGH_LEVEL,   /*!< output debugging information on transfers, on a high-level (per operation) */
+    DEBUG_LEVEL_NO_DRAM,               /*!< output debugging information whenever an address is accessed where no DRAM is available  */
+    DEBUG_LEVEL_TRANSFER_LOW_LEVEL     /*!< output debugging information on transfers, on a low-level (per single byte) */
+} debug_level_e;
+
 #ifdef REU_DEBUG
-static int DO_DEBUG = 0;
+    /*! dynamically define the debugging level */
+    static enum debug_level_e DEBUG_LEVEL = 0;
+
+    /*! \brief output debugging information
+      \param _level
+         The debugging level on which this data appears
+
+      \param _x
+        The complete log_message parameter, including the braces
+    */
+    #define DEBUG_LOG( _level, _x ) do { if ( _level <= (DEBUG_LEVEL) ) { log_message _x; } } while (0)
+
+#else
+
+    /*! \brief output debugging information
+      \param _level
+         The debugging level on which this data appears
+
+      \param _x
+        The complete log_message parameter, including the braces
+
+      \remark
+        This implementation is the dummy if debugging output is disabled
+    */
+    #define DEBUG_LOG( _level, _x )
+
 #endif
 
 /*
@@ -160,7 +194,8 @@
 
 /*! some rec options which define the special behaviour */
 struct rec_options_s {
-    unsigned int wrap_around_mask;              /*!< mask for the wrap around for this REU */
+    unsigned int wrap_around;                   /*!< address where the REU has a wrap around */
+    unsigned int special_wrap_around_1700;      /*!< address where the special 1700 wrap around occurs; if no 1700, the same avalue as wrap_around */
     unsigned int not_backedup_addresses;        /*!< beginning from this address up to wrap_around, there is no DRAM at all */
     unsigned int wrap_around_mask_when_storing; /*!< mask for the wrap around of REU address when putting result back in base_reu and bank_reu */
     unsigned int reg_bank_unused;               /*!< the unused bits (stuck at 1) of REU_REG_RW_BANK; for original REU, it is REU_REG_RW_BANK_UNUSED */
@@ -176,7 +211,7 @@
 static BYTE *reu_ram = NULL;
 /*! holds the old ram size of reu_ram. Used to determine if and how much of the 
     buffer has to cleared when resizing the REU. */
-static int old_reu_ram_size = 0;
+static unsigned int old_reu_ram_size = 0;
 
 static log_t reu_log = LOG_ERR; /*!< the log output for the REU */
 
@@ -191,7 +226,7 @@
 int reu_enabled;
 
 /*! Size of the REU.  */
-static int reu_size = 0;
+static unsigned int reu_size = 0;
 
 /*! Size of the REU in KB.  */
 static int reu_size_kb = 0;
@@ -274,9 +309,10 @@
     reu_size_kb = val;
     reu_size = reu_size_kb << 10;
 
-    rec_options.wrap_around_mask = reu_size - 1;
+    rec_options.wrap_around = 0x80000;
+    rec_options.special_wrap_around_1700 = rec_options.wrap_around;
     rec_options.not_backedup_addresses = reu_size;
-    rec_options.wrap_around_mask_when_storing = rec_options.wrap_around_mask & 0x7ffff;
+    rec_options.wrap_around_mask_when_storing = rec_options.wrap_around - 1;
     rec_options.reg_bank_unused = REU_REG_RW_BANK_UNUSED;
     rec_options.status_preset = REU_REG_R_STATUS_256K_CHIPS;
 
@@ -284,15 +320,20 @@
       case 128:
         /* special handling to mimic a 1700 as good as possible */
         rec_options.status_preset = 0; /* we do not have 256K chips, but only 64K chips */
+        rec_options.special_wrap_around_1700 = 0x20000; /* the 1700 has a special wrap around, mimic that one */
         break;
       case 256:
         /* special handling to mimic a 1764 as good as possible */
-        rec_options.wrap_around_mask = (2 * reu_size) - 1;
         break;
       case 512:
         /* special handling to mimic a 1750 as good as possible */
         break;
       default:
+        /* for the other (fictive) REUs, assume the bank register would be fully 8 bits wide */
+        rec_options.wrap_around = 
+        rec_options.special_wrap_around_1700 = 0;
+        rec_options.wrap_around_mask_when_storing = 0xffffffff;
+        rec_options.reg_bank_unused = 0;
         break;
     }
  
@@ -701,10 +742,7 @@
         break;
     }
 
-#ifdef REU_DEBUG
-    if (DO_DEBUG)
-    log_message(reu_log, "read [$%02X] => $%02X.", addr, retval);
-#endif
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "read [$%02X] => $%02X.", addr, retval) );
     return retval;
 }
 
@@ -724,10 +762,7 @@
 
     reu_store_without_sideeffects(addr, byte);
 
-#ifdef REU_DEBUG
-    if (DO_DEBUG)
-    log_message(reu_log, "store [$%02X] <= $%02X.", addr, (int)byte);
-#endif
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "store [$%02X] <= $%02X.", addr, (int)byte) );
 
     /* write REC command register
      * DMA only if execution bit (7) set  - RH */
@@ -738,6 +773,100 @@
 
 /* ------------------------------------------------------------------------- */
 
+/*! \brief increment the reu address, taking wrap around into account
+  This function increments the reu address by the specified step.
+  If a wrap around should occur, perform it, too.
+
+  \param reu_addr
+     The address to be incremented
+
+  \param reu_step
+     The increment. Must be either 0 or 1. If 0, reu_addr is not changed at all.
+
+  \return
+     The incremented reu_addr, taking into account the wrap-around
+*/
+inline static
+unsigned int increment_reu_with_wrap_around(unsigned int reu_addr, unsigned int reu_step)
+{
+    assert(((reu_step == 0) || (reu_step == 1)));
+
+    reu_addr += reu_step;
+
+    if ( (reu_addr == rec_options.special_wrap_around_1700) 
+        || (reu_addr == rec_options.wrap_around))
+    {
+        reu_addr = 0;
+    }
+
+    return reu_addr;
+}
+
+/*! \brief store a value into the REU
+  This function stores a byte value into the specified location of the REU.
+  It takes into account addresses of the REU not backed up by DRAM.
+
+  \param reu_addr
+     The REU address where to store the value
+
+  \param value
+     The value to write into the REU.
+
+  \remark
+     If the location reu_addr is not backed up by DRAM, the store is simply
+     ignored.
+*/
+inline static
+void store_to_reu(unsigned int reu_addr, BYTE value)
+{
+    if (reu_addr < rec_options.not_backedup_addresses) {
+        assert(reu_addr < reu_size);
+        reu_ram[reu_addr] = value;
+    }
+    else {
+        DEBUG_LOG( DEBUG_LEVEL_NO_DRAM, (reu_log,
+            "--> writing to REU address %05X, but no DRAM!",
+            reu_addr) );
+    }
+}
+
+/*! \brief read a value from the REU
+  This function reads a byte value from the specified location of the REU.
+  It takes into account addresses of the REU not backed up by DRAM.
+
+  \param reu_addr
+     The REU address where to read the value from
+
+  \remark value
+     The value read from the REU.
+
+  \remark
+     If the location reu_addr is not backed up by DRAM, a dummy
+     value is returned.
+  
+  \todo
+     Check the values a real 17xx returns.
+*/
+inline static
+BYTE read_from_reu(unsigned int reu_addr)
+{
+    BYTE value = 0xff; /* dummy value to return if not DRAM is available */
+
+    if (reu_addr < rec_options.not_backedup_addresses) {
+        assert(reu_addr < reu_size);
+        value = reu_ram[reu_addr];
+    }
+    else {
+        DEBUG_LOG( DEBUG_LEVEL_NO_DRAM, (reu_log,
+            "--> read from REU address %05X, but no DRAM!",
+            reu_addr) );
+    }
+
+    return value;
+}
+
+/* ------------------------------------------------------------------------- */
+
 /*! \brief update the REU registers after a DMA operation
 
   \param host_addr
@@ -762,10 +891,7 @@
          * incr. of addr. disabled, as already pointing to correct addr.
          * address changes only if not fixed, correct reu base registers  -RH
          */
-#ifdef REU_DEBUG
-        if (DO_DEBUG)
-        log_message(reu_log, "No autoload.");
-#endif
+        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "No autoload.") );
         if ( (rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_FIX_C64) == 0) {
             rec.base_computer = host_addr;
         }
@@ -777,6 +903,9 @@
 
         rec.transfer_length = len;
     }
+    else {
+        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Autoload.") );
+    }
 }
 
 /*! \brief DMA operation writing from the host to the REU
@@ -802,34 +931,25 @@
     BYTE value;
     assert(((host_step == 0) || (host_step == 1)));
     assert(((reu_step == 0) || (reu_step == 1)));
-#ifdef REU_DEBUG
-    if (DO_DEBUG)
-    log_message(reu_log,
+    DEBUG_LOG( DEBUG_LEVEL_TRANSFER_HIGH_LEVEL, (reu_log,
                 "copy ext $%05X %s<= main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
-                host_step ? "" : " (fixed)", len, len);
-#endif
+                host_step ? "" : " (fixed)", len, len) );
 
-    for (; len--; reu_addr += reu_step) {
+    for (; len--; reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step)) {
         maincpu_clk++;
         machine_handle_pending_alarms(0);
         value = mem_read(host_addr);
-        reu_addr &= rec_options.wrap_around_mask;
-
-#ifdef REU_DEBUG
-        if (DO_DEBUG)
-        log_message(reu_log,
+        DEBUG_LOG( DEBUG_LEVEL_TRANSFER_LOW_LEVEL, (reu_log,
                     "Transferring byte: %x from main $%04X to ext $%05X.",
-                    value, host_addr, reu_addr);
-#endif
+                    value, host_addr, reu_addr) );
 
-        if (reu_addr < rec_options.not_backedup_addresses) {
-            reu_ram[reu_addr] = value;
-        }
+        store_to_reu(reu_addr, value);
         host_addr = (host_addr + host_step) & 0xffff;
     }
     len = 0x1;
     rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
@@ -854,36 +974,24 @@
                                 int host_step, int reu_step, int len)
 {
     BYTE value;
-#ifdef REU_DEBUG
-    if (DO_DEBUG)
-    log_message(reu_log,
+    DEBUG_LOG( DEBUG_LEVEL_TRANSFER_HIGH_LEVEL, (reu_log,
                 "copy ext $%05X %s=> main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
-                host_step ? "" : " (fixed)", len, len);
-#endif
+                host_step ? "" : " (fixed)", len, len) );
 
-    for (; len--; reu_addr += reu_step) {
-#ifdef REU_DEBUG
-        if (DO_DEBUG)
-        log_message(reu_log,
+    for (; len--; reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step)) {
+        DEBUG_LOG( DEBUG_LEVEL_TRANSFER_LOW_LEVEL, (reu_log,
                     "Transferring byte: %x from ext $%05X to main $%04X.",
-                    reu_ram[reu_addr % reu_size], reu_addr, host_addr);
-#endif
+                    reu_ram[reu_addr % reu_size], reu_addr, host_addr) );
         maincpu_clk++;
-        reu_addr &= rec_options.wrap_around_mask;
-        if (reu_addr < rec_options.not_backedup_addresses) {
-            value = reu_ram[reu_addr];
-        }
-        else {
-            /*! \TODO which values are read by the computer? Assume 0xFF for the moment! */
-            value = 0xff;
-        }
+        value = read_from_reu(reu_addr);
         mem_store(host_addr, value);
         machine_handle_pending_alarms(0);
         host_addr = (host_addr + host_step) & 0xffff;
     }
     len = 1;
     rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
@@ -909,29 +1017,20 @@
 {
     BYTE value_from_reu;
     BYTE value_from_c64;
-#ifdef REU_DEBUG
-    if (DO_DEBUG)
-    log_message(reu_log,
+    DEBUG_LOG( DEBUG_LEVEL_TRANSFER_HIGH_LEVEL, (reu_log,
                 "swap ext $%05X %s<=> main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
-                host_step ? "" : " (fixed)", len, len);
-#endif
+                host_step ? "" : " (fixed)", len, len) );
 
-    for (; len--; reu_addr += reu_step ) {
-        reu_addr &= rec_options.wrap_around_mask;
-        if (reu_addr < rec_options.not_backedup_addresses) {
-            value_from_reu = reu_ram[reu_addr];
-        }
-        else {
-            /*! \TODO which values are read by the computer? Assume 0xFF for the moment! */
-            value_from_reu = 0xff;
-        }
+    for (; len--; reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step) ) {
+        value_from_reu = read_from_reu(reu_addr);
         maincpu_clk++;
         machine_handle_pending_alarms(0);
         value_from_c64 = mem_read(host_addr);
-        if (reu_addr < rec_options.not_backedup_addresses) {
-            reu_ram[reu_addr] = value_from_c64;
-        }
+        DEBUG_LOG( DEBUG_LEVEL_TRANSFER_LOW_LEVEL, (reu_log,
+                    "Exchanging bytes: %x from main $%04X with %x from ext $%05X.",
+                    value_from_c64, host_addr, value_from_reu, reu_addr) );
+        store_to_reu(reu_addr, value_from_c64);
         mem_store(host_addr, value_from_reu);
         maincpu_clk++;
         machine_handle_pending_alarms(0);
@@ -939,6 +1038,7 @@
     }
     len = 1;
     rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
+    DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
@@ -963,48 +1063,44 @@
                             int host_step, int reu_step, int len)
 {
     BYTE value_from_reu;
+    BYTE value_from_c64;
 
-#ifdef REU_DEBUG
-    if (DO_DEBUG)
-    log_message(reu_log,
+    DEBUG_LOG( DEBUG_LEVEL_TRANSFER_HIGH_LEVEL, (reu_log,
                 "compare ext $%05X %s<=> main $%04X%s, $%04X (%d) bytes.",
                 reu_addr, reu_step ? "" : "(fixed) ", host_addr,
-                host_step ? "" : " (fixed)", len, len);
-#endif
+                host_step ? "" : " (fixed)", len, len) );
 
     rec.status &= ~ (REU_REG_R_STATUS_VERIFY_ERROR | REU_REG_R_STATUS_END_OF_BLOCK);
 
     while (len--) {
         maincpu_clk++;
         machine_handle_pending_alarms(0);
-        reu_addr &= rec_options.wrap_around_mask;
-        if (reu_addr < rec_options.not_backedup_addresses) {
-            value_from_reu = reu_ram[reu_addr];
-        }
-        else {
-            /*! \TODO which values are read by the computer? Assume 0xFF for the moment! */
-            value_from_reu = 0xff;
-        }
-        if (value_from_reu != mem_read(host_addr)) {
-            host_addr = (host_addr + host_step) & 0xffff;
-            reu_addr += reu_step;
+        value_from_reu = read_from_reu(reu_addr);
+        value_from_c64 = mem_read(host_addr);
+        DEBUG_LOG( DEBUG_LEVEL_TRANSFER_LOW_LEVEL, (reu_log,
+                    "Comparing bytes: %x from main $%04X with %x from ext $%05X.",
+                    value_from_c64, host_addr, value_from_reu, reu_addr) );
+        reu_addr = increment_reu_with_wrap_around(reu_addr, reu_step);
+        host_addr = (host_addr + host_step) & 0xffff;
+        if (value_from_reu != value_from_c64) {
 
+            DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "VERIFY ERROR") );
             rec.status |= REU_REG_R_STATUS_VERIFY_ERROR;
 
-            if (rec.int_mask_reg & (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) {
+            if (rec.int_mask_reg & (REU_REG_RW_INTERRUPT_VERIFY_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) {
+                DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Verify Interrupt pending") );
                 rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
                 maincpu_set_irq(reu_int_num, 1);
             }
             break;
         }
-        host_addr = (host_addr + host_step) & 0xffff;;
-        reu_addr += reu_step;
     }
 
     if (len < 0) {
         /* all bytes are equal, mark End Of Block */
         rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
         len = 1;
+        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
     }
 
     reu_dma_update_regs(host_addr, reu_addr, len);
@@ -1085,6 +1181,7 @@
             & (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) 
            == (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED))
     {
+        DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Interrupt pending") );
         rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
         maincpu_set_irq(reu_int_num, 1);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18877] branches/marco/ports/vice/src/plus4/plus4mem. c

[<bla...@us...>]

Revision: 18877
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18877&view=rev
Author:   blackystardust
Date:     2008-06-20 19:25:26 -0700 (Fri, 20 Jun 2008)

Log Message:
-----------
Fixed plus4  rom store.

Modified Paths:
--------------
    branches/marco/ports/vice/src/plus4/plus4mem.c

Modified: branches/marco/ports/vice/src/plus4/plus4mem.c
===================================================================
--- branches/marco/ports/vice/src/plus4/plus4mem.c	2008-06-20 02:29:47 UTC (rev 18876)
+++ branches/marco/ports/vice/src/plus4/plus4mem.c	2008-06-21 02:25:26 UTC (rev 18877)
@@ -571,6 +571,24 @@
     }
 }
 
+static void REGPARM2 h256k_rom_ffxx_store(WORD addr, BYTE value)
+{
+    if (addr < 0xff20 || addr == 0xff3e || addr == 0xff3f) {
+        ted_store(addr, value);
+    } else {
+        h256k_store(addr, value);
+    }
+}
+
+static void REGPARM2 cs256k_rom_ffxx_store(WORD addr, BYTE value)
+{
+    if (addr < 0xff20 || addr == 0xff3e || addr == 0xff3f) {
+        ted_store(addr, value);
+    } else {
+        cs256k_store(addr, value);
+    }
+}
+
 static void REGPARM2 rom_ffxx_store_32k(WORD addr, BYTE value)
 {
     if (addr < 0xff20 || addr == 0xff3e || addr == 0xff3f) {
@@ -808,14 +826,15 @@
             if (h256k_enabled) {
               mem_read_tab[i + 0][0xff] = h256k_ram_ffxx_read;
               mem_write_tab[i + 0][0xff] = h256k_ram_ffxx_store;
+              mem_write_tab[i + 1][0xff] = h256k_rom_ffxx_store;
             }
             if (cs256k_enabled) {
               mem_read_tab[i + 0][0xff] = cs256k_ram_ffxx_read;
               mem_write_tab[i + 0][0xff] = cs256k_ram_ffxx_store;
+              mem_write_tab[i + 1][0xff] = cs256k_rom_ffxx_store;
             }
             mem_read_base_tab[i + 0][0xff] = NULL;
             mem_read_tab[i + 1][0xff] = rom_ffxx_read;
-            mem_write_tab[i + 1][0xff] = rom_ffxx_store;
             mem_read_base_tab[i + 1][0xff] = NULL;
             break;
           default:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18882] branches/pottendo/v1.22.17-intlupd/vice/src

[<pot...@us...>]

Revision: 18882
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18882&view=rev
Author:   pottendo
Date:     2008-06-22 01:13:27 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
2008-06-22  pottendo  <pot...@ao...>

	* c128/c128-cmdline-options.c (cmdline_options): cosmetic change:
	Norwegain -> Norwegian.

	* arch/unix/joy.c (new_joystick_init): cosmetic change.

Modified Paths:
--------------
    branches/pottendo/v1.22.17-intlupd/vice/src/ChangeLog
    branches/pottendo/v1.22.17-intlupd/vice/src/arch/unix/joy.c
    branches/pottendo/v1.22.17-intlupd/vice/src/c128/c128-cmdline-options.c

Modified: branches/pottendo/v1.22.17-intlupd/vice/src/ChangeLog
===================================================================
--- branches/pottendo/v1.22.17-intlupd/vice/src/ChangeLog	2008-06-22 08:10:40 UTC (rev 18881)
+++ branches/pottendo/v1.22.17-intlupd/vice/src/ChangeLog	2008-06-22 08:13:27 UTC (rev 18882)
@@ -1,3 +1,10 @@
+2008-06-22  pottendo  <pot...@ao...>
+
+	* c128/c128-cmdline-options.c (cmdline_options): cosmetic change:
+	Norwegain -> Norwegian.
+
+	* arch/unix/joy.c (new_joystick_init): cosmetic change.
+
 2008-06-03  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.17.

Modified: branches/pottendo/v1.22.17-intlupd/vice/src/arch/unix/joy.c
===================================================================
--- branches/pottendo/v1.22.17-intlupd/vice/src/arch/unix/joy.c	2008-06-22 08:10:40 UTC (rev 18881)
+++ branches/pottendo/v1.22.17-intlupd/vice/src/arch/unix/joy.c	2008-06-22 08:13:27 UTC (rev 18882)
@@ -399,7 +399,7 @@
                             JS_VERSION & 0xff);
                 log_message(joystick_log, _("Kernel driver version  : 0.8 ??"));
                 log_message(joystick_log,
-                            _("Please update your Joystick driver !"));
+                            _("Please update your Joystick driver!"));
                 log_message(joystick_log, _("Fall back to old api routine"));
                 use_old_api = 1;
                 old_joystick_init();

Modified: branches/pottendo/v1.22.17-intlupd/vice/src/c128/c128-cmdline-options.c
===================================================================
--- branches/pottendo/v1.22.17-intlupd/vice/src/c128/c128-cmdline-options.c	2008-06-22 08:10:40 UTC (rev 18881)
+++ branches/pottendo/v1.22.17-intlupd/vice/src/c128/c128-cmdline-options.c	2008-06-22 08:13:27 UTC (rev 18882)
@@ -115,7 +115,7 @@
     { "-kernalit", SET_RESOURCE, 1, NULL, NULL, "KernalITName", NULL,
       N_("<name>"), N_("Specify name of Italian Kernal ROM image") },
     { "-kernalno", SET_RESOURCE, 1, NULL, NULL, "KernalNOName", NULL,
-      N_("<name>"), N_("Specify name of Norwegain Kernal ROM image") },
+      N_("<name>"), N_("Specify name of Norwegian Kernal ROM image") },
     { "-kernalse", SET_RESOURCE, 1, NULL, NULL, "KernalSEName", NULL,
       N_("<name>"), N_("Specify name of Swedish Kernal ROM image") },
     { "-basiclo", SET_RESOURCE, 1, NULL, NULL, "BasicLoName", NULL,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18881] branches/pottendo/v1.22.17-intlupd/vice/po

[<pot...@us...>]

Revision: 18881
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18881&view=rev
Author:   pottendo
Date:     2008-06-22 01:10:40 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
Updated.

Modified Paths:
--------------
    branches/pottendo/v1.22.17-intlupd/vice/po/ChangeLog
    branches/pottendo/v1.22.17-intlupd/vice/po/de.po
    branches/pottendo/v1.22.17-intlupd/vice/po/hu.po
    branches/pottendo/v1.22.17-intlupd/vice/po/sv.po

Modified: branches/pottendo/v1.22.17-intlupd/vice/po/ChangeLog
===================================================================
--- branches/pottendo/v1.22.17-intlupd/vice/po/ChangeLog	2008-06-21 19:52:21 UTC (rev 18880)
+++ branches/pottendo/v1.22.17-intlupd/vice/po/ChangeLog	2008-06-22 08:10:40 UTC (rev 18881)
@@ -1,3 +1,7 @@
+2008-06-22  pottendo  <pot...@ao...>
+
+	* hu.po: Updated by cirix.
+
 2008-06-11  pottendo  <pot...@ao...>
 
 	* de.po: Updated.

Modified: branches/pottendo/v1.22.17-intlupd/vice/po/de.po
===================================================================
--- branches/pottendo/v1.22.17-intlupd/vice/po/de.po	2008-06-21 19:52:21 UTC (rev 18880)
+++ branches/pottendo/v1.22.17-intlupd/vice/po/de.po	2008-06-22 08:10:40 UTC (rev 18881)
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-03 19:42+0200\n"
-"PO-Revision-Date: 2008-06-11 23:08+0200\n"
+"POT-Creation-Date: 2008-06-22 10:07+0200\n"
+"PO-Revision-Date: 2008-06-22 10:07+0200\n"
 "Last-Translator: pottendo (pot...@gm...)\n"
 "Language-Team: de <de...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -547,8 +547,8 @@
 msgid "Specify name of Italian Kernal ROM image"
 msgstr "Name f\xFCr italienische Kernal ROM Datei definieren"
 
-#: src/c128/c128-cmdline-options.c:118 src/translate.c.po.c:714
-msgid "Specify name of Norwegain Kernal ROM image"
+#: src/c128/c128-cmdline-options.c:118
+msgid "Specify name of Norwegian Kernal ROM image"
 msgstr "Name f\xFCr norwegische Kernal ROM Datei definieren"
 
 #: src/c128/c128-cmdline-options.c:120 src/translate.c.po.c:724
@@ -2085,8 +2085,8 @@
 msgstr "Kernel Treiber Version  : 0.8 ??"
 
 #: src/arch/unix/joy.c:402
-msgid "Please update your Joystick driver !"
-msgstr "Bitte Joystick Treiber aktualisieren !"
+msgid "Please update your Joystick driver!"
+msgstr "Bitte Joystick Treiber aktualisieren!"
 
 #: src/arch/unix/joy.c:403
 msgid "Fall back to old api routine"
@@ -9809,6 +9809,10 @@
 msgid "New &Luminances"
 msgstr "Neue He&lligkeitsemulation"
 
+#: src/translate.c.po.c:714
+msgid "Specify name of Norwegain Kernal ROM image"
+msgstr "Name f\xFCr norwegische Kernal ROM Datei definieren"
+
 #: src/translate.c.po.c:2626
 msgid "<0-2000>"
 msgstr "<0-2000>"

Modified: branches/pottendo/v1.22.17-intlupd/vice/po/hu.po
===================================================================
--- branches/pottendo/v1.22.17-intlupd/vice/po/hu.po	2008-06-21 19:52:21 UTC (rev 18880)
+++ branches/pottendo/v1.22.17-intlupd/vice/po/hu.po	2008-06-22 08:10:40 UTC (rev 18881)
@@ -6,10 +6,10 @@
 # Czirkos Zoltan <ci...@fw...>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: VICE 1.22\n"
+"Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-03 19:42+0200\n"
-"PO-Revision-Date: 2007-07-27 15:58+0200\n"
+"POT-Creation-Date: 2008-06-22 10:07+0200\n"
+"PO-Revision-Date: 2008-06-22 10:08+0200\n"
 "Last-Translator: Karai Csaba <cs...@fr...>\n"
 "Language-Team: Hungarian <hu...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@
 
 #: src/screenshot.c:171 src/translate.c.po.c:221
 msgid "Sorry. Multiple recording is not supported."
-msgstr "Sajn\xE1lom: t\xF6bbsz\xF6r\xF6s fekv\xE9tel nem t\xE1mogatott."
+msgstr "Sajn\xE1lom: t\xF6bbsz\xF6r\xF6s felv\xE9tel nem t\xE1mogatott."
 
 #: src/autostart.c:186 src/translate.c.po.c:96
 msgid "Cannot load snapshot file."
@@ -67,7 +67,7 @@
 
 #: src/sound.c:279 src/translate.c.po.c:4485
 msgid "Set sound sample rate to <value> Hz"
-msgstr "Hang mintav\xE9telez\xE9si r\xE1ta be\xE1ll\xEDt\xE1sa Hz-ben <\xE9rt\xE9k>-re"
+msgstr "Hang mintav\xE9telez\xE9si r\xE1ta be\xE1ll\xEDt\xE1sa <\xE9rt\xE9k> Hz-re"
 
 #: src/sound.c:281 src/translate.c.po.c:4495
 msgid "Set sound buffer size to <value> msec"
@@ -198,7 +198,7 @@
 
 #: src/sound.c:671
 msgid "sound device lacks stereo capability"
-msgstr "A hangeszk\xF6z nem stereo"
+msgstr "A hangeszk\xF6z nem sztere\xF3"
 
 #: src/sound.c:721 src/translate.c.po.c:271
 #, c-format
@@ -212,7 +212,7 @@
 
 #: src/sound.c:750 src/translate.c.po.c:291
 msgid "Recording device must be different from playback device"
-msgstr "A felvev\xF5 \xE9s lej\xE1tsz\xF3 eszk\xF6z\xF6knek k\xFCl\xF6nb\xF6znie kell!"
+msgstr "A felvev\xF5 \xE9s lej\xE1tsz\xF3 eszk\xF6z\xF6knek k\xFCl\xF6nb\xF6znie kell"
 
 #: src/sound.c:760 src/translate.c.po.c:303
 #, c-format
@@ -272,12 +272,12 @@
 #: src/event.c:240 src/translate.c.po.c:136
 #, c-format
 msgid "Cannot find mapped name for %s"
-msgstr "A VICE %s lek\xE9pzett nev\xE9t nem tal\xE1lta meg."
+msgstr "A VICE %s lek\xE9pzett nev\xE9t nem tal\xE1lja"
 
 #: src/event.c:620 src/translate.c.po.c:146
 #, c-format
 msgid "Could not create start snapshot file %s."
-msgstr "Nem siker\xFClt a %s pillanatk\xE9p f\xE1jlt l\xE9trehozni."
+msgstr "Nem siker\xFClt a %s kezdeti pillanatk\xE9p f\xE1jlt l\xE9trehozni."
 
 #: src/event.c:639 src/event.c:934 src/translate.c.po.c:156
 #, c-format
@@ -287,7 +287,7 @@
 #: src/event.c:707 src/event.c:901 src/translate.c.po.c:166
 #, c-format
 msgid "Could not create end snapshot file %s."
-msgstr "Nem siker\xFClt az utols\xF3 %s pillanatk\xE9p f\xE1jlt l\xE9trehozni."
+msgstr "Nem siker\xFClt a %s befejez\xF5 pillanatk\xE9p f\xE1jlt l\xE9trehozni."
 
 #: src/event.c:775 src/translate.c.po.c:176
 #, c-format
@@ -305,7 +305,7 @@
 
 #: src/event.c:844 src/translate.c.po.c:211
 msgid "Error reading start snapshot file."
-msgstr "Nem siker\xFClt az els\xF5 pillanatk\xE9p f\xE1jl olvas\xE1sa."
+msgstr "Nem siker\xFClt az ind\xEDt\xF3 pillanatk\xE9p f\xE1jl olvas\xE1sa."
 
 #: src/event.c:1227 src/translate.c.po.c:4174
 msgid "Playback recorded events"
@@ -348,7 +348,7 @@
 
 #: src/debug.c:180 src/translate.c.po.c:4089
 msgid "Do not trace the drive0 CPU"
-msgstr "A 0-s lemezegys\xE9g CPU-j\xE1nak nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
+msgstr "A 0-s lemezegys\xE9g CPU-ja nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
 
 #: src/debug.c:183 src/translate.c.po.c:4099
 msgid "Trace the drive1 CPU"
@@ -356,7 +356,7 @@
 
 #: src/debug.c:186 src/translate.c.po.c:4109
 msgid "Do not trace the drive1 CPU"
-msgstr "Az 1-es lemezegys\xE9g CPU-j\xE1nak nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
+msgstr "Az 1-es lemezegys\xE9g CPU-ja nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
 
 #: src/debug.c:190 src/translate.c.po.c:4120
 msgid "Trace the drive2 CPU"
@@ -364,7 +364,7 @@
 
 #: src/debug.c:193 src/translate.c.po.c:4130
 msgid "Do not trace the drive2 CPU"
-msgstr "A 2-es lemezegys\xE9g CPU-j\xE1nak nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
+msgstr "A 2-es lemezegys\xE9g CPU-ja nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
 
 #: src/debug.c:198 src/translate.c.po.c:4142
 msgid "Trace the drive3 CPU"
@@ -372,7 +372,7 @@
 
 #: src/debug.c:201 src/translate.c.po.c:4152
 msgid "Do not trace the drive3 CPU"
-msgstr "A 3-as lemezegys\xE9g CPU-j\xE1nak nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
+msgstr "A 3-as lemezegys\xE9g CPU-ja nyomk\xF6vet\xE9s\xE9nek tilt\xE1sa"
 
 #: src/debug.c:205 src/translate.c.po.c:4163
 msgid "Trace mode (0=normal 1=small 2=history)"
@@ -553,8 +553,8 @@
 msgid "Specify name of Italian Kernal ROM image"
 msgstr "Adja meg az olasz Kernal ROM k\xE9pm\xE1s nev\xE9t"
 
-#: src/c128/c128-cmdline-options.c:118 src/translate.c.po.c:714
-msgid "Specify name of Norwegain Kernal ROM image"
+#: src/c128/c128-cmdline-options.c:118
+msgid "Specify name of Norwegian Kernal ROM image"
 msgstr "Adja meg a norv\xE9g Kernal ROM k\xE9pm\xE1s nev\xE9t"
 
 #: src/c128/c128-cmdline-options.c:120 src/translate.c.po.c:724
@@ -563,11 +563,11 @@
 
 #: src/c128/c128-cmdline-options.c:122 src/translate.c.po.c:734
 msgid "Specify name of BASIC ROM image (lower part)"
-msgstr "Adja meg a BASIC ROM k\xE9pm\xE1s nev\xE9t (als\xF3)"
+msgstr "Adja meg a BASIC ROM k\xE9pm\xE1s nev\xE9t (als\xF3 r\xE9sz)"
 
 #: src/c128/c128-cmdline-options.c:124 src/translate.c.po.c:744
 msgid "Specify name of BASIC ROM image (higher part)"
-msgstr "Adja meg a BASIC ROM k\xE9pm\xE1s nev\xE9t (fels\xF5)"
+msgstr "Adja meg a BASIC ROM k\xE9pm\xE1s nev\xE9t (fels\xF5 r\xE9sz)"
 
 #: src/c128/c128-cmdline-options.c:126 src/translate.c.po.c:754
 msgid "Specify name of international character generator ROM image"
@@ -616,12 +616,12 @@
 #: src/c128/c128-cmdline-options.c:146 src/c64/c64-cmdline-options.c:101
 #: src/translate.c.po.c:854
 msgid "<revision>"
-msgstr "<v\xE1ltozatsz\xE1m>"
+msgstr "<v\xE1ltozat>"
 
 #: src/c128/c128-cmdline-options.c:146 src/c64/c64-cmdline-options.c:101
 #: src/translate.c.po.c:864
 msgid "Patch the Kernal ROM to the specified <revision>"
-msgstr "A Kernal ROM \xE1t\xEDr\xE1sa adott <v\xE1ltozatsz\xE1mra>"
+msgstr "A Kernal ROM \xE1t\xEDr\xE1sa adott <v\xE1ltozatra>"
 
 #: src/c128/c128-cmdline-options.c:149 src/c64/c64-cmdline-options.c:104
 #: src/translate.c.po.c:875
@@ -806,7 +806,7 @@
 
 #: src/c64/cart/ide64.c:283 src/translate.c.po.c:1602
 msgid "Set number of cylinders for the IDE64 emulation"
-msgstr "Adja meg a cilinderek sz\xE1m\xE1t IDE64 emul\xE1ci\xF3hoz"
+msgstr "Adja meg a s\xE1vok sz\xE1m\xE1t IDE64 emul\xE1ci\xF3hoz"
 
 #: src/c64/cart/ide64.c:285 src/translate.c.po.c:1612
 msgid "Set number of heads for the IDE64 emulation"
@@ -839,7 +839,7 @@
 #: src/c64/c64_256k.c:212 src/c64/digimax.c:141 src/c64/plus60k.c:251
 #: src/sid/sid-cmdline-options.c:221 src/translate.c.po.c:3386
 msgid "<base address>"
-msgstr "<b\xE1zis c\xEDm>"
+msgstr "<b\xE1zisc\xEDm>"
 
 #: src/c64/c64_256k.c:212 src/translate.c.po.c:4775
 msgid "Base address of the 256K expansion"
@@ -1221,7 +1221,7 @@
 
 #: src/drive/iec/iec-cmdline-options.c:103 src/translate.c.po.c:2104
 msgid "Enable 8KB RAM expansion at $4000-$5FFF"
-msgstr "8KB RAM kiterjesz\xE9s tilt\xE1sa a $4000-$5FFF c\xEDmen"
+msgstr "8KB RAM kiterjesz\xE9s enged\xE9lyez\xE9se a $4000-$5FFF c\xEDmen"
 
 #: src/drive/iec/iec-cmdline-options.c:105 src/translate.c.po.c:2114
 msgid "Disable 8KB RAM expansion at $4000-$5FFF"
@@ -1229,7 +1229,7 @@
 
 #: src/drive/iec/iec-cmdline-options.c:107 src/translate.c.po.c:2124
 msgid "Enable 8KB RAM expansion at $6000-$7FFF"
-msgstr "8KB RAM kiterjesz\xE9s tilt\xE1sa a $6000-$7FFF c\xEDmen"
+msgstr "8KB RAM kiterjesz\xE9s enged\xE9lyez\xE9se a $6000-$7FFF c\xEDmen"
 
 #: src/drive/iec/iec-cmdline-options.c:109 src/translate.c.po.c:2134
 msgid "Disable 8KB RAM expansion at $6000-$7FFF"
@@ -1237,7 +1237,7 @@
 
 #: src/drive/iec/iec-cmdline-options.c:111 src/translate.c.po.c:2144
 msgid "Enable 8KB RAM expansion at $8000-$9FFF"
-msgstr "8KB RAM kiterjesz\xE9s tilt\xE1sa a $8000-$9FFF c\xEDmen"
+msgstr "8KB RAM kiterjesz\xE9s enged\xE9lyez\xE9se a $8000-$9FFF c\xEDmen"
 
 #: src/drive/iec/iec-cmdline-options.c:113 src/translate.c.po.c:2154
 msgid "Disable 8KB RAM expansion at $8000-$9FFF"
@@ -1245,7 +1245,7 @@
 
 #: src/drive/iec/iec-cmdline-options.c:115 src/translate.c.po.c:2164
 msgid "Enable 8KB RAM expansion at $A000-$BFFF"
-msgstr "8KB RAM kiterjesz\xE9s tilt\xE1sa a $A000-$BFFF c\xEDmen"
+msgstr "8KB RAM kiterjesz\xE9s enged\xE9lyez\xE9se a $A000-$BFFF c\xEDmen"
 
 #: src/drive/iec/iec-cmdline-options.c:117 src/translate.c.po.c:2174
 msgid "Disable 8KB RAM expansion at $A000-$BFFF"
@@ -1402,7 +1402,7 @@
 
 #: src/kbdbuf.c:136 src/translate.c.po.c:4355
 msgid "<string>"
-msgstr "<string>"
+msgstr "<sztring>"
 
 #: src/kbdbuf.c:136 src/translate.c.po.c:4365
 msgid "Put the specified string into the keyboard buffer"
@@ -1410,17 +1410,15 @@
 
 #: src/log.c:110 src/translate.c.po.c:4375
 msgid "Specify log file name"
-msgstr "Adja meg a log f\xE1jl nev\xE9t"
+msgstr "Adja meg a napl\xF3f\xE1jl nev\xE9t"
 
 #: src/mouse.c:358 src/translate.c.po.c:4385
-#, fuzzy
 msgid "Enable mouse grab"
-msgstr "*Eg\xE9r enged\xE9lyez\xE9se"
+msgstr "Eg\xE9r elkap\xE1s enged\xE9lyez\xE9se"
 
 #: src/mouse.c:360 src/translate.c.po.c:4395
-#, fuzzy
 msgid "Disable mouse grab"
-msgstr "Dupla p\xE1szt\xE1z\xE1s tilt\xE1sa"
+msgstr "Eg\xE9r elkap\xE1s tilt\xE1sa"
 
 #: src/mouse.c:362 src/translate.c.po.c:4405
 msgid "Select the joystick port the mouse is attached to"
@@ -1428,11 +1426,11 @@
 
 #: src/mouse.c:364 src/translate.c.po.c:4415
 msgid "Select the mouse type (0 = 1351, 1 = NEOS, 2 = Amiga)"
-msgstr ""
+msgstr "Eg\xE9r t\xEDpus kiv\xE1laszt\xE1sa (0 = 1351, 1 = NEOS, 2 = Amiga)"
 
 #: src/pet/pet-cmdline-options.c:114 src/translate.c.po.c:2366
 msgid "Specify PET model to emulate"
-msgstr "Adja meg az emul\xE1land\xF3 PET modellt"
+msgstr "Adja meg az emul\xE1lt PET modellt"
 
 #: src/pet/pet-cmdline-options.c:120 src/translate.c.po.c:2376
 msgid "Specify name of Editor ROM image"
@@ -1440,15 +1438,15 @@
 
 #: src/pet/pet-cmdline-options.c:124 src/translate.c.po.c:2386
 msgid "Specify 4K extension ROM name at $9***"
-msgstr "Adja meg a $9*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s k\xE9pm\xE1s nev\xE9t"
+msgstr "Adja meg a $9*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s nev\xE9t"
 
 #: src/pet/pet-cmdline-options.c:126 src/translate.c.po.c:2396
 msgid "Specify 4K extension ROM name at $A***"
-msgstr "Adja meg a $A*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s k\xE9pm\xE1s nev\xE9t"
+msgstr "Adja meg a $A*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s nev\xE9t"
 
 #: src/pet/pet-cmdline-options.c:128 src/translate.c.po.c:2406
 msgid "Specify 4K extension ROM name at $B***"
-msgstr "Adja meg a $B*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s k\xE9pm\xE1s nev\xE9t"
+msgstr "Adja meg a $B*** c\xEDm\xFB 4K ROM kiterjeszt\xE9s nev\xE9t"
 
 #: src/pet/pet-cmdline-options.c:130 src/translate.c.po.c:2416
 msgid "Enable PET8296 4K RAM mapping at $9***"
@@ -1488,7 +1486,7 @@
 
 #: src/pet/pet-cmdline-options.c:150 src/translate.c.po.c:2506
 msgid "Do not switch upper/lower case charset"
-msgstr "Ne V\xE1ltson a nagy-/kisbet\xFBs karakterk\xE9szletre"
+msgstr "Ne v\xE1ltson a nagy-/kisbet\xFBs karakterk\xE9szletre"
 
 #: src/pet/pet-cmdline-options.c:152 src/translate.c.po.c:2516
 msgid "EOI blanks screen"
@@ -1500,11 +1498,11 @@
 
 #: src/pet/petpia1.c:120 src/translate.c.po.c:2536
 msgid "Enable userport diagnostic pin"
-msgstr "Userport diagnosztikai t\xFB enged\xE9lyez\xE9se"
+msgstr "Userport diagnosztikai t\xFCske enged\xE9lyez\xE9se"
 
 #: src/pet/petpia1.c:122 src/translate.c.po.c:2546
 msgid "Disable userport diagnostic pin"
-msgstr "Userport diagnosztikai t\xFB tilt\xE1sa"
+msgstr "Userport diagnosztikai t\xFCske tilt\xE1sa"
 
 #: src/pet/petreu.c:210 src/translate.c.po.c:1150
 msgid "Enable the PET Ram and Expansion Unit"
@@ -1596,7 +1594,7 @@
 
 #: src/printerdrv/driver-select.c:129 src/translate.c.po.c:2696
 msgid "Specify name of printer driver for the userport printer"
-msgstr "Adja meg a Userport-os nyomtat\xF3meghajt\xF3 nev\xE9t"
+msgstr "Adja meg a userport nyomtat\xF3meghajt\xF3 nev\xE9t"
 
 #: src/printerdrv/interface-serial.c:122 src/translate.c.po.c:2706
 msgid "Set device type for device #4 (0: NONE, 1: FS, 2: REAL)"
@@ -1608,11 +1606,11 @@
 
 #: src/printerdrv/interface-userport.c:93 src/translate.c.po.c:2726
 msgid "Enable the userport printer emulation"
-msgstr "Userporti nyomtat\xF3 emul\xE1ci\xF3j\xE1nak enged\xE9lyez\xE9se"
+msgstr "Userport nyomtat\xF3 emul\xE1ci\xF3j\xE1nak enged\xE9lyez\xE9se"
 
 #: src/printerdrv/interface-userport.c:96 src/translate.c.po.c:2736
 msgid "Disable the userport printer emulation"
-msgstr "Userporti nyomtat\xF3 emul\xE1ci\xF3j\xE1nak tilt\xE1sa"
+msgstr "Userport nyomtat\xF3 emul\xE1ci\xF3j\xE1nak tilt\xE1sa"
 
 #: src/printerdrv/output-select.c:120 src/translate.c.po.c:2746
 msgid "Specify name of output device for device #4"
@@ -1624,7 +1622,7 @@
 
 #: src/printerdrv/output-select.c:125 src/translate.c.po.c:2766
 msgid "Specify name of output device for the userport printer"
-msgstr "Adja meg a kimeneti eszk\xF6z nev\xE9t a userporti nyomtat\xF3hoz"
+msgstr "Adja meg a kimeneti eszk\xF6z nev\xE9t a userport nyomtat\xF3hoz"
 
 #: src/printerdrv/output-text.c:113 src/printerdrv/output-text.c:115
 #: src/printerdrv/output-text.c:117 src/translate.c.po.c:2776
@@ -1641,7 +1639,7 @@
 
 #: src/printerdrv/output-text.c:126 src/translate.c.po.c:2816
 msgid "Specify printer text output device for userport printer"
-msgstr "Adja meg a sz\xF6vegnyomtat\xF3 eszk\xF6zt a userporti nyomtat\xF3hoz"
+msgstr "Adja meg a sz\xF6vegnyomtat\xF3 eszk\xF6zt a userport nyomtat\xF3hoz"
 
 #: src/ram.c:101 src/translate.c.po.c:4425
 msgid "Set the value for the very first RAM address after powerup"
@@ -1661,11 +1659,11 @@
 
 #: src/raster/raster-cmdline-options.c:59 src/translate.c.po.c:2826
 msgid "Enable the video cache"
-msgstr "Vide\xF3 gyors\xEDt\xF3 t\xE1r enged\xE9lyez\xE9se"
+msgstr "Vide\xF3 gyors\xEDt\xF3t\xE1r enged\xE9lyez\xE9se"
 
 #: src/raster/raster-cmdline-options.c:61 src/translate.c.po.c:2836
 msgid "Disable the video cache"
-msgstr "Vide\xF3 gyors\xEDt\xF3 t\xE1r tilt\xE1sa"
+msgstr "Vide\xF3 gyors\xEDt\xF3t\xE1r tilt\xE1sa"
 
 #: src/rs232drv/rs232drv.c:101 src/translate.c.po.c:2847
 msgid "Specify name of first RS232 device"
@@ -2110,7 +2108,7 @@
 msgstr "Kernel meghajt\xF3 verzi\xF3ja  : 0.8 ??"
 
 #: src/arch/unix/joy.c:402
-msgid "Please update your Joystick driver !"
+msgid "Please update your Joystick driver!"
 msgstr "K\xE9rem friss\xEDtse a Joystick meghajt\xF3j\xE1t!"
 
 #: src/arch/unix/joy.c:403
@@ -2306,15 +2304,15 @@
 
 #: src/arch/unix/gui/c128ui.c:238 src/arch/unix/gui/c64ui.c:270
 msgid "RAM Expansion Unit"
-msgstr "RAM Expansion Unit"
+msgstr "RAM B\xF5v\xEDt\xF5 Egys\xE9g"
 
 #: src/arch/unix/gui/c128ui.c:240 src/arch/unix/gui/c64ui.c:272
 msgid "GEORAM Expansion Unit"
-msgstr "GEORAM Expansion Unit"
+msgstr "GEORAM B\xF5v\xEDt\xF5 Egys\xE9g"
 
 #: src/arch/unix/gui/c128ui.c:242 src/arch/unix/gui/c64ui.c:274
 msgid "RAM Expansion Cart"
-msgstr "RAM Expansion Cart"
+msgstr "RAM B\xF5v\xEDt\xF5 K\xE1rtya"
 
 #: src/arch/unix/gui/c128ui.c:244 src/arch/unix/gui/c64ui.c:282
 msgid "MMC64 emulation"
@@ -2342,9 +2340,8 @@
 msgstr "*IEEE488 interf\xE9sz emul\xE1ci\xF3"
 
 #: src/arch/unix/gui/c128ui.c:259 src/arch/unix/gui/c64ui.c:295
-#, fuzzy
 msgid "*Mouse Emulation"
-msgstr "*1351 eg\xE9r emul\xE1ci\xF3"
+msgstr "*Eg\xE9r emul\xE1ci\xF3"
 
 #: src/arch/unix/gui/c128ui.c:268
 msgid "Load new Int. Kernal ROM"
@@ -2500,11 +2497,11 @@
 
 #: src/arch/unix/gui/c64ui.c:276
 msgid "PLUS60K RAM Expansion"
-msgstr "PLUS60K RAM kiterjeszt\xE9s"
+msgstr "PLUS60K RAM b\xF5v\xEDt\xE9s"
 
 #: src/arch/unix/gui/c64ui.c:278
 msgid "PLUS256K RAM Expansion"
-msgstr "PLUS256K RAM kiterjeszt\xE9s"
+msgstr "PLUS256K RAM b\xF5v\xEDt\xE9s"
 
 #: src/arch/unix/gui/c64ui.c:280
 msgid "256K RAM Expansion"
@@ -2609,7 +2606,7 @@
 
 #: src/arch/unix/gui/cbm2ui.c:236 src/arch/unix/gui/petui.c:299
 msgid "Model defaults"
-msgstr "Alap\xE9rtelmezett modellek"
+msgstr "Modell alap\xE9rtelmez\xE9sei"
 
 #: src/arch/unix/gui/cbm2ui.c:242 src/arch/unix/gui/petui.c:307
 msgid "Memory size"
@@ -2724,7 +2721,7 @@
 
 #: src/arch/unix/gui/petui.c:222
 msgid "PET RAM and Expansion Unit"
-msgstr "PET RAM and Expansion Unit"
+msgstr "PET RAM \xE9s b\xF5v\xEDt\xF5 egys\xE9g"
 
 #: src/arch/unix/gui/petui.c:224
 msgid "SID cartridge"
@@ -2776,7 +2773,7 @@
 
 #: src/arch/unix/gui/petui.c:314
 msgid "*SuperPET I/O enable (disables 8x96)"
-msgstr "*SuperPET I/O enged\xE9lyez\xE9se (8x96-on tiltva)"
+msgstr "*SuperPET I/O enged\xE9lyez\xE9se (8x96-ot tiltja)"
 
 #: src/arch/unix/gui/petui.c:316
 msgid "SuperPET ACIA"
@@ -2873,7 +2870,7 @@
 
 #: src/arch/unix/gui/uiattach.c:98
 msgid "Invalid Disk Image or Filename"
-msgstr "\xC9rv\xE9nytelen lemez k\xE9pm\xE1s, vagy f\xE1jln\xE9v"
+msgstr "\xC9rv\xE9nytelen lemez k\xE9pm\xE1s vagy f\xE1jln\xE9v"
 
 #: src/arch/unix/gui/uiattach.c:113 src/arch/unix/gui/uiattach.c:147
 msgid "Unit #8..."
@@ -2909,7 +2906,7 @@
 
 #: src/arch/unix/gui/uiattach.c:176 src/arch/amigaos/intl.c.po.c:168
 msgid "All"
-msgstr "Mindegyik"
+msgstr "\xD6sszes"
 
 #: src/arch/unix/gui/uiattach.c:182
 msgid "Attach a disk image"
@@ -3064,7 +3061,7 @@
 
 #: src/arch/unix/gui/uic64cart.c:198 src/arch/amigaos/intl.c.po.c:618
 msgid "Cartridge freeze"
-msgstr "Fagyaszt\xE1s Cartridge-el"
+msgstr "Fagyaszt\xE1s Cartridge-dzsel"
 
 #: src/arch/unix/gui/uic64cart.c:200
 msgid "*Cartridge control"
@@ -3101,7 +3098,7 @@
 
 #: src/arch/unix/gui/uicommands.c:115
 msgid "Couldn't run xterm"
-msgstr "Nem siker\xFClt az xterm-et futtatni"
+msgstr "Nem siker\xFClt az xtermet futtatni"
 
 #: src/arch/unix/gui/uicommands.c:120
 msgid "Unknown error while running c1541"
@@ -3109,7 +3106,7 @@
 
 #: src/arch/unix/gui/uicommands.c:150
 msgid "No HTML browser is defined."
-msgstr "Nincs be\xE1ll\xEDtott HTML b\xF6ng\xE9sz\xF5"
+msgstr "Nincs HTML b\xF6ng\xE9sz\xF5 be\xE1ll\xEDtva."
 
 #: src/arch/unix/gui/uicommands.c:179 src/arch/unix/gui/uicommands.c:193
 #: src/arch/unix/gui/uicommands.c:206
@@ -3209,7 +3206,7 @@
 
 #: src/arch/unix/gui/uicommands.c:493
 msgid "Quickload snapshot"
-msgstr "Gyors Pillanatk\xE9p t\xF6lt\xE9s"
+msgstr "Gyors pillanatk\xE9p t\xF6lt\xE9s"
 
 #: src/arch/unix/gui/uicommands.c:496
 msgid "Quicksave snapshot"
@@ -3225,11 +3222,11 @@
 
 #: src/arch/unix/gui/uicommands.c:506
 msgid "Start playing back events"
-msgstr "Esem\xE9nyek visszaj\xE1tsz\xE1s\xE1nak ind\xEDt\xE1sa"
+msgstr "Esem\xE9ny visszaj\xE1tsz\xE1s ind\xEDt\xE1sa"
 
 #: src/arch/unix/gui/uicommands.c:508
 msgid "Stop playing back events"
-msgstr "Esem\xE9nyek visszaj\xE1tsz\xE1s\xE1nak le\xE1ll\xEDt\xE1sa"
+msgstr "Esem\xE9ny visszaj\xE1tsz\xE1s le\xE1ll\xEDt\xE1sa"
 
 #: src/arch/unix/gui/uicommands.c:510
 msgid "Set recording milestone"
@@ -3361,9 +3358,8 @@
 #: src/arch/unix/gui/uicrtc.c:87 src/arch/unix/gui/uited.c:128
 #: src/arch/unix/gui/uivdc.c:79 src/arch/unix/gui/uivic.c:123
 #: src/arch/unix/gui/uivicii.c:158
-#, fuzzy
 msgid "*Fullscreen settings"
-msgstr "Teljesk\xE9perny\xF5s eszk\xF6z"
+msgstr "*Teljes k\xE9perny\xF5s m\xF3d be\xE1ll\xEDt\xE1sai"
 
 #: src/arch/unix/gui/uicrtc.c:90 src/arch/unix/gui/uited.c:131
 #: src/arch/unix/gui/uivdc.c:82 src/arch/unix/gui/uivic.c:126
@@ -3711,7 +3707,7 @@
 
 #: src/arch/unix/gui/uifliplist.c:87
 msgid "Fliplist File"
-msgstr "(Lemezlista F\xE1jl)"
+msgstr "Lemezlista F\xE1jl"
 
 #: src/arch/unix/gui/uifliplist.c:97
 #, c-format
@@ -3760,12 +3756,12 @@
 #: src/arch/unix/gui/uifliplist.c:194
 #, c-format
 msgid "Attach #%d"
-msgstr "Csatol\xE1s #%d"
+msgstr "#%d csatol\xE1sa"
 
 #: src/arch/unix/gui/uifliplist.c:201
 #, c-format
 msgid "Detach #%d"
-msgstr "Lev\xE1laszt\xE1s #%d"
+msgstr "#%d lev\xE1laszt\xE1sa"
 
 #: src/arch/unix/gui/uifliplist.c:217
 msgid "*Write Protect"
@@ -3805,11 +3801,11 @@
 
 #: src/arch/unix/gui/uifullscreen-menu.h:94
 msgid "*Enable fullscreen"
-msgstr "*Teljesk\xE9perny\xF5 enged\xE9lyez\xE9se"
+msgstr "*Teljes k\xE9perny\xF5 enged\xE9lyez\xE9se"
 
 #: src/arch/unix/gui/uifullscreen-menu.h:97
 msgid "*Show Statusbar/Menu"
-msgstr ""
+msgstr "*St\xE1tusz sor \xE9s men\xFC mutat\xE1sa"
 
 #: src/arch/unix/gui/uifullscreen-menu.h:104
 msgid "Fullscreen device"
@@ -4039,9 +4035,8 @@
 
 #: src/arch/unix/gui/uimouse.c:62 src/arch/win32/resmouse.rc.po.c:11
 #: src/arch/amigaos/intl.c.po.c:4682
-#, fuzzy
 msgid "Mouse type"
-msgstr "ROM k\xE9szlet t\xEDpusa"
+msgstr "Eg\xE9r t\xEDpusa"
 
 #: src/arch/unix/gui/uimouse.c:64 src/arch/win32/resmouse.rc.po.c:15
 #: src/arch/amigaos/intl.c.po.c:4700
@@ -4054,7 +4049,7 @@
 
 #: src/arch/unix/gui/uinetplay.c:70
 msgid "Netplay TCP port"
-msgstr "TCP port megad\xE1sa"
+msgstr "Netplay TCP port"
 
 #: src/arch/unix/gui/uinetplay.c:80
 msgid "Invalid TCP port"
@@ -4062,11 +4057,11 @@
 
 #: src/arch/unix/gui/uinetplay.c:88
 msgid "Error starting the netplay server."
-msgstr "Hiba t\xF6rt\xE9nt a j\xE1t\xE9k kiszolg\xE1l\xF3 ind\xEDt\xE1sakor"
+msgstr "Hiba t\xF6rt\xE9nt a j\xE1t\xE9k kiszolg\xE1l\xF3 ind\xEDt\xE1sakor."
 
 #: src/arch/unix/gui/uinetplay.c:93
 msgid "Netplay Server name"
-msgstr "J\xE1t\xE9kkiszolg\xE1l\xF3 n\xE9v"
+msgstr "Netplay kiszolg\xE1l\xF3 n\xE9v"
 
 #: src/arch/unix/gui/uinetplay.c:94
 msgid "Hostname:"
@@ -4107,7 +4102,7 @@
 
 #: src/arch/unix/gui/uipalemu.c:80
 msgid "Scanline Shade in percent"
-msgstr "P\xE1szta \xE1rnyal\xE1s sz\xE1zal\xE9kosban"
+msgstr "P\xE1szta \xE1rnyal\xE1s sz\xE1zal\xE9kban"
 
 #: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:123
 msgid "PAL Blurredness"
@@ -5050,7 +5045,6 @@
 msgstr "*Ethernet enged\xE9lyez\xE9se"
 
 #: src/arch/unix/gui/uitfe.c:50
-#, fuzzy
 msgid "*RR-NET compatibility mode"
 msgstr "*RR-NET kompatibilit\xE1s m\xF3d"
 
@@ -5308,9 +5302,8 @@
 "Czirkos Zoltan, Karai Csaba - magyar\n"
 
 #: src/arch/unix/x11/gnome/about.c:104
-#, fuzzy
 msgid "(c) 1998 - 2008 The Vice Team"
-msgstr "(c) 1998 - 2007 A Vice Csapat"
+msgstr "(c) 1998 - 2008 A Vice Csapat"
 
 #: src/arch/unix/x11/gnome/about.c:115 src/arch/win32/res.rc.po.c:5022
 #: src/arch/amigaos/intl.c.po.c:1662
@@ -5629,11 +5622,11 @@
 
 #: src/arch/unix/x11/gnome/x11ui.c:676
 msgid "event recording"
-msgstr "felv\xE9tel"
+msgstr "esem\xE9ny felv\xE9tel"
 
 #: src/arch/unix/x11/gnome/x11ui.c:695
 msgid "event playback"
-msgstr "visszaj\xE1tsz\xE1s"
+msgstr "esem\xE9ny visszaj\xE1tsz\xE1s"
 
 #: src/arch/unix/x11/gnome/x11ui.c:707
 msgid "click to stop playback"
@@ -5692,7 +5685,7 @@
 
 #: src/arch/unix/x11/gnome/x11ui.c:1823
 msgid "Hard Reset"
-msgstr "Kem\xE9ny Reset"
+msgstr "Hidegind\xEDt\xE1s"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1824 src/arch/amigaos/intl.c.po.c:636
 msgid "Monitor"
@@ -5709,12 +5702,12 @@
 #: src/arch/unix/x11/gnome/x11ui.c:1882
 #, c-format
 msgid "Autostart not possible for unit %d"
-msgstr "Automatikus indul\xE1s nem lehets\xE9ges a %d egys\xE9gen"
+msgstr "Automatikus ind\xEDt\xE1s nem lehets\xE9ges a %d egys\xE9gen"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1890 src/arch/unix/x11/gnome/x11ui.c:1899
 #, c-format
 msgid "Can't autostart selection %d in image %s"
-msgstr "Nem lehet automatikusan elind\xEDtani a %d. kiv\xE1laszt\xE1s\xE1t a %s  k\xE9pm\xE1son."
+msgstr "Nem lehet automatikusan elind\xEDtani a %d. v\xE1laszt\xE1st a %s k\xE9pm\xE1son."
 
 #: src/arch/unix/x11/gnome/x11ui.c:2058 src/arch/unix/x11/gnome/x11ui.c:2068
 msgid "NO IMAGE CONTENTS AVAILABLE"
@@ -5747,7 +5740,7 @@
 
 #: src/arch/unix/x11/ui-cmdline-options.c:42
 msgid "Install a private colormap"
-msgstr "Priv\xE1t sz\xEDnpaletta telep\xEDt\xE9se"
+msgstr "Saj\xE1t paletta telep\xEDt\xE9se"
 
 #: src/arch/unix/x11/ui-cmdline-options.c:45
 msgid "Use the default colormap"
@@ -5756,7 +5749,7 @@
 #: src/arch/unix/x11/ui-cmdline-options.c:48 src/arch/win32/res.rc.po.c:5072
 #: src/arch/amigaos/intl.c.po.c:3242
 msgid "Save settings (resources) on exit"
-msgstr "Er\xF5forr\xE1sbe\xE1ll\xEDt\xE1sok ment\xE9se kil\xE9p\xE9skor"
+msgstr "Be\xE1ll\xEDt\xE1sok (er\xF5forr\xE1sok) ment\xE9se kil\xE9p\xE9skor"
 
 #: src/arch/unix/x11/ui-cmdline-options.c:51 src/arch/win32/res.rc.po.c:5075
 #: src/arch/amigaos/intl.c.po.c:3269
@@ -5771,7 +5764,7 @@
 #: src/arch/unix/x11/ui-cmdline-options.c:57 src/arch/win32/res.rc.po.c:5073
 #: src/arch/amigaos/intl.c.po.c:3251
 msgid "Never save settings (resources) on exit"
-msgstr "Sose mentse az er\xF5forr\xE1sbe\xE1ll\xEDt\xE1sokat kil\xE9p\xE9skor"
+msgstr "Sose mentse a be\xE1ll\xEDt\xE1sokat (er\xF5forr\xE1sokat) kil\xE9p\xE9skor"
 
 #: src/arch/unix/x11/ui-cmdline-options.c:61
 msgid "Enable fullscreen"
@@ -5800,7 +5793,7 @@
 
 #: src/arch/unix/x11/xaw/uicartridge.c:78
 msgid "Save cartridge image file"
-msgstr "Cartridge k\xE9pm\xE1s f\xE1jl ment\xE9se"
+msgstr "Cartridge k\xE9pm\xE1s ment\xE9se"
 
 #: src/arch/unix/x11/xaw/uicartridge.c:128 src/arch/unix/x11/xaw/uiedisk.c:218
 #: src/arch/unix/x11/xaw/uiscreenshot.c:170
@@ -5896,7 +5889,7 @@
 
 #: src/arch/unix/x11/xaw/uicolor.c:95
 msgid "Automatically using a private colormap."
-msgstr "Priv\xE1t sz\xEDnpaletta automatikus haszn\xE1lata."
+msgstr "Priv\xE1t paletta automatikus haszn\xE1lata."
 
 #: src/arch/unix/x11/xaw/uicolor.c:126
 msgid "XCreateImage failed."
@@ -5906,7 +5899,7 @@
 #: src/arch/unix/x11/xaw/uicolor.c:198 src/arch/unix/x11/xaw/uicolor.c:203
 #, c-format
 msgid "Cannot allocate color \"#%04X%04X%04X\"."
-msgstr "Nem siker\xFClt sz\xEDnt lefoglalni \"#%04X%04X%04X\"."
+msgstr "Nem siker\xFClt a \"#%04X%04X%04X\" sz\xEDnt lefoglalni."
 
 #: src/arch/unix/x11/xaw/uicolor.c:156
 msgid "XFreeColors failed."
@@ -5950,7 +5943,7 @@
 
 #: src/arch/unix/x11/xaw/uisnapshot.c:210
 msgid "Save currently attached disks:"
-msgstr "A lcsatolt lemezek elment\xE9se:"
+msgstr "A csatolt lemezek elment\xE9se:"
 
 #: src/arch/unix/x11/xaw/uisnapshot.c:222
 #: src/arch/unix/x11/xaw/uisnapshot.c:261 src/arch/win32/resc128.rc.po.c:79
@@ -5975,7 +5968,7 @@
 #: src/arch/unix/x11/xaw/x11ui.c:512
 #, c-format
 msgid "This display does not support suitable %dbit visuals."
-msgstr "A kijelz\xF5 nem t\xE1mogat megfelel\xF5 %dbit-es \xFCzemm\xF3dot."
+msgstr "A kijelz\xF5 nem t\xE1mogat megfelel\xF5 %d bites \xFCzemm\xF3dot."
 
 #: src/arch/unix/x11/xaw/x11ui.c:515
 msgid "Please select a bit depth supported by your display."
@@ -5984,11 +5977,11 @@
 #: src/arch/unix/x11/xaw/x11ui.c:518 src/arch/unix/x11/xaw/x11ui.c:535
 #, c-format
 msgid "Found %dbit/%s visual."
-msgstr "A VICE %d bites %s kijelz\xF5t tal\xE1lt"
+msgstr "A VICE %d bites %s \xFCzemm\xF3dot tal\xE1lt"
 
 #: src/arch/unix/x11/xaw/x11ui.c:543
 msgid "Cannot autodetect a proper visual."
-msgstr "Nem siker\xFClt automatikusan kijelz\xF5t felismerni."
+msgstr "Nem siker\xFClt automatikusan megfelel\xF5 \xFCzemm\xF3dot tal\xE1lni."
 
 #: src/arch/unix/x11/xaw/x11ui.c:822
 msgid "recording..."
@@ -6000,7 +5993,7 @@
 
 #: src/arch/unix/x11/xaw/x11ui.c:1155
 msgid "Using private colormap."
-msgstr "Priv\xE1t sz\xEDnpaletta haszn\xE1lata."
+msgstr "Priv\xE1t paletta haszn\xE1lata."
 
 #: src/arch/unix/x11/xaw/x11ui.c:1282
 #, c-format
@@ -6009,7 +6002,7 @@
 
 #: src/arch/unix/x11/xaw/x11ui.c:1496
 msgid "Toggling of Statusbar/Menu in Xaw is not supported."
-msgstr ""
+msgstr "A st\xE1tusz sor \xE9s a men\xFC ki-be kapcsol\xE1sa Xaw-ban nem lehets\xE9ges."
 
 #: src/arch/unix/x11/xaw/x11ui.c:1630 src/arch/win32/res.rc.po.c:4911
 msgid "VICE Error!"
@@ -6050,7 +6043,7 @@
 
 #: src/arch/unix/x11/xaw/x11video.c:388
 msgid "Cannot release shared memory!"
-msgstr "Nem siker\xFClt az osztott mem\xF3ri\xE1t elengedni!"
+msgstr "Nem siker\xFClt az osztott mem\xF3ri\xE1t felszabad\xEDtani!"
 
 #: src/arch/unix/x11/xaw/x11video.c:517
 #, c-format
@@ -6089,24 +6082,23 @@
 
 #: src/arch/unix/x11/xaw/x11video.c:622
 msgid ", using"
-msgstr "osztott mem\xF3ri\xE1val"
+msgstr ", ezzel:"
 
 #: src/arch/unix/x11/xaw/x11video.c:622
 msgid " without"
-msgstr "osztott mem\xF3ria n\xE9lk\xFCl"
+msgstr " en\xE9lk\xFCl:"
 
 #: src/arch/unix/x11/xaw/x11video.c:625
 msgid "Performance will be poor."
-msgstr "A teljes\xEDtm\xE9ny gy\xF6nge lesz."
+msgstr "A teljes\xEDtm\xE9ny gyenge lesz."
 
 #: src/arch/unix/x11/xaw/x11video.c:628
 msgid "Successfully initialized without shared memory."
 msgstr "Sikeres indul\xE1s osztott mem\xF3ria n\xE9lk\xFCl."
 
 #: src/arch/unix/x11/xaw/x11video.c:698
-#, fuzzy
 msgid "HW scaling not available"
-msgstr "Milyen parancssori opci\xF3k lehets\xE9gesek?"
+msgstr "Hardveres gyors\xEDt\xE1s nem \xE1ll rendelkez\xE9sre"
 
 #: src/arch/win32/res.rc.po.c:81 src/arch/win32/resc128.rc.po.c:16
 #: src/arch/win32/resc64.rc.po.c:16 src/arch/win32/rescbm2.rc.po.c:15
@@ -6273,60 +6265,52 @@
 msgstr "Verzi\xF3: 0.0"
 
 #: src/arch/win32/res.rc.po.c:560
-#, fuzzy
 msgid "Copyright (c) 1998-2008 Andreas Boose"
-msgstr "Copyright (c) 1998-2007 Andreas Boose"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:561
-#, fuzzy
 msgid "Copyright (c) 1998-2008 Dag Lem"
-msgstr "Copyright (c) 1998-2007 Dag Lem"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:562
-#, fuzzy
 msgid "Copyright (c) 1998-2008 Tibor Biczo"
-msgstr "Copyright (c) 1998-2007 Tibor Biczo"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:563
-#, fuzzy
 msgid "Copyright (c) 1999-2008 Andreas Matthies"
-msgstr "Copyright (c) 1999-2007 Andreas Matthies"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:564
-#, fuzzy
 msgid "Copyright (c) 1999-2008 Martin Pottendorfer"
-msgstr "Copyright (c) 1999-2007 Martin Pottendorfer"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:565
-#, fuzzy
 msgid "Copyright (c) 2000-2008 Spiro Trikaliotis"
-msgstr "Copyright (c) 2000-2007 Spiro Trikaliotis"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:566
-#, fuzzy
 msgid "Copyright (c) 2005-2008 Marco van den Heuvel"
-msgstr "Copyright (c) 2005-2007 Marco van den Heuvel"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:567
-#, fuzzy
 msgid "Copyright (c) 2006-2008 Christian Vogelgsang"
-msgstr "Copyright (c) 2003-2005 Christian Vogelgsang"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:568
 msgid "Copyright (c) 1999-2007 Andreas Dehmel"
-msgstr "Copyright (c) 1999-2007 Andreas Dehmel"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:569
 msgid "Copyright (c) 1999-2005 Thomas Bretz"
-msgstr "Copyright (c) 1999-2005 Thomas Bretz"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:570
 msgid "Copyright (c) 2003-2005 David Hansel"
-msgstr "Copyright (c) 2003-2005 David Hansel"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:571
 msgid "Copyright (c) 2000-2004 Markus Brenner"
-msgstr "Copyright (c) 2000-2004 Markus Brenner"
+msgstr ""
 
 #: src/arch/win32/res.rc.po.c:572
 msgid " "
@@ -6392,7 +6376,7 @@
 
 #: src/arch/win32/res.rc.po.c:603
 msgid "&Hide non-P00 files"
-msgstr "P00 f\xE1jlok &elrejt\xE9se"
+msgstr "Nem P00 f\xE1jlok &elrejt\xE9se"
 
 #: src/arch/win32/res.rc.po.c:852 src/arch/amigaos/intl.c.po.c:2882
 msgid "Datasette Settings"
@@ -6851,6 +6835,9 @@
 "\n"
 "Start monitor? (No will reset, cancel will continue)"
 msgstr ""
+"%s\n"
+"\n"
+"Monitorprogram ind\xEDt\xE1sa? (Nem \xFAjraind\xEDtja, M\xE9gsem folytatja)"
 
 #: src/arch/win32/res.rc.po.c:4921
 msgid "VICE CPU JAM"
@@ -6973,11 +6960,11 @@
 
 #: src/arch/win32/res.rc.po.c:4950
 msgid "Save keymap file"
-msgstr "Billenty\xFBzetkioszt\xE1s f\xE1jlba \xEDr\xE1sa"
+msgstr "Billenty\xFBzetlek\xE9pez\xE9s f\xE1jlba \xEDr\xE1sa"
 
 #: src/arch/win32/res.rc.po.c:4951
 msgid "Cannot write keymap file"
-msgstr "Nem siker\xFClt a billenty\xFBzetkioszt\xE1st f\xE1jlba \xEDrni"
+msgstr "Nem siker\xFClt a billenty\xFBzetlek\xE9pez\xE9st f\xE1jlba \xEDrni"
 
 #: src/arch/win32/res.rc.po.c:4952
 msgid "Mapping"
@@ -7062,7 +7049,7 @@
 
 #: src/arch/win32/res.rc.po.c:4973 src/arch/amigaos/intl.c.po.c:4115
 msgid "Cannot read snapshot image"
-msgstr "Nem siker\xFClt bet\xF6lteni a pillanatk\xE9p f\xE1jlt"
+msgstr "A pillanatk\xE9p f\xE1jl nem olvashat\xF3"
 
 #: src/arch/win32/res.rc.po.c:4974
 #, c-format
@@ -7309,9 +7296,8 @@
 msgstr "Lemez k\xE9pm\xE1s f\xE1jlok (*.d64;*.d71;*.d80;*.d81;*.d82;*.g64;*.g41;*.x64)"
 
 #: src/arch/win32/res.rc.po.c:5044
-#, fuzzy
 msgid "Tape image files (*.t64;*.tap)"
-msgstr "Szalag k\xE9pm\xE1s f\xE1jlok (*.t64;*.p00;*.tap;*.prg)"
+msgstr "Szalag k\xE9pm\xE1s f\xE1jlok (*.t64;*.tap)"
 
 #: src/arch/win32/res.rc.po.c:5045
 msgid "Zipped files (*.zip;*.bz2;*.gz;*.d6z;*.d7z;*.d8z;*.g6z;*.g4z;*.x6z)"
@@ -7340,11 +7326,11 @@
 
 #: src/arch/win32/res.rc.po.c:5051
 msgid "VICE keymap files (*.vkm)"
-msgstr "VICE billenty\xFB lek\xE9pez\xE9s f\xE1jlok (*.vkm)"
+msgstr "VICE billenty\xFBlek\xE9pez\xE9s f\xE1jlok (*.vkm)"
 
 #: src/arch/win32/res.rc.po.c:5052
 msgid "Commodore emulator files (*.prg;*.p00)"
-msgstr ""
+msgstr "Commodore emul\xE1tor f\xE1jlok (*.prg; *.p00)"
 
 #: src/arch/win32/res.rc.po.c:5053 src/arch/amigaos/intl.c.po.c:3656
 msgid "Flexible"
@@ -7557,9 +7543,8 @@
 #: src/arch/win32/resc128.rc.po.c:34 src/arch/win32/resc64.rc.po.c:34
 #: src/arch/win32/rescbm2.rc.po.c:33 src/arch/win32/respet.rc.po.c:33
 #: src/arch/win32/resplus4.rc.po.c:33 src/arch/win32/resvic20.rc.po.c:33
-#, fuzzy
 msgid "&All"
-msgstr "Mindegyik"
+msgstr "&Mindegyik"
 
 #: src/arch/win32/resc128.rc.po.c:36 src/arch/win32/resc64.rc.po.c:36
 #: src/arch/win32/rescbm2.rc.po.c:35 src/arch/win32/respet.rc.po.c:35
@@ -7570,30 +7555,26 @@
 #: src/arch/win32/resc128.rc.po.c:38 src/arch/win32/resc64.rc.po.c:38
 #: src/arch/win32/rescbm2.rc.po.c:37 src/arch/win32/respet.rc.po.c:37
 #: src/arch/win32/resplus4.rc.po.c:37 src/arch/win32/resvic20.rc.po.c:37
-#, fuzzy
 msgid "&Add current image"
-msgstr "Az aktu\xE1lis k\xE9pm\xE1s hozz\xE1ad\xE1sa"
+msgstr "Az &aktu\xE1lis k\xE9pm\xE1s hozz\xE1ad\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:39 src/arch/win32/resc64.rc.po.c:39
 #: src/arch/win32/rescbm2.rc.po.c:38 src/arch/win32/respet.rc.po.c:38
 #: src/arch/win32/resplus4.rc.po.c:38 src/arch/win32/resvic20.rc.po.c:38
-#, fuzzy
 msgid "&Remove current image"
-msgstr "Az aktu\xE1lis k\xE9pm\xE1s elt\xE1vol\xEDt\xE1sa"
+msgstr "Az aktu\xE1lis k\xE9pm\xE1s &elt\xE1vol\xEDt\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:40 src/arch/win32/resc64.rc.po.c:40
 #: src/arch/win32/rescbm2.rc.po.c:39 src/arch/win32/respet.rc.po.c:39
 #: src/arch/win32/resplus4.rc.po.c:39 src/arch/win32/resvic20.rc.po.c:39
-#, fuzzy
 msgid "Attach &next image"
-msgstr "K\xF6vetkez\xF5 k\xE9pm\xE1s csatol\xE1sa"
+msgstr "&K\xF6vetkez\xF5 k\xE9pm\xE1s csatol\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:41 src/arch/win32/resc64.rc.po.c:41
 #: src/arch/win32/rescbm2.rc.po.c:40 src/arch/win32/respet.rc.po.c:40
 #: src/arch/win32/resplus4.rc.po.c:40 src/arch/win32/resvic20.rc.po.c:40
-#, fuzzy
 msgid "Attach &previous image"
-msgstr "El\xF5z\xF5 k\xE9pm\xE1s csatol\xE1sa"
+msgstr "&El\xF5z\xF5 k\xE9pm\xE1s csatol\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:43 src/arch/win32/resc64.rc.po.c:43
 #: src/arch/win32/rescbm2.rc.po.c:42 src/arch/win32/respet.rc.po.c:42
@@ -7610,9 +7591,8 @@
 #: src/arch/win32/resc128.rc.po.c:47 src/arch/win32/resc64.rc.po.c:47
 #: src/arch/win32/rescbm2.rc.po.c:46 src/arch/win32/respet.rc.po.c:46
 #: src/arch/win32/resplus4.rc.po.c:46 src/arch/win32/resvic20.rc.po.c:46
-#, fuzzy
 msgid "Attach &tape image..."
-msgstr "Szalag k\xE9pm\xE1s csatol\xE1sa..."
+msgstr "&Szalag k\xE9pm\xE1s csatol\xE1sa..."
 
 #: src/arch/win32/resc128.rc.po.c:48 src/arch/win32/resc64.rc.po.c:48
 #: src/arch/win32/rescbm2.rc.po.c:47 src/arch/win32/respet.rc.po.c:47
@@ -7750,23 +7730,20 @@
 msgstr "Cartridge k\xE9pm\xE1s &lev\xE1laszt\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:88 src/arch/win32/resc64.rc.po.c:89
-#, fuzzy
 msgid "Cartridge free&ze"
-msgstr "Fagyaszt\xE1s Cartridge-el"
+msgstr "&Fagyaszt\xE1s Cartridge-dzsel"
 
 #: src/arch/win32/resc128.rc.po.c:90 src/arch/win32/resc64.rc.po.c:91
 #: src/arch/win32/rescbm2.rc.po.c:61 src/arch/win32/respet.rc.po.c:59
 #: src/arch/win32/resplus4.rc.po.c:71 src/arch/win32/resvic20.rc.po.c:69
-#, fuzzy
 msgid "&Pause"
-msgstr "Sz\xFCnet"
+msgstr "&Sz\xFCnet"
 
 #: src/arch/win32/resc128.rc.po.c:91 src/arch/win32/resc64.rc.po.c:92
 #: src/arch/win32/rescbm2.rc.po.c:63 src/arch/win32/respet.rc.po.c:61
 #: src/arch/win32/resplus4.rc.po.c:73 src/arch/win32/resvic20.rc.po.c:71
-#, fuzzy
 msgid "&Monitor"
-msgstr "Monitor"
+msgstr "&Monitor"
 
 #: src/arch/win32/resc128.rc.po.c:92 src/arch/win32/resc64.rc.po.c:93
 #: src/arch/win32/rescbm2.rc.po.c:64 src/arch/win32/respet.rc.po.c:62
@@ -7777,16 +7754,14 @@
 #: src/arch/win32/resc128.rc.po.c:94 src/arch/win32/resc64.rc.po.c:95
 #: src/arch/win32/rescbm2.rc.po.c:66 src/arch/win32/respet.rc.po.c:64
 #: src/arch/win32/resplus4.rc.po.c:76 src/arch/win32/resvic20.rc.po.c:74
-#, fuzzy
 msgid "&Hard"
-msgstr "Hideg"
+msgstr "&Hideg"
 
 #: src/arch/win32/resc128.rc.po.c:95 src/arch/win32/resc64.rc.po.c:96
 #: src/arch/win32/rescbm2.rc.po.c:67 src/arch/win32/respet.rc.po.c:65
 #: src/arch/win32/resplus4.rc.po.c:77 src/arch/win32/resvic20.rc.po.c:75
-#, fuzzy
 msgid "&Soft"
-msgstr "Meleg"
+msgstr "&Meleg"
 
 #: src/arch/win32/resc128.rc.po.c:97 src/arch/win32/resc64.rc.po.c:98
 #: src/arch/win32/rescbm2.rc.po.c:69 src/arch/win32/respet.rc.po.c:67
@@ -7846,30 +7821,26 @@
 #: src/arch/win32/resc128.rc.po.c:112 src/arch/win32/resc64.rc.po.c:113
 #: src/arch/win32/rescbm2.rc.po.c:84 src/arch/win32/respet.rc.po.c:82
 #: src/arch/win32/resplus4.rc.po.c:94 src/arch/win32/resvic20.rc.po.c:92
-#, fuzzy
 msgid "&Main CPU Trace"
-msgstr "&F\xF5 CPU k\xF6vet\xE9se\tAlt+F10"
+msgstr "&F\xF5 CPU k\xF6vet\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:113 src/arch/win32/resc64.rc.po.c:114
 #: src/arch/win32/rescbm2.rc.po.c:85 src/arch/win32/respet.rc.po.c:83
 #: src/arch/win32/resplus4.rc.po.c:95 src/arch/win32/resvic20.rc.po.c:93
-#, fuzzy
 msgid "Drive&0 CPU Trace"
-msgstr "&0. lemezegys\xE9g CPU k\xF6vet\xE9se\tAlt+F11"
+msgstr "&0. lemezegys\xE9g CPU k\xF6vet\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:114 src/arch/win32/resc64.rc.po.c:115
 #: src/arch/win32/rescbm2.rc.po.c:86 src/arch/win32/respet.rc.po.c:84
 #: src/arch/win32/resplus4.rc.po.c:96 src/arch/win32/resvic20.rc.po.c:94
-#, fuzzy
 msgid "Drive&1 CPU Trace"
-msgstr "&1. lemezegys\xE9g CPU k\xF6vet\xE9se\tAlt+F12"
+msgstr "&1. lemezegys\xE9g CPU k\xF6vet\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:118 src/arch/win32/resc64.rc.po.c:119
 #: src/arch/win32/rescbm2.rc.po.c:90 src/arch/win32/respet.rc.po.c:88
 #: src/arch/win32/resplus4.rc.po.c:100 src/arch/win32/resvic20.rc.po.c:98
-#, fuzzy
 msgid "E&xit"
-msgstr "Kil\xE9p\xE9s"
+msgstr "&Kil\xE9p\xE9s"
 
 #: src/arch/win32/resc128.rc.po.c:120 src/arch/win32/resc64.rc.po.c:121
 #: src/arch/win32/rescbm2.rc.po.c:92 src/arch/win32/respet.rc.po.c:90
@@ -7892,16 +7863,14 @@
 #: src/arch/win32/resc128.rc.po.c:124 src/arch/win32/resc64.rc.po.c:125
 #: src/arch/win32/rescbm2.rc.po.c:96 src/arch/win32/respet.rc.po.c:94
 #: src/arch/win32/resplus4.rc.po.c:106 src/arch/win32/resvic20.rc.po.c:104
-#, fuzzy
 msgid "&Load quicksnapshot image"
-msgstr "Gyors pillanatk\xE9p bet\xF6lt\xE9se"
+msgstr "Gyors pillanatk\xE9p &bet\xF6lt\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:125 src/arch/win32/resc64.rc.po.c:126
 #: src/arch/win32/rescbm2.rc.po.c:97 src/arch/win32/respet.rc.po.c:95
 #: src/arch/win32/resplus4.rc.po.c:107 src/arch/win32/resvic20.rc.po.c:105
-#, fuzzy
 msgid "&Save quicksnapshot image"
-msgstr "Gyors pillanatk\xE9p f\xE1jl ment\xE9se"
+msgstr "Gyors pillanatk\xE9p f\xE1jl &ment\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:127 src/arch/win32/resc64.rc.po.c:128
 #: src/arch/win32/rescbm2.rc.po.c:99 src/arch/win32/respet.rc.po.c:97
@@ -8105,9 +8074,8 @@
 #: src/arch/win32/resc128.rc.po.c:176 src/arch/win32/resc64.rc.po.c:179
 #: src/arch/win32/rescbm2.rc.po.c:148 src/arch/win32/respet.rc.po.c:146
 #: src/arch/win32/resplus4.rc.po.c:158 src/arch/win32/resvic20.rc.po.c:156
-#, fuzzy
 msgid "&Warp mode"
-msgstr "Hipergyors m\xF3d"
+msgstr "&Hipergyors m\xF3d"
 
 #: src/arch/win32/resc128.rc.po.c:178 src/arch/win32/resc64.rc.po.c:182
 #: src/arch/win32/rescbm2.rc.po.c:151 src/arch/win32/respet.rc.po.c:150
@@ -8139,7 +8107,7 @@
 #: src/arch/win32/resplus4.rc.po.c:172 src/arch/win32/resvic20.rc.po.c:170
 #: src/arch/amigaos/intl.c.po.c:1059
 msgid "Scale2x"
-msgstr "2x m\xE9retez"
+msgstr "\xC9lsim\xEDt\xE1s"
 
 #: src/arch/win32/resc128.rc.po.c:184
 msgid "VDC settin&gs"
@@ -8152,9 +8120,8 @@
 #: src/arch/win32/resc128.rc.po.c:192 src/arch/win32/resc64.rc.po.c:190
 #: src/arch/win32/rescbm2.rc.po.c:160 src/arch/win32/respet.rc.po.c:156
 #: src/arch/win32/resplus4.rc.po.c:175 src/arch/win32/resvic20.rc.po.c:173
-#, fuzzy
 msgid "Swap &Joystick"
-msgstr "Botkorm\xE1nyok felcser\xE9l\xE9se"
+msgstr "Botkorm\xE1nyok &felcser\xE9l\xE9se"
 
 #: src/arch/win32/resc128.rc.po.c:194 src/arch/win32/resc64.rc.po.c:192
 #: src/arch/win32/rescbm2.rc.po.c:162 src/arch/win32/respet.rc.po.c:158
@@ -8200,9 +8167,8 @@
 msgstr "IEEE&488 interf\xE9sz emul\xE1ci\xF3"
 
 #: src/arch/win32/resc128.rc.po.c:207 src/arch/win32/resc64.rc.po.c:205
-#, fuzzy
 msgid "&Grab mouse events"
-msgstr "&1351 eg\xE9r emul\xE1ci\xF3\tAlt+Q"
+msgstr "Eg\xE9r &esem\xE9nyek elkap\xE1sa"
 
 #: src/arch/win32/resc128.rc.po.c:209 src/arch/win32/resc64.rc.po.c:207
 #: src/arch/win32/rescbm2.rc.po.c:174 src/arch/win32/respet.rc.po.c:170
@@ -8252,9 +8218,8 @@
 msgstr "&Billenty\xFBzet be\xE1ll\xEDt\xE1sai..."
 
 #: src/arch/win32/resc128.rc.po.c:218 src/arch/win32/resc64.rc.po.c:216
-#, fuzzy
 msgid "Mo&use settings..."
-msgstr "P&lus4 be\xE1ll\xEDt\xE1sai..."
+msgstr "Eg\xE9r &be\xE1ll\xEDt\xE1sai..."
 
 #: src/arch/win32/resc128.rc.po.c:219 src/arch/win32/resc64.rc.po.c:217
 #: src/arch/win32/rescbm2.rc.po.c:184 src/arch/win32/respet.rc.po.c:179
@@ -9219,7 +9184,7 @@
 
 #: src/arch/win32/reside64.rc.po.c:41 src/arch/amigaos/intl.c.po.c:3818
 msgid "Cylinders"
-msgstr "Cilinderek"
+msgstr "S\xE1vok"
 
 #: src/arch/win32/reside64.rc.po.c:42 src/arch/amigaos/intl.c.po.c:3827
 msgid "Heads"
@@ -9882,6 +9847,10 @@
 msgid "New &Luminances"
 msgstr "\xDAj &f\xE9nyer\xF5k"
 
+#: src/translate.c.po.c:714
+msgid "Specify name of Norwegain Kernal ROM image"
+msgstr "Adja meg a norv\xE9g Kernal ROM k\xE9pm\xE1s nev\xE9t"
+
 #: src/translate.c.po.c:2626
 msgid "<0-2000>"
 msgstr "<0-2000>"
@@ -9925,11 +9894,11 @@
 
 #: src/translate.c.po.c:4184
 msgid "Execute monitor commands from file"
-msgstr ""
+msgstr "Monitorprogram parancsok futtat\xE1sa f\xE1jlb\xF3l"
 
 #: src/translate.c.po.c:4194
 msgid "Set an initial breakpoint for the monitor"
-msgstr ""
+msgstr "Kezdeti t\xF6r\xE9spont megad\xE1sa a monitorprogramnak"
 
 #: src/translate.c.po.c:4655
 msgid "<iso language code>"
@@ -10217,7 +10186,7 @@
 
 #: src/arch/amigaos/intl.c.po.c:1113
 msgid "Virtual device traps"
-msgstr "*Virtu\xE1lis eszk\xF6z\xF6k ciklus kihagy\xE1sa"
+msgstr "Virtu\xE1lis eszk\xF6z\xF6k ciklus kihagy\xE1sa"
 
 #: src/arch/amigaos/intl.c.po.c:1122
 msgid "Drive sync factor"
@@ -10257,7 +10226,7 @@
 
 #: src/arch/amigaos/intl.c.po.c:1212
 msgid "Grab mouse events"
-msgstr ""
+msgstr "Eg\xE9r esem\xE9nyek elkap\xE1sa"
 
 #: src/arch/amigaos/intl.c.po.c:1230
 msgid "Video settings..."
@@ -10312,9 +10281,8 @@
 msgstr "Billenty\xFBzet be\xE1ll\xEDt\xE1sai..."
 
 #: src/arch/amigaos/intl.c.po.c:1356
-#, fuzzy
 msgid "Mouse settings..."
-msgstr "Hang be\xE1ll\xEDt\xE1sai..."
+msgstr "Eg\xE9r be\xE1ll\xEDt\xE1sai..."
 
 #: src/arch/amigaos/intl.c.po.c:1365
 msgid "Sound settings..."
@@ -10430,7 +10398,7 @@
 
 #: src/arch/amigaos/intl.c.po.c:1635
 msgid "About..."
-msgstr "A VICE-r\xF3l..."
+msgstr "N\xE9vjegy..."
 
 #: src/arch/amigaos/intl.c.po.c:1671
 msgid "No warranty"
@@ -10696,7 +10664,7 @@
 
 #: src/arch/amigaos/intl.c.po.c:2855
 msgid "Reset Datasette with CPU"
-msgstr "*Alaphelyzetbe hoz\xE1s CPU Reset eset\xE9n"
+msgstr "Alaphelyzetbe hoz\xE1s CPU Reset eset\xE9n"
 
 #: src/arch/amigaos/intl.c.po.c:2864
 msgid "Additional Delay"
@@ -10966,7 +10934,7 @@
 
 #: src/arch/amigaos/intl.c.po.c:4088
 msgid "Save currently attached disk images"
-msgstr "A jelenleg csatolt lemezek &ment\xE9se"
+msgstr "A jelenleg csatolt lemezek ment\xE9se"
 
 #: src/arch/amigaos/intl.c.po.c:4097
 msgid "Save currently loaded ROM images"
@@ -11153,263 +11121,17 @@
 msgstr "Hanger\xF5 (0-100%)"
 
 #: src/arch/amigaos/intl.c.po.c:4691
-#, fuzzy
 msgid "Mouse Settings"
-msgstr "Hang be\xE1ll\xEDt\xE1sai"
+msgstr "Eg\xE9r be\xE1ll\xEDt\xE1sok"
 
 #: src/arch/amigaos/intl.c.po.c:4709
-#, fuzzy
 msgid "1351 mouse"
-msgstr "1351 eg\xE9r emul\xE1ci\xF3"
+msgstr "1351 eg\xE9r"
 
 #: src/arch/amigaos/intl.c.po.c:4718
-#, fuzzy
 msgid "NEOS mouse"
-msgstr "*Eg\xE9r enged\xE9lyez\xE9se"
+msgstr "NEOS eg\xE9r"
 
 #: src/arch/amigaos/intl.c.po.c:4727
 msgid "Amiga mouse"
-msgstr ""
-
-#~ msgid "Drive &8\tAlt+8"
-#~ msgstr "#&8-as lemezegys\xE9g\tAlt+8"
-
-#~ msgid "Drive &9\tAlt+9"
-#~ msgstr "#&9-as lemezegys\xE9g\tAlt+9"
-
-#~ msgid "Drive 1&0\tAlt+0"
-#~ msgstr "#1&0-es lemezegys\xE9g\tAlt+0"
-
-#~ msgid "Drive &11\tAlt+1"
-#~ msgstr "#1&0-es lemezegys\xE9g\tAlt+1"
-
-#~ msgid "&All\tAlt+A"
-#~ msgstr "\xD6&sszes\tAlt+A"
-
-#~ msgid "&Add current image\tAlt+I"
-#~ msgstr "Az aktu\xE1lis k\xE9pm\xE1s ho&zz\xE1ad\xE1sa\tAlt+I"
-
-#~ msgid "&Remove current image\tAlt+K"
-#~ msgstr "Az aktu\xE1lis k\xE9pm\xE1s el&t\xE1vol\xEDt\xE1sa\tAlt+K"
-
-#~ msgid "Attach &next image\tAlt+N"
-#~ msgstr "&K\xF6vetkez\xF5 k\xE9pm\xE1s csatol\xE1sa\tAlt+N"
-
-#~ msgid "Attach &previous image\tAlt+B"
-#~ msgstr "&El\xF5z\xF5 k\xE9pm\xE1s csatol\xE1sa\tAlt+B"
-
-#~ msgid "Attach &tape image...\tAlt+T"
-#~ msgstr "Szalag k\xE9pm\xE1s csatol\xE1sa...\tAlt+T"
-
-#~ msgid "Cartridge free&ze\tAlt+Z"
-#~ msgstr "Fagyaszt\xE1s Cartridge-el\tAlt+Z"
-
-#~ msgid "&Pause\tAlt+Pause"
-#~ msgstr "&Sz\xFCnet\tAlt+Pause"
-
-#~ msgid "&Monitor\tAlt+M"
-#~ msgstr "&Monitor\tAlt+M"
-
-#~ msgid "&Hard\tCtrl+Alt+R"
-#~ msgstr "&Hideg\tCtrl+Alt+R"
-
-#~ msgid "&Soft\tAlt+R"
-#~ msgstr "&Meleg\tAlt+R"
-
-#~ msgid "E&xit\tAlt+X"
-#~ msgstr "&Kil\xE9p\xE9s\tAlt+X"
-
-#~ msgid "&Load quicksnapshot image\tAlt+L"
-#~ msgstr "Gyors pillanatk\xE9p b&et\xF6lt\xE9se\tAlt+L"
-
-#~ msgid "&Save quicksnapshot image\tAlt+S"
-#~ msgstr "Gyors pillanatk\xE9p me&nt\xE9se\tAlt+S"
-
-#~ msgid "Set Recording Milestone\tAlt+G"
-#~ msgstr "Kil\xF3m\xE9terk\xF5 elhelyez\xE9se a felv\xE9telben\tAlt+G"
-
-#~ msgid "Return to Milestone\tAlt+H"
-#~ msgstr "Visszat\xE9r\xE9s az el\xF5z\xF5 kil\xF3m\xE9terk\xF5h\xF6z\tAlt+H"
-
-#~ msgid "Save/stop media file...\tAlt+C"
-#~ msgstr "Vide\xF3 k\xE9sz\xEDt\xE9se/meg\xE1ll\xEDt\xE1sa...\tAlt+C"
-
-#~ msgid "&Warp mode\tAlt+W"
-#~ msgstr "&Hipergyors m\xF3d\tAlt+W"
-
-#~ msgid "Swap &Joystick\tAlt+J"
-#~ msgstr "Botkorm\xE1nyok felcser\xE9l\xE9se\tAlt+J"
-
-#~ msgid "Fullscreen\tAlt+D"
-#~ msgstr "Teljes k\xE9perny\xF5\tAlt+D"
-
-#~ msgid "Can't add fontpath `%s'.\n"
-#~ msgstr "Nem siker\xFClt a `%s'.jelk\xE9szlet \xFAtvonal hozz\xE1ad\xE1sa\n"
-
-#~ msgid "Set fontpath: `%s'.\n"
-#~ msgstr "`%s' jelk\xE9szlet \xFAtvonat be\xE1ll\xEDt\xE1sa.\n"
-
-#~ msgid "Cannot load text font %s."
-#~ msgstr "Nem siker\xFClt a %s sz\xF6veg jelk\xE9szletet bet\xF6lteni."
-
-#~ msgid "Enable emulation of the 1351 proportional mouse"
-#~ msgstr "1351-es proporcion\xE1lis eg\xE9r emul\xE1l\xE1s\xE1nak enged\xE9lyez\xE9se"
-
-#~ msgid "Disable emulation of the 1351 proportional mouse"
-#~ msgstr "1351-es proporcion\xE1lis eg\xE9r emul\xE1l\xE1s\xE1nak tilt\xE1sa"
-
-#, fuzzy
-#~ msgid "Romsetbestand"
-#~ msgstr "ROM k\xE9szlet"
-
-#, fuzzy
-#~ msgid "Mouse Port"
-#~ msgstr "Eg\xE9r port"
-
-#~ msgid "*VIC-II settings"
-#~ msgstr "*VIC-II be\xE1ll\xEDt\xE1sai"
-
-#~ msgid "Commands"
-#~ msgstr "Parancsok"
-
-#~ msgid "DGA1 Resolutions"
-#~ msgstr "DGA1 felbont\xE1sok"
-
-#~ msgid "DGA2 Resolutions"
-#~ msgstr "DGA2 felbont\xE1sok"
-
-#~ msgid "Successfully initialized video."
-#~ msgstr "A vide\xF3 kijelz\xF5 sikeresen elindult."
-
-#~ msgid "Found %dbit visual."
-#~ msgstr "A VICE %d bites kijelz\xF5t tal\xE1lt"
-
-#~ msgid "Attach debugger to pid %d...\n"
-#~ msgstr "Nyomk\xF6vet\xF5 csatol\xE1sa a %d folyamathoz...\n"
-
-#~ msgid "Successfully forked DGA."
-#~ msgstr "A DGA sikeresen forkolt."
-
-#~ msgid "Unable to query DGA1 version."
-#~ msgstr "Nem siker\xFClt a DGA 1 verzi\xF3 lek\xE9r\xE9se."
-
-#~ msgid "Unable to query DGA1 information."
-#~ msgstr "Nem siker\xFClt a DGA 1 inform\xE1ci\xF3 lek\xE9r\xE9se."
-
-#~ msgid "Root permissions required to use DGA1."
-#~ msgstr "A DGA 1 haszn\xE1lat\xE1hoz rendszergazdai jogok sz\xFCks\xE9gesek."
-
-#~ msgid "Problems with DGA - disabling fullscreen."
-#~ msgstr "DGA probl\xE9ma - teljesk\xE9perny\xF5 tilt\xE1sa"
-
-#~ msgid "Error switching to fullscreen%s"
-#~ msgstr "Hiba teljes k\xE9perny\xF5re kapcsol\xE1skor: %s"
-
-#~ msgid "DGA extension: addr:%p, width %d, bank size %d mem size %d\n"
-#~ msgstr ""
-#~ "DGA kiterjeszt\xE9s: c\xEDm:%p, sz\xE9less\xE9g %d, bank m\xE9ret %d mem. m\xE9ret %d\n"
-
-#~ msgid "Switch to windowmode"
-#~ msgstr "Ablakos m\xF3dba kapcsol\xE1s"
-
-#~ msgid "Selected mode: %s"
-#~ msgstr "Kiv\xE1lasztott m\xF3d: %s"
-
-#~ msgid "Attach debugger to pid %d..."
-#~ msgstr "Nyomk\xF6vet\xF5 csatol\xE1sa a %d folyamathoz..."
-
-#~ msgid "refresh, not ready, skipping frame"
-#~ msgstr "friss\xEDt\xE9s, nem k\xE9sz\xFClt el, keret \xE1tugr\xE1sa"
-
-#~ msgid "Successfully forked DGA"
-#~ msgstr "A DGA sikeresen forkolt"
-
-#~ msgid "Unable to query video extension version - disabling fullscreen."
-#~ msgstr ""
-#~ "Nem siker\xFClt a video kiterjeszt\xE9s verzi\xF3j\xE1t lek\xE9rni - teljesk\xE9perny\xF5 "
-#~ "letiltva."
-
-#~ msgid "Unable to query video extension information - disabling fullscreen."
-#~ msgstr ""
-#~ "Nem siker\xFClt a video kiterjeszt\xE9s adatait lek\xE9rni - teljesk\xE9perny\xF5 "
-#~ "letiltva."
-
-#~ msgid "Xserver is running an old XFree86-DGA version (%d.%d) "
-#~ msgstr "Az XServer r\xE9gi XFree86-DGA verzi\xF3t futat (%d.%d)"
-
-#~ msgid "Minimum required version is %d.%d - disabling fullscreen."
-#~ msgstr "Legal\xE1bb %d.%d verzi\xF3 sz\xFCks\xE9ges - teljesk\xE9perny\xF5 letiltva."
-
-#~ msgid "Switch to fullscreen%s"
-#~ msgstr "\xC1tkapcsol\xE1s teljes k\xE9perny\xF5re %s"
-
-#~ msgid "Need root privileges for DGA2 fullscreen"
-#~ msgstr "A DGA2 teljesk\xE9perny\xF5s m\xF3d rendszergazda jogokat ig\xE9nyel."
-
-#~ msgid "Error switching to fullscreen (SetMode) %ix%i"
-#~ msgstr "Hiba teljesk\xE9perny\xF5s m\xF3dba kapcsol\xE1skor (SetMode) %ix%i"
-
-#~ msgid "Error switching to fullscreen (pixmap) %ix%i"
-#~ msgstr "Hiba teljesk\xE9perny\xF5s m\xF3dba kapcsol\xE1skor (bitk\xE9p) %ix%i"
-
-#~ msgid ""
-#~ "Not enough video memory pages in mode %s, disabling fullscreen (%d,%d)."
-#~ msgstr ""
-#~ "Nincs el\xE9g vide\xF3 mem\xF3ria lap %s m\xF3dban, teljes k\xE9perny\xF5 tilt\xE1sa (%d,%d)."
-
-#~ msgid "Error switching to fullscreen (CreateGC) %ix%i"
-#~ msgstr "Hiba t\xF6rt\xE9nt teljes k\xE9perny\xF5re v\xE1lt\xE1skor (CreateGC) %ix%i"
-
-#~ msgid "Couldn't allocate color cache"
-#~ msgstr "Nem siker\xFClt sz\xEDncache-t foglalni"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Start monitor?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Ind\xEDtsam a monitort?"
-
-#~ msgid "glXWaitVideoSyncSGI() returned %d"
-#~ msgstr "glXWaitVideoSyncSGI() visszatérési értéke %d"
-
-#~ msgid "glXChooseVisual() failed"
-#~ msgstr "glXChooseVisual() hiba"
-
-#~ msgid "glXCreateContext() failed"
-#~ msgstr "glXCreateContext() hiba"
-
-#~ msgid "GLX_SGI_video_sync extension is supported"
-#~ msgstr "GLX_SGI_video_sync kiterjesztés támogatott"
-
-#~ msgid "GLX_SGI_video_sync extension not supported"
-#~ msgstr "GLX_SGI_video_sync kiterjesztés nem támogatott"
-
-#~ msgid "%s openGL_sync"
-#~ msgstr "%s openGL_sync"
-
-#~ msgid "enabling"
-#~ msgstr "engedélyezés"
-
-#~ msgid "disabling"
-#~ msgstr "tiltás"
-
-#~ msgid "double size not implemented - use standard double size from menu."
-#~ msgstr ""
-#~ "dupla méret nem támogatott - használja a normál dupla méretet a "
-#~ "menüből."
-
-#~ msgid "X11 XRandR extension not available, using default display mode."
-#~ msgstr ""
-#~ "X11 XRandR kiterjesztés nem elérhető, normál kijelzés használata"
-
-#~ msgid "XRandR reports current display: %dx%d@%d"
-#~ msgstr "XRandR jelenlegi felbontás: %dx%d@%d"
-
-#~ msgid "%s XRandR"
-#~ msgstr "%s XRandR"
-
-#~ msgid "XRandR setting failed: %d"
-#~ msgstr "XRandR beállítás hiba: %d"
+msgstr "Amiga eg\xE9r"

Modified: branches/pottendo/v1.22.17-intlupd/vice/po/sv.po
===================================================================
--- branches/pottendo/v1.22.17-intlupd/vice/po/sv.po	2008-06-21 19:52:21 UTC (rev 18880)
+++ branches/pottendo/v1.22.17-intlupd/vice/po/sv.po	2008-06-22 08:10:40 UTC (rev 18881)
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-03 19:42+0200\n"
-"PO-Revision-Date: 2008-06-11 09:00+0100\n"
+"POT-Creation-Date: 2008-06-22 10:07+0200\n"
+"PO-Revision-Date: 2008-06-22 10:08+0200\n"
 "Last-Translator: Peter Karlsson <pe...@so...>\n"
 "Language-Team: Swedish <tp...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -16,48 +16,32 @@
 "X-Poedit-Language: Swedish\n"
 "X-Poedit-Country: SWEDEN\n"
 
-#: src/vsync.c:147
-#: src/sid/sid-cmdline-options.c:186
-#: src/sid/sid-cmdline-options.c:189
-#: src/translate.c.po.c:3457
+#: src/vsync.c:147 src/sid/sid-cmdline-options.c:186
+#: src/sid/sid-cmdline-options.c:189 src/translate.c.po.c:3457
 msgid "<percent>"
 msgstr "<procent>"
 
-#: src/vsync.c:147
-#: src/translate.c.po.c:4615
+#: src/vsync.c:147 src/translate.c.po.c:4615
 msgid "Limit emulation speed to specified value"
 msgstr "Begr\xE4nsa emuleringshastighet till angivet v\xE4rde"
 
-#: src/vsync.c:149
-#: src/sound.c:279
-#: src/sound.c:281
-#: src/debug.c:205
-#: src/c64/cart/ide64.c:283
-#: src/c64/cart/ide64.c:285
-#: src/c64/cart/ide64.c:287
-#: src/datasette.c:181
-#: src/datasette.c:184
-#: src/gfxoutputdrv/ffmpegdrv.c:201
-#: src/gfxoutputdrv/ffmpegdrv.c:204
-#: src/mouse.c:362
-#: src/mouse.c:364
-#: src/ram.c:101
-#: src/translate.c.po.c:1592
+#: src/vsync.c:149 src/sound.c:279 src/sound.c:281 src/debug.c:205
+#: src/c64/cart/ide64.c:283 src/c64/cart/ide64.c:285 src/c64/cart/ide64.c:287
+#: src/datasette.c:181 src/datasette.c:184 src/gfxoutputdrv/ffmpegdrv.c:201
+#: src/gfxoutputdrv/ffmpegdrv.c:204 src/mouse.c:362 src/mouse.c:364
+#: src/ram.c:101 src/translate.c.po.c:1592
 msgid "<value>"
 msgstr "<v\xE4rde>"
 
-#: src/vsync.c:149
-#: src/translate.c.po.c:4625
+#: src/vsync.c:149 src/translate.c.po.c:4625
 msgid "Update every <value> frames (`0' for automatic)"
 msgstr "Uppdatera varje <v\xE4rde> ramar (\"0\" f\xF6r automatiskt)"
 
-#: src/vsync.c:151
-#: src/translate.c.po.c:4635
+#: src/vsync.c:151 src/translate.c.po.c:4635
 msgid "Enable warp mode"
 msgstr "Aktivera warpl\xE4ge"
 
-#: src/vsync.c:153
-#: src/translate.c.po.c:4645
+#: src/vsync.c:153 src/translate.c.po.c:4645
 msgid "Disable warp mode"
 msgstr "Inaktivera warpl\xE4ge"
 
@@ -65,100 +49,60 @@
 msgid "Your machine is too slow for current settings!"
 msgstr "Din maskin \xE4r f\xF6r l\xE5ngsam f\xF6r nuvarande inst\xE4llningar!"
 
-#: src/screenshot.c:171
-#: src/translate.c.po.c:221
+#: src/screenshot.c:171 src/translate.c.po.c:221
 msgid "Sorry. Multiple recording is not supported."
 msgstr "Endast en inspelning kan g\xF6ras \xE5t g\xE5ngen."
 
-#: src/autostart.c:186
-#: src/translate.c.po.c:96
+#: src/autostart.c:186 src/translate.c.po.c:96
 msgid "Cannot load snapshot file."
 msgstr "Kan inte l\xE4sa in \xF6gonblicksbildfil."
 
-#: src/sound.c:275
-#: src/translate.c.po.c:4465
+#: src/sound.c:275 src/translate.c.po.c:4465
 msgid "Enable sound playback"
 msgstr "Aktivera ljud\xE5tergivning"
 
-#: src/sound.c:277
-#: src/translate.c.po.c:4475
+#: src/sound.c:277 src/translate.c.po.c:4475
 msgid "Disable sound playback"
 msgstr "Inaktivera ljud\xE5tergivning"
 
-#: src/sound.c:279
-#: src/translate.c.po.c:4485
+#: src/sound.c:279 src/translate.c.po.c:4485
 msgid "Set sound sample rate to <value> Hz"
 msgstr "S\xE4tt ljudsamplingshastighet till <v\xE4rde> Hz"
 
-#: src/sound.c:281
-#: src/translate.c.po.c:4495
+#: src/sound.c:281 src/translate.c.po.c:4495
 msgid "Set sound buffer size to <value> msec"
 msgstr "S\xE4tt ljudbuffertstorlek till <v\xE4rde> ms"
 
-#: src/sound.c:283
-#: src/sound.c:287
-#: src/c128/c128-cmdline-options.c:108
-#: src/c128/c128-cmdline-options.c:110
-#: src/c128/c128-cmdline-options.c:112
-#: src/c128/c128-cmdline-options.c:114
-#: src/c128/c128-cmdline-options.c:116
-#: src/c128/c128-cmdline-options.c:118
-#: src/c128/c128-cmdline-options.c:120
-#: src/c128/c128-cmdline-options.c:122
-#: src/c128/c128-cmdline-options.c:124
-#: src/c128/c128-cmdline-options.c:126
-#: src/c128/c128-cmdline-options.c:128
-#: src/c128/c128-cmdline-options.c:130
-#: src/c128/c128-cmdline-options.c:132
-#: src/c128/c128-cmdline-options.c:134
-#: src/c128/c128-cmdline-options.c:136
-#: src/c128/c128-cmdline-options.c:157
-#: src/c128/c128-cmdline-options.c:159
-#: src/c128/functionrom.c:151
-#: src/c128/functionrom.c:153
-#: src/c64/c64-cmdline-options.c:91
-#: src/c64/c64-cmdline-options.c:93
-#: src/c64/c64-cmdline-options.c:95
-#: src/c64/c64-cmdline-options.c:112
-#: src/c64/c64-cmdline-options.c:114
-#: src/c64/c64-cmdline-options.c:116
-#: src/c64/cart/c64cart.c:236
-#: src/c64/cart/c64cart.c:239
-#: src/c64/cart/c64cart.c:242
-#: src/c64/cart/c64cart.c:245
-#: src/c64/cart/c64cart.c:248
-#: src/c64/cart/c64cart.c:251
-#: src/c64/cart/c64cart.c:254
-#: src/c64/cart/c64cart.c:257
-#: src/c64/cart/c64cart.c:260
-#: src/c64/cart/c64cart.c:263
-#: src/c64/cart/c64cart.c:266
-#: src/c64/cart/c64cart.c:269
-#: src/c64/cart/c64cart.c:272
-#: src/c64/cart/c64cart.c:275
-#: src/c64/cart/ide64.c:281
-#: src/c64/c64_256k.c:2...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu: [18878] branches/spiro/vice-1.22.18-reu/vice/src/c64/ reu.c

[<st...@us...>]

Revision: 18878
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18878&view=rev
Author:   strik
Date:     2008-06-21 08:53:57 -0700 (Sat, 21 Jun 2008)

Log Message:
-----------
Fixed some obvious bugs. 17xxTester and GEOS 2.0 work now.

Modified Paths:
--------------
    branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c

Modified: branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c
===================================================================
--- branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c	2008-06-21 02:25:26 UTC (rev 18877)
+++ branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c	2008-06-21 15:53:57 UTC (rev 18878)
@@ -406,11 +406,13 @@
 {
     BYTE retval = 0xff;
 
+    addr &= REU_REG_LAST_REG;
+
     if (addr < 0x0b) { /*! \TODO remove magic number! */
         io_source = IO_SOURCE_REU;
     }
 
-    switch (addr & REU_REG_LAST_REG) {
+    switch (addr) {
       case REU_REG_R_STATUS:
         retval = rec.status;
 
@@ -477,7 +479,9 @@
 
 void REGPARM2 reu_store(WORD addr, BYTE byte)
 {
-    switch (addr & REU_REG_LAST_REG)
+    addr &= REU_REG_LAST_REG;
+
+    switch (addr)
     {
     case REU_REG_R_STATUS:
         /* REC status register is Read Only */
@@ -489,26 +493,27 @@
 
     case REU_REG_RW_BASEADDR_LOW:
         rec.base_computer = 
-        rec.bank_reu_shadow = (rec.base_computer_shadow & 0xff00) | byte;
+        rec.base_computer_shadow = (rec.base_computer_shadow & 0xff00) | byte;
         break;
 
     case REU_REG_RW_BASEADDR_HIGH:
         rec.base_computer = 
-        rec.bank_reu_shadow = (rec.base_computer_shadow & 0xff) | (byte << 8);
+        rec.base_computer_shadow = (rec.base_computer_shadow & 0xff) | (byte << 8);
         break;
 
     case REU_REG_RW_RAMADDR_LOW:
         rec.base_reu =
-        rec.base_reu_shadow = (rec.base_computer_shadow & 0xff00) | byte;
+        rec.base_reu_shadow = (rec.base_reu_shadow & 0xff00) | byte;
         break;
 
     case REU_REG_RW_RAMADDR_HIGH:
         rec.base_reu =
-        rec.base_reu_shadow = (rec.base_computer_shadow & 0xff) | (byte << 8);
+        rec.base_reu_shadow = (rec.base_reu_shadow & 0xff) | (byte << 8);
         break;
 
     case REU_REG_RW_BANK:
-        //! \TODO
+        //! \TODO handle different expansions
+        rec.bank_reu = byte;
         break;
 
     case REU_REG_RW_BLOCKLEN_LOW:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18876] branches/marco/ports/vice/src

[<bla...@us...>]

Revision: 18876
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18876&view=rev
Author:   blackystardust
Date:     2008-06-19 19:29:47 -0700 (Thu, 19 Jun 2008)

Log Message:
-----------
Fixed plus4 csory/hannes issues, fixed monitor undump command and added 'continue' UI item to some of the other archs.

Modified Paths:
--------------
    branches/marco/ports/vice/src/arch/amigaos/uiapi.c
    branches/marco/ports/vice/src/arch/os2/ui.c
    branches/marco/ports/vice/src/arch/unix/x11/gnome/x11ui.c
    branches/marco/ports/vice/src/arch/unix/x11/xaw/x11ui.c
    branches/marco/ports/vice/src/monitor/mon_lex.c
    branches/marco/ports/vice/src/monitor/mon_lex.l
    branches/marco/ports/vice/src/plus4/plus4mem.c

Modified: branches/marco/ports/vice/src/arch/amigaos/uiapi.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/uiapi.c	2008-06-19 19:01:13 UTC (rev 18875)
+++ branches/marco/ports/vice/src/arch/amigaos/uiapi.c	2008-06-20 02:29:47 UTC (rev 18876)
@@ -53,10 +53,10 @@
 #include "translate.h"
 
 typedef enum {
-    UI_JAM_RESET, UI_JAM_HARD_RESET, UI_JAM_MONITOR
+    UI_JAM_RESET, UI_JAM_HARD_RESET, UI_JAM_MONITOR, UI_JAM_NONE
 } ui_jam_action_t;
 
-enum {REQ_JAM_MONITOR, REQ_JAM_RESET, REQ_JAM_HARD_RESET};
+enum {REQ_JAM_NONE, REQ_JAM_RESET, REQ_JAM_HARD_RESET, REQ_JAM_MONITOR};
 
 extern video_canvas_t *canvaslist;
 
@@ -323,7 +323,7 @@
   tmp = lib_mvsprintf(format,ap);
   va_end(ap);
 
-  action=ui_requester("VICE CPU Jam", tmp, "RESET|HARD RESET|MONITOR", REQ_JAM_RESET);
+  action=ui_requester("VICE CPU Jam", tmp, "RESET|HARD RESET|MONITOR|CONTINUE", REQ_JAM_RESET);
 
   switch(action)
   {
@@ -336,6 +336,9 @@
     case REQ_JAM_MONITOR:
       jamaction=UI_JAM_MONITOR;
       break;
+    case REQ_JAM_NONE:
+      jamaction=UI_JAM_NONE;
+      break;
   }
   return jamaction;
 }

Modified: branches/marco/ports/vice/src/arch/os2/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/ui.c	2008-06-19 19:01:13 UTC (rev 18875)
+++ branches/marco/ports/vice/src/arch/os2/ui.c	2008-06-20 02:29:47 UTC (rev 18876)
@@ -343,20 +343,22 @@
 
     va_list ap;
 
-    const int sz   = sizeof(MB2INFO)+2*sizeof(MB2D);
+    const int sz   = sizeof(MB2INFO)+3*sizeof(MB2D);
 
     MB2INFO *mb    = malloc(sz);
     mb->cb         = sz;
     mb->hIcon      = WinLoadPointer(HWND_DESKTOP, NULLHANDLE, PTR_SKULL);
-    mb->cButtons   = 3;
+    mb->cButtons   = 4;
     mb->flStyle    = MB_CUSTOMICON|WS_VISIBLE;
     mb->hwndNotify = NULLHANDLE;
     strcpy(mb->mb2d[0].achText, "  ~Hard Reset  ");
     strcpy(mb->mb2d[1].achText, "  ~Soft Reset  ");
-    strcpy(mb->mb2d[2].achText, "   ~Monitor   ");
+    strcpy(mb->mb2d[2].achText, "  ~Monitor     ");
+    strcpy(mb->mb2d[3].achText, "  ~Continue    ");
     mb->mb2d[0].idButton = UI_JAM_HARD_RESET;
     mb->mb2d[1].idButton = UI_JAM_RESET;
     mb->mb2d[2].idButton = UI_JAM_MONITOR;
+    mb->mv2d[3].idButton = UI_JAM_NONE;
     mb->mb2d[0].flStyle  = BS_DEFAULT;
     mb->mb2d[1].flStyle  = 0;
     mb->mb2d[2].flStyle  = 0;

Modified: branches/marco/ports/vice/src/arch/unix/x11/gnome/x11ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/gnome/x11ui.c	2008-06-19 19:01:13 UTC (rev 18875)
+++ branches/marco/ports/vice/src/arch/unix/x11/gnome/x11ui.c	2008-06-20 02:29:47 UTC (rev 18876)
@@ -1822,6 +1822,7 @@
 					     _("Reset"), 0, 
 					     _("Hard Reset"), 1,
 					     _("Monitor"), 2,
+					     _("Monitor"), 3,
 					     NULL);
     g_signal_connect(G_OBJECT(jam_dialog),
 		     "destroy",
@@ -1844,6 +1845,8 @@
     ui_dispatch_events();
 
     switch (res) {
+    case 3:
+      return UI_JAM_NONE;
     case 2:
 	ui_restore_mouse();
 #ifdef HAVE_FULLSCREEN

Modified: branches/marco/ports/vice/src/arch/unix/x11/xaw/x11ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/xaw/x11ui.c	2008-06-19 19:01:13 UTC (rev 18875)
+++ branches/marco/ports/vice/src/arch/unix/x11/xaw/x11ui.c	2008-06-20 02:29:47 UTC (rev 18876)
@@ -367,6 +367,7 @@
     "*resetButton.label:			     Reset",
     "*hardResetButton.label:                         Hard Reset",
     "*monButton.label:			   	     Monitor",
+    "*noneButton.label:			   	     Continue",
     "*debugButton.label:		   	     XDebugger",
     "*noButton.label:				     No",
     "*licenseButton.label:			     License...",
@@ -1642,6 +1643,7 @@
 DEFINE_BUTTON_CALLBACK(UI_BUTTON_NO)
 DEFINE_BUTTON_CALLBACK(UI_BUTTON_CLOSE)
 DEFINE_BUTTON_CALLBACK(UI_BUTTON_MON)
+DEFINE_BUTTON_CALLBACK(UI_BUTTON_NONE)
 /*DEFINE_BUTTON_CALLBACK(UI_BUTTON_DEBUG)*/
 DEFINE_BUTTON_CALLBACK(UI_BUTTON_RESET)
 DEFINE_BUTTON_CALLBACK(UI_BUTTON_HARDRESET)
@@ -1744,6 +1746,11 @@
     XtAddCallback(tmp, XtNcallback, UI_BUTTON_MON_callback,
                   (XtPointer) &button);
 
+    tmp = XtVaCreateManagedWidget
+        ("noneButton", commandWidgetClass, bbox, NULL);
+    XtAddCallback(tmp, XtNcallback, UI_BUTTON_NONE_callback,
+                  (XtPointer) &button);
+
     ui_popup(XtParent(jam_dialog), "VICE", False);
     button = UI_BUTTON_NONE;
     do
@@ -1765,6 +1772,8 @@
         return UI_JAM_MONITOR;
       case UI_BUTTON_HARDRESET:
         return UI_JAM_HARD_RESET;
+      case UI_BUTTON_NONE:
+        return UI_JAM_NONE;
       case UI_BUTTON_RESET:
       default:
         return UI_JAM_RESET;

Modified: branches/marco/ports/vice/src/monitor/mon_lex.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_lex.c	2008-06-19 19:01:13 UTC (rev 18875)
+++ branches/marco/ports/vice/src/monitor/mon_lex.c	2008-06-20 02:29:47 UTC (rev 18876)
@@ -1813,7 +1813,7 @@
 case 72:
 YY_RULE_SETUP
 #line 155 "mon_lex.l"
-{ BEGIN(INITIAL);       return CMD_UNDUMP; }
+{ BEGIN(FNAME);       return CMD_UNDUMP; }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP

Modified: branches/marco/ports/vice/src/monitor/mon_lex.l
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_lex.l	2008-06-19 19:01:13 UTC (rev 18875)
+++ branches/marco/ports/vice/src/monitor/mon_lex.l	2008-06-20 02:29:47 UTC (rev 18876)
@@ -152,7 +152,7 @@
         tapectrl        { BEGIN(INITIAL);       return CMD_TAPECTRL; }
         trace|tr        { BEGIN(INITIAL);       return CMD_TRACE; }
         until|un        { BEGIN(INITIAL);       return CMD_UNTIL; }
-        undump          { BEGIN(INITIAL);       return CMD_UNDUMP; }
+        undump          { BEGIN(FNAME);       return CMD_UNDUMP; }
         watch|w         { BEGIN(INITIAL);       return CMD_WATCH; }
         yydebug         { BEGIN(INITIAL);       return CMD_YYDEBUG; }
 }

Modified: branches/marco/ports/vice/src/plus4/plus4mem.c
===================================================================
--- branches/marco/ports/vice/src/plus4/plus4mem.c	2008-06-19 19:01:13 UTC (rev 18875)
+++ branches/marco/ports/vice/src/plus4/plus4mem.c	2008-06-20 02:29:47 UTC (rev 18876)
@@ -385,9 +385,12 @@
     if (addr == 0xfd15 && cs256k_enabled)
         return cs256k_reg_read(addr);
 
-    if (addr >= 0xfd10 && addr <= 0xfd1f)
+    if (addr == 0xfd10)
         return pio1_read(addr);
 
+    if (addr >= 0xfd11 && addr <= 0xfd1f && !cs256k_enabled && !h256k_enabled)
+        return pio1_read(addr);
+
     if (addr >= 0xfd30 && addr <= 0xfd3f)
         return pio2_read(addr);
 
@@ -413,10 +416,14 @@
         cs256k_reg_store(addr, value);
         return;
     }
-    if (addr >= 0xfd10 && addr <= 0xfd1f) {
+    if (addr == 0xfd10) {
         pio1_store(addr, value);
         return;
     }
+    if (addr >= 0xfd11 && addr <= 0xfd1f && !cs256k_enabled && !h256k_enabled) {
+        pio1_store(addr, value);
+        return;
+    }
     if (addr >= 0xfd30 && addr <= 0xfd3f) {
         pio2_store(addr, value);
         return;
@@ -461,6 +468,22 @@
     }
 }
 
+static BYTE REGPARM1 h256k_ram_ffxx_read(WORD addr)
+{
+    if ((addr >= 0xff20) && (addr != 0xff3e) && (addr != 0xff3f))
+        return h256k_read(addr);
+
+    return ted_read(addr);
+}
+
+static BYTE REGPARM1 cs256k_ram_ffxx_read(WORD addr)
+{
+    if ((addr >= 0xff20) && (addr != 0xff3e) && (addr != 0xff3f))
+        return cs256k_read(addr);
+
+    return ted_read(addr);
+}
+
 static BYTE REGPARM1 ram_ffxx_read(WORD addr)
 {
     if ((addr >= 0xff20) && (addr != 0xff3e) && (addr != 0xff3f))
@@ -486,6 +509,24 @@
 }
 
 
+static void REGPARM2 h256k_ram_ffxx_store(WORD addr, BYTE value)
+{
+    if (addr < 0xff20 || addr == 0xff3e || addr == 0xff3f) {
+        ted_store(addr, value);
+    } else {
+        h256k_store(addr, value);
+    }
+}
+
+static void REGPARM2 cs256k_ram_ffxx_store(WORD addr, BYTE value)
+{
+    if (addr < 0xff20 || addr == 0xff3e || addr == 0xff3f) {
+        ted_store(addr, value);
+    } else {
+        cs256k_store(addr, value);
+    }
+}
+
 static void REGPARM2 ram_ffxx_store(WORD addr, BYTE value)
 {
     if (addr < 0xff20 || addr == 0xff3e || addr == 0xff3f) {
@@ -761,6 +802,22 @@
         mem_read_base_tab[i + 1][0xfe] = NULL;
 
         switch (ram_size) {
+          case 4096:
+          case 1024:
+          case 256:
+            if (h256k_enabled) {
+              mem_read_tab[i + 0][0xff] = h256k_ram_ffxx_read;
+              mem_write_tab[i + 0][0xff] = h256k_ram_ffxx_store;
+            }
+            if (cs256k_enabled) {
+              mem_read_tab[i + 0][0xff] = cs256k_ram_ffxx_read;
+              mem_write_tab[i + 0][0xff] = cs256k_ram_ffxx_store;
+            }
+            mem_read_base_tab[i + 0][0xff] = NULL;
+            mem_read_tab[i + 1][0xff] = rom_ffxx_read;
+            mem_write_tab[i + 1][0xff] = rom_ffxx_store;
+            mem_read_base_tab[i + 1][0xff] = NULL;
+            break;
           default:
           case 64:
             mem_read_tab[i + 0][0xff] = ram_ffxx_read;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18875] branches/spiro/vice-1.22.18-reu/vice/src/c64

[<st...@us...>]

Revision: 18875
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18875&view=rev
Author:   strik
Date:     2008-06-19 12:01:13 -0700 (Thu, 19 Jun 2008)

Log Message:
-----------
Started working: Fixed half autoload feature, REU occupies 0x1F bytes
now. Reorganized code and introduced symbolic names.

Modified Paths:
--------------
    branches/spiro/vice-1.22.18-reu/vice/src/c64/c64io.c
    branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c

Modified: branches/spiro/vice-1.22.18-reu/vice/src/c64/c64io.c
===================================================================
--- branches/spiro/vice-1.22.18-reu/vice/src/c64/c64io.c	2008-06-19 18:51:59 UTC (rev 18874)
+++ branches/spiro/vice-1.22.18-reu/vice/src/c64/c64io.c	2008-06-19 19:01:13 UTC (rev 18875)
@@ -405,7 +405,7 @@
         io_source_counter++;
     }
     if (reu_enabled) {
-        return_value = reu_read((WORD)(addr & 0x0f));
+        return_value = reu_read(addr);
         io_source_check(io_source_counter);
         io_source_counter++;
     }
@@ -473,7 +473,7 @@
         digimax_sound_store((WORD)(addr & 0x03), value);
     }
     if (reu_enabled) {
-        reu_store((WORD)(addr & 0x0f), value);
+        reu_store(addr, value);
     }
     if (georam_enabled && addr >= 0xdf80) {
         georam_reg_store((WORD)(addr & 1), value);

Modified: branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c
===================================================================
--- branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c	2008-06-19 18:51:59 UTC (rev 18874)
+++ branches/spiro/vice-1.22.18-reu/vice/src/c64/reu.c	2008-06-19 19:01:13 UTC (rev 18875)
@@ -3,6 +3,7 @@
  *
  * Written by
  *  Andreas Boose <vic...@t-...>
+ *  Spiro Trikaliotis <spi...@gm...>
  * 
  * Based on old code by
  *  Jouko Valta <jo...@st...>
@@ -31,6 +32,7 @@
 
 #include "vice.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -69,28 +71,79 @@
 /*
  Offsets of the different REU registers
 */
-#define REU_REG_R_STATUS         0x00
-#define REU_REG_W_COMMAND        0x01
-#define REU_REG_RW_BASEADDR_LOW  0x02
-#define REU_REG_RW_BASEADDR_HIGH 0x03
-#define REU_REG_RW_RAMADDR_LOW   0x04
-#define REU_REG_RW_RAMADDR_HIGH  0x05
-#define REU_REG_RW_BANK          0x06
-#define REU_REG_RW_BLOCKLEN_LOW  0x07
-#define REU_REG_RW_BLOCKLEN_HIGH 0x08
-#define REU_REG_RW_INTERRUPT     0x09
-#define REU_REG_RW_ADDRCONTROL   0x0A
+enum {
+    REU_REG_R_STATUS         = 0x00,
+    REU_REG_RW_COMMAND       = 0x01,
+    REU_REG_RW_BASEADDR_LOW  = 0x02,
+    REU_REG_RW_BASEADDR_HIGH = 0x03,
+    REU_REG_RW_RAMADDR_LOW   = 0x04,
+    REU_REG_RW_RAMADDR_HIGH  = 0x05,
+    REU_REG_RW_BANK          = 0x06,
+    REU_REG_RW_BLOCKLEN_LOW  = 0x07,
+    REU_REG_RW_BLOCKLEN_HIGH = 0x08,
+    REU_REG_RW_INTERRUPT     = 0x09,
+    REU_REG_RW_ADDR_CONTROL  = 0x0A,
+    REU_REG_LAST_REG         = 0x1F
+};
 
+enum {
+    REU_REG_R_STATUS_CHIPVERSION_MASK  = 0x0F,
+    REU_REG_R_STATUS_64K_CHIPS         = 0x10,
+    REU_REG_R_STATUS_VERIFY_ERROR      = 0x20,
+    REU_REG_R_STATUS_END_OF_BLOCK      = 0x40,
+    REU_REG_R_STATUS_INTERRUPT_PENDING = 0x80
+};
+
+enum {
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_MASK    = 0x03,
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_TO_REU     = 0x00,
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_FROM_REU   = 0x01,
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_SWAP       = 0x02,
+    REU_REG_RW_COMMAND_TRANSFER_TYPE_VERIFY     = 0x03,
+    REU_REG_RW_COMMAND_RESERVED_MASK         = 0x4C,
+    REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED = 0x10,
+    REU_REG_RW_COMMAND_AUTOLOAD              = 0x20,
+    REU_REG_RW_COMMAND_EXECUTE               = 0x80
+};
+
+enum {
+    REU_REG_RW_INTERRUPT_UNUSED_MASK          = 0x1F,
+    REU_REG_RW_INTERRUPT_VERIFY_ENABLED       = 0x20,
+    REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED = 0x40,
+    REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED   = 0x80
+};
+
+enum {
+    REU_REG_RW_ADDR_CONTROL_UNUSED_MASK       = 0x3f,
+    REU_REG_RW_ADDR_CONTROL_FIX_REC           = 0x40,
+    REU_REG_RW_ADDR_CONTROL_FIX_C64           = 0x80
+};
+
 /* REU registers */
-static BYTE reu[16];
 
-/* shadow registers for implementing the "Half-Autoload-Bug"
-   Thanks to Wolfgang Moser for pointing this out
-*/
-static BYTE reu_baseaddr_low_shadow;
-static BYTE reu_ramaddr_low_shadow;
-static BYTE reu_blocklen_low_shadow;
+typedef
+struct rec_s {
+    BYTE status;
+    BYTE command;
 
+    WORD base_computer;
+    WORD base_reu;
+    BYTE bank_reu;
+    WORD transfer_length;
+
+    BYTE int_mask_reg;
+    BYTE address_control_reg;
+
+    /* shadow registers for implementing the "Half-Autoload-Bug" */
+    WORD base_computer_shadow;
+    WORD base_reu_shadow;
+    BYTE bank_reu_shadow;
+    WORD transfer_length_shadow;
+} rec_t;
+
+static rec_t rec;
+
+
 /* REU image.  */
 static BYTE *reu_ram = NULL;
 static int old_reu_ram_size = 0;
@@ -267,25 +320,23 @@
 
 void reu_reset(void)
 {
-    int i;
+    memset(&rec, 0, sizeof rec);
 
-    for (i = 0; i < 16; i++)
-        reu[i] = 0;
+    if (reu_size >= (256 << 10)) {
+        rec.status |= REU_REG_R_STATUS_64K_CHIPS;
+    }
 
-    /* clear the shadow registers */
-    reu_baseaddr_low_shadow =
-    reu_ramaddr_low_shadow =
-    reu_blocklen_low_shadow = 0;
+    rec.command = REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED;
 
-    if (reu_size >= (256 << 10))
-        reu[REU_REG_R_STATUS] = 0x10;
-    else
-        reu[REU_REG_R_STATUS] = 0x00;
+    rec.transfer_length =
+    rec.transfer_length_shadow = 0xffff;
 
-    reu[REU_REG_W_COMMAND] = 0x10;
+    rec.bank_reu =
+    rec.bank_reu_shadow = 0xf8;
 
-    reu[REU_REG_RW_BLOCKLEN_LOW]  = 0xFF;
-    reu[REU_REG_RW_BLOCKLEN_HIGH] = 0xFF;
+    rec.int_mask_reg = REU_REG_RW_INTERRUPT_UNUSED_MASK;
+
+    rec.address_control_reg = REU_REG_RW_ADDR_CONTROL_UNUSED_MASK;
 }
 
 static int reu_activate(void)
@@ -353,45 +404,68 @@
 
 BYTE REGPARM1 reu_read(WORD addr)
 {
-    BYTE retval;
+    BYTE retval = 0xff;
 
-    switch (addr) {
+    if (addr < 0x0b) { /*! \TODO remove magic number! */
+        io_source = IO_SOURCE_REU;
+    }
+
+    switch (addr & REU_REG_LAST_REG) {
       case REU_REG_R_STATUS:
-        io_source=IO_SOURCE_REU;
-        retval = reu[REU_REG_R_STATUS];
+        retval = rec.status;
 
         /* Bits 7-5 are cleared when register is read, and pending IRQs are
            removed. */
-        reu[REU_REG_R_STATUS] &= ~0xe0;
+        rec.status &= 
+            ~(REU_REG_R_STATUS_VERIFY_ERROR 
+              | REU_REG_R_STATUS_END_OF_BLOCK 
+              | REU_REG_R_STATUS_INTERRUPT_PENDING
+             );
+
         maincpu_set_irq(reu_int_num, 0);
         break;
 
+      case REU_REG_RW_COMMAND:
+        retval = rec.command;
+        break;
+
+      case REU_REG_RW_BASEADDR_LOW:
+        retval = rec.base_computer & 0xff;
+        break;
+
+      case REU_REG_RW_BASEADDR_HIGH:
+        retval = (rec.base_computer >> 8) & 0xff;
+        break;
+
+      case REU_REG_RW_RAMADDR_LOW:
+        retval = rec.base_reu & 0xff;
+        break;
+
+      case REU_REG_RW_RAMADDR_HIGH:
+        retval = (rec.bank_reu >> 8) & 0xff;
+        break;
+
       case REU_REG_RW_BANK:
-        io_source=IO_SOURCE_REU;
-        retval = reu[REU_REG_RW_BANK] | 0xf8;
+        retval = rec.bank_reu | 0xf8;
         break;
 
-      case REU_REG_RW_INTERRUPT:
-        io_source=IO_SOURCE_REU;
-        retval = reu[REU_REG_RW_INTERRUPT] | 0x1f;
+      case REU_REG_RW_BLOCKLEN_LOW:
+        retval = rec.transfer_length & 0xff;
         break;
 
-      case REU_REG_RW_ADDRCONTROL:
-        io_source=IO_SOURCE_REU;
-        retval = reu[REU_REG_RW_ADDRCONTROL] | 0x3f;
+      case REU_REG_RW_BLOCKLEN_HIGH:
+        retval = (rec.transfer_length >> 8) & 0xff;
         break;
 
-      case 0xb:
-      case 0xc:
-      case 0xd:
-      case 0xe:
-      case 0xf:
-        retval = 0xff;
+      case REU_REG_RW_INTERRUPT:
+        assert((rec.int_mask_reg & REU_REG_RW_INTERRUPT_UNUSED_MASK) == REU_REG_RW_INTERRUPT_UNUSED_MASK);
+        retval = rec.int_mask_reg;
         break;
 
-      default:
-        io_source=IO_SOURCE_REU;
-        retval = reu[addr];
+      case REU_REG_RW_ADDR_CONTROL:
+        assert((rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_UNUSED_MASK) == REU_REG_RW_ADDR_CONTROL_UNUSED_MASK);
+        retval = rec.address_control_reg;
+        break;
     }
 
 #ifdef REU_DEBUG
@@ -403,50 +477,60 @@
 
 void REGPARM2 reu_store(WORD addr, BYTE byte)
 {
-    switch (addr)
+    switch (addr & REU_REG_LAST_REG)
     {
     case REU_REG_R_STATUS:
         /* REC status register is Read Only */
         break;
 
+    case REU_REG_RW_COMMAND:
+        rec.command = byte;
+        break;
+
     case REU_REG_RW_BASEADDR_LOW:
-        /* update shadow register, too */
-        reu_baseaddr_low_shadow =
-        reu[addr] = byte;
+        rec.base_computer = 
+        rec.bank_reu_shadow = (rec.base_computer_shadow & 0xff00) | byte;
         break;
 
     case REU_REG_RW_BASEADDR_HIGH:
-        /* also set low register from shadow register */
-        reu[REU_REG_RW_BASEADDR_LOW] = reu_baseaddr_low_shadow;
-        reu[addr] = byte;
+        rec.base_computer = 
+        rec.bank_reu_shadow = (rec.base_computer_shadow & 0xff) | (byte << 8);
         break;
 
     case REU_REG_RW_RAMADDR_LOW:
-        /* update shadow register, too */
-        reu_ramaddr_low_shadow =
-        reu[addr] = byte;
+        rec.base_reu =
+        rec.base_reu_shadow = (rec.base_computer_shadow & 0xff00) | byte;
         break;
 
     case REU_REG_RW_RAMADDR_HIGH:
-        /* also set low register from shadow register */
-        reu[REU_REG_RW_RAMADDR_LOW] = reu_ramaddr_low_shadow;
-        reu[addr] = byte;
+        rec.base_reu =
+        rec.base_reu_shadow = (rec.base_computer_shadow & 0xff) | (byte << 8);
         break;
 
+    case REU_REG_RW_BANK:
+        //! \TODO
+        break;
+
     case REU_REG_RW_BLOCKLEN_LOW:
-        /* update shadow register, too */
-        reu_blocklen_low_shadow =
-        reu[addr] = byte;
+        rec.transfer_length =
+        rec.transfer_length_shadow = (rec.transfer_length_shadow & 0xff00) | byte;
         break;
 
     case REU_REG_RW_BLOCKLEN_HIGH:
-        /* also set low register from shadow register */
-        reu[REU_REG_RW_BLOCKLEN_LOW] = reu_blocklen_low_shadow;
-        reu[addr] = byte;
+        rec.transfer_length =
+        rec.transfer_length_shadow = (rec.transfer_length_shadow & 0xff) | (byte << 8);
         break;
 
+    case REU_REG_RW_INTERRUPT:
+        rec.int_mask_reg = byte | REU_REG_RW_INTERRUPT_UNUSED_MASK;
+        break;
+
+    case REU_REG_RW_ADDR_CONTROL:
+        rec.address_control_reg = byte | REU_REG_RW_ADDR_CONTROL_UNUSED_MASK;
+        break;
+
     default:
-        reu[addr] = byte;
+        break;
     }
 
 #ifdef REU_DEBUG
@@ -455,8 +539,10 @@
 
     /* write REC command register
      * DMA only if execution bit (7) set  - RH */
-    if ((addr == REU_REG_W_COMMAND) && (byte & 0x80))
-        reu_dma(byte & 0x10);
+    /*! \BUG What if FF00 option is enabled? */
+    if ((addr == REU_REG_RW_COMMAND) && (rec.command &  REU_REG_RW_COMMAND_EXECUTE)) {
+        reu_dma(rec.command & REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED);
+    }
 }
 
 /* ------------------------------------------------------------------------- */
@@ -464,7 +550,7 @@
 static void reu_dma_update_regs(WORD host_addr, unsigned int reu_addr,
                                 int len)
 {
-    if (!(reu[REU_REG_W_COMMAND] & 0x20)) {
+    if (!(rec.command & REU_REG_RW_COMMAND_AUTOLOAD)) {
         /* not autoload
          * incr. of addr. disabled, as already pointing to correct addr.
          * address changes only if not fixed, correct reu base registers  -RH
@@ -472,18 +558,16 @@
 #ifdef REU_DEBUG
         log_message(reu_log, "No autoload.");
 #endif
-        if (!(reu[REU_REG_RW_ADDRCONTROL] & 0x80)) {
-            reu[REU_REG_RW_BASEADDR_LOW] = host_addr & 0xff;
-            reu[REU_REG_RW_BASEADDR_HIGH] = (host_addr >> 8) & 0xff;
+        if ( (rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_FIX_C64) == 0) {
+            rec.base_computer = host_addr;
         }
-        if (!(reu[REU_REG_RW_ADDRCONTROL] & 0x40)) {
-            reu[REU_REG_RW_RAMADDR_LOW] = reu_addr & 0xff;
-            reu[REU_REG_RW_RAMADDR_HIGH] = (reu_addr >> 8) & 0xff;
-            reu[REU_REG_RW_BANK] = (reu_addr >> 16);
+
+        if ( (rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_FIX_REC) == 0) {
+            rec.base_reu = reu_addr & 0xffff;
+            rec.bank_reu = (reu_addr >> 8) & 0xff;
         }
 
-        reu[REU_REG_RW_BLOCKLEN_LOW] = len & 0xff;
-        reu[REU_REG_RW_BLOCKLEN_HIGH] = (len >> 8) & 0xff;
+        rec.transfer_length = len;
     }
 }
 
@@ -513,7 +597,7 @@
         host_addr = (host_addr + host_step) & 0xffff;
     }
     len = 0x1;
-    reu[REU_REG_R_STATUS] |= 0x40;
+    rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
@@ -539,7 +623,7 @@
         host_addr = (host_addr + host_step) & 0xffff;
     }
     len = 1;
-    reu[REU_REG_R_STATUS] |= 0x40;
+    rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
@@ -565,7 +649,7 @@
         host_addr = (host_addr + host_step) & 0xffff;
     }
     len = 1;
-    reu[REU_REG_R_STATUS] |= 0x40;
+    rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
     reu_dma_update_regs(host_addr, reu_addr, len);
 }
 
@@ -579,7 +663,7 @@
                 host_step ? "" : " (fixed)", len, len);
 #endif
 
-    reu[REU_REG_R_STATUS] &= ~0x60;
+    rec.status &= ~ (REU_REG_R_STATUS_VERIFY_ERROR | REU_REG_R_STATUS_END_OF_BLOCK);
 
     while (len--) {
         maincpu_clk++;
@@ -588,12 +672,10 @@
             host_addr = (host_addr + host_step) & 0xffff;
             reu_addr += reu_step;
 
-            reu[REU_REG_R_STATUS] |=  0x20; /* FAULT */
+            rec.status |= REU_REG_R_STATUS_VERIFY_ERROR;
 
-            /* Bit 7: interrupt enable
-               Bit 5: interrupt on verify error */
-            if (reu[REU_REG_RW_INTERRUPT] & 0xa0) {
-                reu[REU_REG_R_STATUS] |= 0x80;
+            if (rec.int_mask_reg & (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) {
+                rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
                 maincpu_set_irq(reu_int_num, 1);
             }
             break;
@@ -604,7 +686,7 @@
 
     if (len < 0) {
         /* all bytes are equal, mark End Of Block */
-        reu[REU_REG_R_STATUS] |= 0x40;
+        rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
         len = 1;
     }
 
@@ -646,43 +728,38 @@
     reu6_mask = (reu_size >> 16) - 1;
 
     /* wrong address of bank register & calculations corrected  - RH */
-    host_addr = (WORD)reu[REU_REG_RW_BASEADDR_LOW] 
-                | ((WORD)reu[REU_REG_RW_BASEADDR_HIGH] << 8);
-    reu_addr = ((unsigned int)reu[REU_REG_RW_RAMADDR_LOW]
-               | ((unsigned int)reu[REU_REG_RW_RAMADDR_HIGH] << 8)
-               | (((unsigned int)reu[REU_REG_RW_BANK] & reu6_mask) << 16));
+    host_addr = rec.base_computer;
+    reu_addr = rec.base_reu | (rec.bank_reu << 16);
+    len = rec.transfer_length ? rec.transfer_length : 0x10000;
 
-    len = (int)(reu[REU_REG_RW_BLOCKLEN_LOW])
-          | ((int)(reu[REU_REG_RW_BLOCKLEN_HIGH]) << 8);
-
-    if (len == 0)
-        len = 0x10000;
-
     /* Fixed addresses implemented -- [EP] 04-16-97. */
-    host_step = (reu[REU_REG_RW_ADDRCONTROL] & 0x80) ? 0 : 1;
-    reu_step = (reu[REU_REG_RW_ADDRCONTROL] & 0x40) ? 0 : 1;
+    host_step = rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_FIX_C64 ? 0 : 1;
+    reu_step  = rec.address_control_reg & REU_REG_RW_ADDR_CONTROL_FIX_REC ? 0 : 1;
 
-    switch (reu[REU_REG_W_COMMAND] & 0x03) {
-      case 0:
+    switch (rec.command & REU_REG_RW_COMMAND_TRANSFER_TYPE_MASK) {
+      case REU_REG_RW_COMMAND_TRANSFER_TYPE_TO_REU:
         reu_dma_host_to_reu(host_addr, reu_addr, host_step, reu_step, len);
         break;
-      case 1:
+      case REU_REG_RW_COMMAND_TRANSFER_TYPE_FROM_REU:
         reu_dma_reu_to_host(host_addr, reu_addr, host_step, reu_step, len);
         break;
-      case 2:
+      case REU_REG_RW_COMMAND_TRANSFER_TYPE_SWAP:
         reu_dma_swap(host_addr, reu_addr, host_step, reu_step, len);
         break;
-      case 3:
+      case REU_REG_RW_COMMAND_TRANSFER_TYPE_VERIFY:
         reu_dma_compare(host_addr, reu_addr, host_step, reu_step, len);
         break;
     }
 
-    reu[REU_REG_W_COMMAND] &= 0x7f;
+    rec.command &= ~ REU_REG_RW_COMMAND_EXECUTE;
 
     /* Bit 7: interrupt enable.  */
     /* Bit 6: interrupt on end of block */
-    if ((reu[REU_REG_RW_INTERRUPT] & 0xc0) == 0xc0) {
-        reu[REU_REG_R_STATUS] |= 0x80;
+    if ((rec.int_mask_reg 
+            & (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) 
+           == (REU_REG_RW_INTERRUPT_END_OF_BLOCK_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED))
+    {
+        rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
         maincpu_set_irq(reu_int_num, 1);
     }
 }
@@ -696,7 +773,10 @@
 int reu_write_snapshot_module(snapshot_t *s)
 {
     snapshot_module_t *m;
+    BYTE reu[16];
 
+    memset(reu, 0xff, sizeof reu);
+
     m = snapshot_module_create(s, snap_module_name, SNAP_MAJOR, SNAP_MINOR);
     if (m == NULL)
         return -1;
@@ -717,7 +797,10 @@
     BYTE major_version, minor_version;
     snapshot_module_t *m;
     DWORD size;
+    BYTE reu[16];
 
+    memset(reu, 0xff, sizeof reu);
+
     m = snapshot_module_open(s, snap_module_name,
                              &major_version, &minor_version);
     if (m == NULL)
@@ -751,6 +834,8 @@
     else
         interrupt_restore_irq(maincpu_int_status, reu_int_num, 0);
 
+    /*! \TODO restore the reu registers */
+
     snapshot_module_close(m);
     return 0;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18874] branches/spiro/vice-1.22.18-reu/

[<st...@us...>]

Revision: 18874
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18874&view=rev
Author:   strik
Date:     2008-06-19 11:51:59 -0700 (Thu, 19 Jun 2008)

Log Message:
-----------
Branch for fixing the REU problems, as reported by Wolfgang Moser's
CSG8721 techref.

Added Paths:
-----------
    branches/spiro/vice-1.22.18-reu/

Copied: branches/spiro/vice-1.22.18-reu (from rev 18873, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18873] tags/marco/v1.22.18-fixes-newpalcheck-mint/

[<bla...@us...>]

Revision: 18873
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18873&view=rev
Author:   blackystardust
Date:     2008-06-18 22:16:17 -0700 (Wed, 18 Jun 2008)

Log Message:
-----------
Tagged my latest changes

Added Paths:
-----------
    tags/marco/v1.22.18-fixes-newpalcheck-mint/

Copied: tags/marco/v1.22.18-fixes-newpalcheck-mint (from rev 18872, branches/marco/ports)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18872] trunk/svn-instructions.txt

[<st...@us...>]

Revision: 18872
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18872&view=rev
Author:   strik
Date:     2008-06-18 11:35:53 -0700 (Wed, 18 Jun 2008)

Log Message:
-----------
Removed the obsolete devel/ directory from the pathes

Modified Paths:
--------------
    trunk/svn-instructions.txt

Modified: trunk/svn-instructions.txt
===================================================================
--- trunk/svn-instructions.txt	2008-06-18 18:30:15 UTC (rev 18871)
+++ trunk/svn-instructions.txt	2008-06-18 18:35:53 UTC (rev 18872)
@@ -65,12 +65,12 @@
 v0.15.0 are missing, too.
 
 
-The directory "devel" is used for development work. In devel/branches/,
+The directory "devel" is used for development work. In branches/,
 every user should create his own working directory with his name (spiro,
 andreasm, tibor, ...). In this directory, additional directories are
 created that resemble actual work.
 
-In devel/tags/, every user should have his own working directory, too
+In tags/, every user should have his own working directory, too
 (names spiro, andreasm, tibor, ...). In this directories, tags are
 applied that resemble some milestones in development. For example, these
 tags are the basis for integration in the next developer release.
@@ -223,12 +223,12 @@
 steps in your own branch. For this, generate a copy of the latest
 version. For this, generate a branch to work on:
 
-~/$ svn copy https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.10 https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/devel/branches/spiro/v1.22.10-MYFEATURE
+~/$ svn copy https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.10 https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro/v1.22.10-MYFEATURE
 
 This is too long for you? If you are in a working copy, you can also
 abbreviate this:
 
-~/vice$ svn copy tags/v1.22/v1.22.10 devel/branches/spiro/v1.22.10-MYFEATURE
+~/vice$ svn copy tags/v1.22/v1.22.10 branches/spiro/v1.22.10-MYFEATURE
 
 Of course, replace my name "spiro" with you own, and replace the version
 (v1.22, v1.22.10) with the latest version, and replace MYFEATURE with
@@ -243,7 +243,7 @@
 to create a branch, you have to perform:
 
 
-~/vice$ svn mkdir devel/branches/spiro
+~/vice$ svn mkdir branches/spiro
 
 or
 
@@ -271,11 +271,11 @@
 Now, either checkout a new working copy (cf. 1.2) or revert your current
 one (cf. 1.3.):
 
-~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/devel/branches/spiro/v1.22.10-MYFEATURE/
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro/v1.22.10-MYFEATURE/
 
 or 
 
-~/vice$ svn switch devel/branches/spiro/v1.22.10-MYFEATURE/
+~/vice$ svn switch branches/spiro/v1.22.10-MYFEATURE/
 
 
 2.3 Make your local changes
@@ -331,7 +331,7 @@
 workspace. First, make sure you have committed any changes (by issuing a
 "cvs status" command). Then, tag your workspace by:
 
-~/vice$ svn copy devel/branches/spiro/v1.22.10-MYFEATURE devel/tags/spiro/v1.22.10-MYFEATURE
+~/vice$ svn copy branches/spiro/v1.22.10-MYFEATURE tags/spiro/v1.22.10-MYFEATURE
 
 (you can use the full URL, too)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu: [18871] trunk/svn-instructions.txt

[<st...@us...>]

Revision: 18871
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18871&view=rev
Author:   strik
Date:     2008-06-18 11:30:15 -0700 (Wed, 18 Jun 2008)

Log Message:
-----------
Initial version of the SVN instructions

Added Paths:
-----------
    trunk/svn-instructions.txt

Added: trunk/svn-instructions.txt
===================================================================
--- trunk/svn-instructions.txt	                        (rev 0)
+++ trunk/svn-instructions.txt	2008-06-18 18:30:15 UTC (rev 18871)
@@ -0,0 +1,373 @@
+
+Note that I am describing how to handle everything with a command-line
+SVN client. For GUI clients, it should be possible in a similar way.
+
+Additionally note that this is not a full introducion in Subversion, and
+it is not intended to be. Please, read the SVN book
+(http://svnbook.red-bean.com/) to get used to SVN.
+
+
+1. Reading the SVN repository
+=============================
+
+1.1 Naming scheme of releases:
+------------------------------
+
+The base name of the URL to retrieve working copies (cf. 1.2 below) is 
+   https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/
+
+This will be called $BASE in the sequel.
+
+The naming for the releases is rather easy, but a little bit different
+from what you might be used to with SVN: First the trunk - that is,
+always the latest version - is named trunk. It can be found at
+
+   $BASE/trunk/
+
+All releases (developer releases as well a real releases) are put into
+'directories' at $BASE/tags/... . The main release name is next, and the
+developer releases is last. Here are some examples:
+
+  v1.13:      $BASE/tags/v1.13/v1.13/
+  v1.13.5:    $BASE/tags/v1.13/v1.13.5/
+  v1.22:      $BASE/tags/v1.22/v1.22/
+  v1.22.9:    $BASE/tags/v1.22/v1.22.9/
+
+Note that with the v0.xx releases, the main version had three numbers in
+it, thus:
+
+  v0.14.0:    $BASE/tags/v0.14.0/v0.14.0/
+  v0.14.1:    $BASE/tags/v0.14.1/v0.14.1/
+  v0.14.1.5:  $BASE/tags/v0.14.1/v0.14.1.5/
+
+
+There are exceptions to this rule, though. These are:
+
+  v1.0.0.1:   $BASE/tags/v1.0/v1.0.0.1/
+  v1.0.0.2:   $BASE/tags/v1.0/v1.0.0.2/
+
+  (these two versions are the only ones of v1.xxx where the numbering
+  scheme of v0.xxx was still used)
+
+Additionally, there are the following releases:
+  v1.9a:      $BASE/tags/v1.9/v1.9a/
+  v1.11-old:  $BASE/tags/v1.11/v1.11-old/
+  v1.13a:     $BASE/tags/v1.13/v1.13a/
+
+These are because releases v1.9 and v1.13 were replaced with their "a"
+counterparts shortly after release. v1.11-old was never released, but it
+was planned to release that one.
+
+Additionally note that there have been v0.14.2.74 and v0.14.2.75;
+unfortunately, I do not have these, only a patch from v0.14.2.74 ->
+v0.14.2.75, which is not sufficient to recreate these old ones, as the
+patches v0.14.2.73 -> v0.14.2.74 as well as the patch v0.14.2.75 ->
+v0.15.0 are missing, too.
+
+
+The directory "devel" is used for development work. In devel/branches/,
+every user should create his own working directory with his name (spiro,
+andreasm, tibor, ...). In this directory, additional directories are
+created that resemble actual work.
+
+In devel/tags/, every user should have his own working directory, too
+(names spiro, andreasm, tibor, ...). In this directories, tags are
+applied that resemble some milestones in development. For example, these
+tags are the basis for integration in the next developer release.
+
+
+
+Whenever you are in doubt about the directory structure, it might be a
+good idea to have a look into the online browseable directory on
+SourceForge:
+
+  http://vice-emu.svn.sourceforge.net/viewvc/vice-emu/tags/
+
+or the complete repository:
+
+  http://vice-emu.svn.sourceforge.net/viewvc/vice-emu/
+
+You can also use the "svn ls" command to see the contents of a
+directory. For example,
+
+$ svn ls https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/
+
+will print out everything that is in the tags/ subdirectory.
+
+
+
+1.2. Initial checkout
+---------------------
+
+If you want to start working on VICE, you first have to check out a
+working version of VICE. For example, to get the latest version of VICE,
+just enter:
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/ vice
+
+This will check out the "trunk" version of VICE - that is, always the
+latest - into a new directory called vice (last parameter). If you want
+to get a different version (for example, v1.22.3), just change the URL
+part of the command to:
+
+https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.3
+
+That is, the full command is:
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.3 vice
+
+to put everything into a new directory named "vice".
+
+
+
+1.3. Changing your workspace to another release
+-----------------------------------------------
+
+Sometimes, it might be convenient to be able to change your working copy
+to the one from another release. For example, you are hunting for the
+release where a certain bug was introduced. Of course, you can always
+check out specific releases (cf. 1.2). Unfortunately, this will always
+pull ALL files from the server, which takes time and network bandwidth.
+
+Instead, you might want to change a specific directory to another one.
+This can be done with the "svn switch" statement. Take, for example, you
+want to change to v1.20.5. You can do this with:
+
+~/vice$ svn switch https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.20/v1.20.5
+
+Note that you must be IN the directory where you previously checked out
+VICE!
+
+You can switch multiple times, as you want to. Note that any changed
+file will get the timestamp of the time this file was written while
+switching. This is to ensure (as good as possible) that the Makefile
+will recognize the changes, so you will be able to compile from that
+working set as soon as possible.
+
+You can switch back to the trunk using:
+
+~/vice$ svn switch https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/
+
+
+Note: If you have made local changes, svn switch will try to merge your
+changes into your working set.
+
+
+1.4. Reverting your workspace to what is on the server
+------------------------------------------------------
+
+Take that you have made changed to your workspace and compiled files.
+Now, you want to delete all files that are not under version control.
+The following file outputs these extra files to be deleted:
+
+~/vice$ svn status --no-ignore|sed -n -e "s/^[I|\?]//p"|xargs -n 1 echo rm -rf --
+
+If you run this command, it will output every file not under control,
+prepended by "rm -rf --". If you are really sure these files are all ok,
+you can delete them by removing the "echo" there.
+
+NOTE: THIS COMMAND DOES NOT HANDLE ALL CASES CORRECTLY! For example,
+files with SPACES will not be handled correctly. I would never recommend
+to use this command without actually having a look at what is to be
+deleted beforehand. USE AT YOUR OWN RISK!
+
+
+Another thing often encountered is that you have made some changes which
+you do not like anymore. For this, you can undo the changes made with
+the command:
+
+~/vice$ svn revert <PATHTOFILE>
+
+This will undo the local change completely, and you will have a copy of
+what is on the server.
+
+If you want to revert anything done, use
+
+~/vice$ svn revert --recursive .
+
+to revert everything in the current directory and its sub-directories.
+
+
+1.5 Get the newest version from the server
+------------------------------------------
+
+If someone has done any changes on the repository, you might want to get
+the latest changes. For this, you can use the "svn update" command which
+will retrieve the latest versions of all the files from the server.
+
+If you want to know beforehand what has changed, the "svn status"
+command is helpful.
+
+For both commands, have a look at the SVN book, or to the online help
+(svn --help update, for example, or info sed on Unixoid machines).
+
+
+
+2. Making your changes
+======================
+
+If you want to start development, you have to perform the following
+steps:
+
+a. Create your own workspace in a branch
+b. Change to this branch
+c. Make you local changes
+d. Commit your local changes
+e. repeat steps c. and d. as often as you like
+
+
+2.1. Creating your own workspace
+--------------------------------
+
+Whenever you want to make a change to VICE, you should perform these
+steps in your own branch. For this, generate a copy of the latest
+version. For this, generate a branch to work on:
+
+~/$ svn copy https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.10 https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/devel/branches/spiro/v1.22.10-MYFEATURE
+
+This is too long for you? If you are in a working copy, you can also
+abbreviate this:
+
+~/vice$ svn copy tags/v1.22/v1.22.10 devel/branches/spiro/v1.22.10-MYFEATURE
+
+Of course, replace my name "spiro" with you own, and replace the version
+(v1.22, v1.22.10) with the latest version, and replace MYFEATURE with
+something that makes more sense - that is, with what you are doing.
+
+The above naming would be equivalent to what was named
+spiro-1.22.10-MYFEATURE.diff with our old naming scheme.
+
+
+Make sure you have generated your own working directory before
+performing the above step, however. That is, for the first time you want
+to create a branch, you have to perform:
+
+
+~/vice$ svn mkdir devel/branches/spiro
+
+or
+
+~/$ svn mkdir https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro
+
+Note that you must give a revision message; that is, a message where you
+are describing what you have done. You can do this either after pressing
+enter, or append it directly to the command:
+
+~/vice$ svn mkdir branches/spiro -m "Generated Spiro's working branch"
+
+
+NOTE: While one may be tempted to use the trunk to branch from, I would
+not recommend it here. The reason is simple: The maintainer might
+already be doing some integration work on the trunk, in which case you
+would branch from an intermediate version, which might not be a good
+idea. Additionally, it is harder (but not impossible) to find out from
+which version you just branched off if you do it from the branch. So, it
+is better to use the tags to branch from!
+
+
+2.2 Changing to your working branch
+-----------------------------------
+
+Now, either checkout a new working copy (cf. 1.2) or revert your current
+one (cf. 1.3.):
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/devel/branches/spiro/v1.22.10-MYFEATURE/
+
+or 
+
+~/vice$ svn switch devel/branches/spiro/v1.22.10-MYFEATURE/
+
+
+2.3 Make your local changes
+---------------------------
+
+Yes - now, you are allowed to do whatevery you like in your working
+copy. Change the VICE code any way you like it.
+
+There are some commands which might be helpful, however:
+
+- svn status - let's you find out which files you have changed locally
+- svn diff   - you can do a diff against the version of the server,
+               so you can find out what you have changed in the
+               meantime in detail.
+
+
+2.4 Commit you local changes
+----------------------------
+
+This is the important step. As long as you do not commit, no one will be
+able to see what you have changed.
+
+It is best to start with a
+
+~/vice$ svn status
+
+which will show you which files you have changed.
+
+Files which are prepended with an "?" are the files which are not under
+version control yet. If you have added some files, these will be shown
+with the "?". Now, you must add them:
+
+~/vice$ svn add NEWFILE
+
+The same applies for the directories, by the way.
+
+Again, these changes will not show up until you commit:
+
+~/vice$ svn commit
+
+You will be asked for your log message, which you should enter here.
+
+
+2.5 Marking milestones
+----------------------
+
+Whenever you have a milestone reached, you can tag the current version.
+Additionally, if you want your latest changes to be included in the next
+official version of VICE, you MUST tag the current version. A tag is
+just a convenient way to remember the state you were working on.
+
+To create a tag, you must create a (virtual) copy of your current
+workspace. First, make sure you have committed any changes (by issuing a
+"cvs status" command). Then, tag your workspace by:
+
+~/vice$ svn copy devel/branches/spiro/v1.22.10-MYFEATURE devel/tags/spiro/v1.22.10-MYFEATURE
+
+(you can use the full URL, too)
+
+You can append numbers to the "MYFEATURE" if you want to have multiple
+milestones.
+
+
+If you want the feature to be added for the next release, just write a
+mail on the mailing list, mentioning the full path to the tag.
+
+
+
+3. Some maintainance work documentation
+=======================================
+
+(to be continued, just some snippets so far)
+
+3.1 Creating a source distribution
+----------------------------------
+
+a. Add all patches to be included
+b. Change the version number of the distribution in configure.in,
+   VICE_VERSION_MAJOR, VICE_VERSION_MINOR, VICE_VERSION_BUILD. Also,
+   define/undefine UNSTABLE there if this is a release, or not.
+c. Add entries in ChangeLog, src/ChangeLog
+d. Execute: autoreconf; ./configure; make dist
+e. svn commit
+f. svn copy https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/ https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/vX.YY/vX.YY.ZZ
+g. copy vice-X.YY.ZZ to viceteam.org/devel/
+
+
+
+4. Misc
+=======
+
+Make sure that the code you change:
+- has proper line endings (svn properties set correctly)
+- only uses C style comments (/* ... */), not C++ style - at least for
+  platform independant ("common") code.


Property changes on: trunk/svn-instructions.txt
___________________________________________________________________
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.