frodo: add svgalib support

Compiles and runs and eats cpu cycles but doesn't show anything yet.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

11 files changed, 723 insertions, 6 deletions

diff --git a/patches/Frodo-4.1b/enable-sdl.diff b/patches/Frodo-4.1b/0001-enable-sdl.diff.patch
index fbefcb40c..2d83ea222 100644
--- a/patches/Frodo-4.1b/enable-sdl.diff
+++ b/patches/Frodo-4.1b/0001-enable-sdl.diff.patch
@@ -1,11 +1,16 @@
+From 6e30f01c5dc810e943123f0b272a2299f194c94a Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Thu, 16 Jun 2011 21:13:59 +0200
+Subject: [PATCH 01/10] enable-sdl.diff
+
 ---
  Src/configure.in |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ 1 files changed, 5 insertions(+), 5 deletions(-)
 
-Index: Frodo-4.1b/Src/configure.in
-===================================================================
---- Frodo-4.1b.orig/Src/configure.in
-+++ Frodo-4.1b/Src/configure.in
+diff --git a/Src/configure.in b/Src/configure.in
+index cee913c..b439941 100644
+--- a/Src/configure.in
++++ b/Src/configure.in
 @@ -80,15 +80,15 @@ elif [[ x"$no_x" = "xyes" ]]; then
      TARGET=svgalib
      CFLAGS="$CFLAGS -D__svgalib__"
@@ -27,3 +32,6 @@ Index: Frodo-4.1b/Src/configure.in
  else
    AC_MSG_RESULT([X Window System])
    TARGET=x11
+-- 
+1.7.5.3
+
diff --git a/patches/Frodo-4.1b/0002-frodo-add-cppflags-support.patch b/patches/Frodo-4.1b/0002-frodo-add-cppflags-support.patch
new file mode 100644
index 000000000..da4f2d1c5
--- /dev/null
+++ b/patches/Frodo-4.1b/0002-frodo-add-cppflags-support.patch
@@ -0,0 +1,69 @@
+From e9f6e3b31c6864f8defc0576a18e48485911dc56 Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Thu, 16 Jun 2011 21:29:06 +0200
+Subject: [PATCH 02/10] frodo: add cppflags support
+
+---
+ Src/Makefile.in |   21 +++++++++++----------
+ 1 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/Src/Makefile.in b/Src/Makefile.in
+index e848b47..f5b70f8 100644
+--- a/Src/Makefile.in
++++ b/Src/Makefile.in
+@@ -9,6 +9,7 @@ REVISION  = 1
+ CXX    = @CXX@
+ LIBS   = @LIBS@
+ CFLAGS = @CFLAGS@ -I./ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@
++CPPFLAGS = @CPPFLAGS@
+ 
+ INSTALL         = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -62,34 +63,34 @@ depend dep:
+ 	makedepend $(CPPFLAGS) -Y. $(SRCS) 2>/dev/null
+ 
+ .cpp.o:
+-	$(CC) $(INCLUDES) $(CFLAGS) -o $@ -c $*.cpp
++	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -o $@ -c $*.cpp
+        
+ .cpp.s:
+-	$(CC) $(INCLUDES) $(CFLAGS) $(EXTRAFLAGS) -o $@ -S $*.cpp -g0
++	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRAFLAGS) -o $@ -S $*.cpp -g0
+ 
+ C64_PC.o: C64.cpp C64.h C64_x.i CmdPipe.h CPUC64.h CPU1541.h VIC.h SID.h CIA.h REU.h IEC.h 1541job.h Display.h Prefs.h
+-	$(CC) $(INCLUDES) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
++	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
+ 
+ CPUC64_PC.o: CPUC64.cpp CPUC64.h CPU_emulline.i C64.h VIC.h SID.h CIA.h REU.h IEC.h Display.h Version.h
+-	$(CC) $(INCLUDES) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
++	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
+ 
+ CPU1541_PC.o: CPU1541.cpp CPU1541.h CPU_emulline.i 1541job.h C64.h CIA.h Display.h
+-	$(CC) $(INCLUDES) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
++	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
+ 
+ C64_SC.o: C64_SC.cpp C64.h C64_x.i CmdPipe.h CPUC64.h CPU1541.h VIC.h SID.h CIA.h REU.h IEC.h 1541job.h Display.h Prefs.h
+-	$(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
++	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
+ 
+ CPUC64_SC.o: CPUC64_SC.cpp CPUC64.h CPU_emulcycle.i CPU_common.h C64.h VIC.h SID.h CIA.h REU.h IEC.h Display.h Version.h
+-	$(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
++	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
+ 
+ CPU1541_SC.o: CPU1541_SC.cpp CPU1541.h CPU_emulcycle.i CPU_common.h 1541job.h C64.h CIA.h Display.h
+-	$(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
++	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
+ 
+ VIC_SC.o: VIC_SC.cpp VIC.h C64.h CPUC64.h Display.h Prefs.h
+-	$(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
++	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
+ 
+ CIA_SC.o: CIA_SC.cpp CIA.h CPUC64.h CPU1541.h VIC.h Prefs.h
+-	$(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
++	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
+ 
+ #-------------------------------------------------------------------------
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+-- 
+1.7.5.3
+
diff --git a/patches/Frodo-4.1b/0003-frodo-change-more-UBYTEs-into-int8.patch b/patches/Frodo-4.1b/0003-frodo-change-more-UBYTEs-into-int8.patch
new file mode 100644
index 000000000..2fc6e28b2
--- /dev/null
+++ b/patches/Frodo-4.1b/0003-frodo-change-more-UBYTEs-into-int8.patch
@@ -0,0 +1,72 @@
+From 464d0d3e0e19f3463ff3c3145dd479a938eec9f4 Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Fri, 17 Jun 2011 19:20:39 +0200
+Subject: [PATCH 03/10] frodo: change more UBYTEs into int8
+
+This was obviously started but not done in all places.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Src/C64.h          |    2 +-
+ Src/Display_svga.i |   10 +++++-----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Src/C64.h b/Src/C64.h
+index 83d8d16..0870c24 100644
+--- a/Src/C64.h
++++ b/Src/C64.h
+@@ -131,7 +131,7 @@ private:
+ 	struct IOStdReq *game_io;
+ 	struct GamePortTrigger game_trigger;
+ 	struct InputEvent game_event;
+-	UBYTE joy_state;				// Current state of joystick
++	int8 joy_state;				// Current state of joystick
+ 	bool game_open, port_allocated;	// Flags: gameport.device opened, game port allocated
+ #endif
+ 
+diff --git a/Src/Display_svga.i b/Src/Display_svga.i
+index 29f0874..37f2194 100644
+--- a/Src/Display_svga.i
++++ b/Src/Display_svga.i
+@@ -137,7 +137,7 @@ static int keystate[256];
+ static int f11pressed = 0, f12pressed = 0, quit = 0;
+ static int joystate = 0xFF;
+ static int numlock = 0;
+-static UBYTE rev_matrix[8], key_matrix[8];
++static int8 rev_matrix[8], key_matrix[8];
+ 
+ /*
+   C64 keyboard matrix:
+@@ -487,9 +487,9 @@ void C64Display::Update(void)
+ }
+ 
+ 
+-UBYTE *C64Display::BitmapBase(void)
++int8 *C64Display::BitmapBase(void)
+ {
+-       return (UBYTE *)bufmem;
++       return (int8 *)bufmem;
+ }
+ 
+ 
+@@ -499,7 +499,7 @@ int C64Display::BitmapXMod(void)
+ }
+ 
+ 
+-void C64Display::PollKeyboard(UBYTE *CIA_key_matrix, UBYTE *CIA_rev_matrix, UBYTE *joystick)
++void C64Display::PollKeyboard(int8 *CIA_key_matrix, int8 *CIA_rev_matrix, int8 *joystick)
+ {
+     keyboard_update();
+     *joystick = joystate;
+@@ -534,7 +534,7 @@ static int colorval(int v)
+        return ((v & 255)*0x01010101) >> 26;
+ }
+ 
+-void C64Display::InitColors(UBYTE *colors)
++void C64Display::InitColors(int8 *colors)
+ {
+        int i;
+ 
+-- 
+1.7.5.3
+
diff --git a/patches/Frodo-4.1b/0004-frodo-AmigaGUI-change-UBYTE-into-int8.patch b/patches/Frodo-4.1b/0004-frodo-AmigaGUI-change-UBYTE-into-int8.patch
new file mode 100644
index 000000000..263ebdae1
--- /dev/null
+++ b/patches/Frodo-4.1b/0004-frodo-AmigaGUI-change-UBYTE-into-int8.patch
@@ -0,0 +1,178 @@
+From 23b341c7bd872cceb385283b0d18c16ffc2f68d2 Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Fri, 17 Jun 2011 19:21:38 +0200
+Subject: [PATCH 04/10] frodo: AmigaGUI: change UBYTE into int8
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Src/AmigaGUI.c |  112 ++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 56 insertions(+), 56 deletions(-)
+
+diff --git a/Src/AmigaGUI.c b/Src/AmigaGUI.c
+index eef5cb7..fb6f041 100644
+--- a/Src/AmigaGUI.c
++++ b/Src/AmigaGUI.c
+@@ -23,7 +23,7 @@
+ #include "AmigaGUI.h"
+ 
+ struct Screen         *Scr = NULL;
+-UBYTE                 *PubScreenName = NULL;
++int8                 *PubScreenName = NULL;
+ APTR                   VisualInfo = NULL;
+ struct Window         *PrefsWnd = NULL;
+ struct Gadget         *PrefsGList = NULL;
+@@ -35,50 +35,50 @@ UWORD                  PrefsLeft = 0;
+ UWORD                  PrefsTop = 16;
+ UWORD                  PrefsWidth = 561;
+ UWORD                  PrefsHeight = 238;
+-UBYTE                 *PrefsWdt = (UBYTE *)"Frodo Preferences";
++int8                 *PrefsWdt = (int8 *)"Frodo Preferences";
+ struct TextAttr       *Font, Attr;
+ UWORD                  FontX, FontY;
+ UWORD                  OffX, OffY;
+ 
+-UBYTE *SIDType0Labels[] = {
+-	(UBYTE *)"None",
+-	(UBYTE *)"Digital (AHI)",
+-	(UBYTE *)"SID Card",
++int8 *SIDType0Labels[] = {
++	(int8 *)"None",
++	(int8 *)"Digital (AHI)",
++	(int8 *)"SID Card",
+ 	NULL };
+ 
+-UBYTE *REUSize0Labels[] = {
+-	(UBYTE *)"None",
+-	(UBYTE *)"128K",
+-	(UBYTE *)"256K",
+-	(UBYTE *)"512K",
++int8 *REUSize0Labels[] = {
++	(int8 *)"None",
++	(int8 *)"128K",
++	(int8 *)"256K",
++	(int8 *)"512K",
+ 	NULL };
+ 
+-UBYTE *DriveType80Labels[] = {
+-	(UBYTE *)"DIR",
+-	(UBYTE *)"D64",
+-	(UBYTE *)"T64",
++int8 *DriveType80Labels[] = {
++	(int8 *)"DIR",
++	(int8 *)"D64",
++	(int8 *)"T64",
+ 	NULL };
+ 
+-UBYTE *DriveType90Labels[] = {
+-	(UBYTE *)"DIR",
+-	(UBYTE *)"D64",
+-	(UBYTE *)"T64",
++int8 *DriveType90Labels[] = {
++	(int8 *)"DIR",
++	(int8 *)"D64",
++	(int8 *)"T64",
+ 	NULL };
+ 
+-UBYTE *DriveType100Labels[] = {
+-	(UBYTE *)"DIR",
+-	(UBYTE *)"D64",
+-	(UBYTE *)"T64",
++int8 *DriveType100Labels[] = {
++	(int8 *)"DIR",
++	(int8 *)"D64",
++	(int8 *)"T64",
+ 	NULL };
+ 
+-UBYTE *DriveType110Labels[] = {
+-	(UBYTE *)"DIR",
+-	(UBYTE *)"D64",
+-	(UBYTE *)"T64",
++int8 *DriveType110Labels[] = {
++	(int8 *)"DIR",
++	(int8 *)"D64",
++	(int8 *)"T64",
+ 	NULL };
+ 
+ struct IntuiText PrefsIText[] = {
+-	2, 0, JAM1,34, 115, NULL, (UBYTE *)"Drive", NULL };
++	2, 0, JAM1,34, 115, NULL, (int8 *)"Drive", NULL };
+ 
+ #define Prefs_TNUM 1
+ 
+@@ -128,37 +128,37 @@ UWORD PrefsGTypes[] = {
+ };
+ 
+ struct NewGadget PrefsNGad[] = {
+-	8, 4, 26, 11, (UBYTE *)"Sprite display", NULL, GD_SpritesOn, PLACETEXT_RIGHT, NULL, (APTR)SpritesOnClicked,
+-	8, 16, 26, 11, (UBYTE *)"Sprite collisions", NULL, GD_SpriteCollisions, PLACETEXT_RIGHT, NULL, (APTR)SpriteCollisionsClicked,
+-	8, 28, 26, 11, (UBYTE *)"Joystick connected", NULL, GD_Joystick2On, PLACETEXT_RIGHT, NULL, (APTR)Joystick2OnClicked,
+-	8, 40, 26, 11, (UBYTE *)"Map joystick to port 1", NULL, GD_JoystickSwap, PLACETEXT_RIGHT, NULL, (APTR)JoystickSwapClicked,
+-	8, 52, 26, 11, (UBYTE *)"Limit speed", NULL, GD_LimitSpeed, PLACETEXT_RIGHT, NULL, (APTR)LimitSpeedClicked,
+-	8, 64, 26, 11, (UBYTE *)"Fast reset", NULL, GD_FastReset, PLACETEXT_RIGHT, NULL, (APTR)FastResetClicked,
+-	8, 76, 26, 11, (UBYTE *)"Clear CIA ICR on write", NULL, GD_CIAIRQHack, PLACETEXT_RIGHT, NULL, (APTR)CIAIRQHackClicked,
+-	8, 88, 26, 11, (UBYTE *)"SID filters", NULL, GD_SIDFilters, PLACETEXT_RIGHT, NULL, (APTR)SIDFiltersClicked,
+-	490, 4, 65, 14, (UBYTE *)"Cycles per line (CPU)", NULL, GD_NormalCycles, PLACETEXT_LEFT, NULL, (APTR)NormalCyclesClicked,
+-	490, 19, 65, 14, (UBYTE *)"Cycles per Bad Line (CPU)", NULL, GD_BadLineCycles, PLACETEXT_LEFT, NULL, (APTR)BadLineCyclesClicked,
+-	490, 34, 65, 14, (UBYTE *)"Cycles per line (CIA)", NULL, GD_CIACycles, PLACETEXT_LEFT, NULL, (APTR)CIACyclesClicked,
+-	490, 49, 65, 14, (UBYTE *)"Cycles per line (1541)", NULL, GD_FloppyCycles, PLACETEXT_LEFT, NULL, (APTR)FloppyCyclesClicked,
+-	490, 64, 65, 14, (UBYTE *)"Draw every n-th frame", NULL, GD_SkipFrames, PLACETEXT_LEFT, NULL, (APTR)SkipFramesClicked,
+-	426, 79, 129, 14, (UBYTE *)"SID emulation type", NULL, GD_SIDType, PLACETEXT_LEFT, NULL, (APTR)SIDTypeClicked,
+-	426, 94, 129, 14, (UBYTE *)"REU size", NULL, GD_REUSize, PLACETEXT_LEFT, NULL, (APTR)REUSizeClicked,
+-	47, 123, 401, 14, (UBYTE *)"8", NULL, GD_DrivePath8, PLACETEXT_LEFT, NULL, (APTR)DrivePath8Clicked,
++	8, 4, 26, 11, (int8 *)"Sprite display", NULL, GD_SpritesOn, PLACETEXT_RIGHT, NULL, (APTR)SpritesOnClicked,
++	8, 16, 26, 11, (int8 *)"Sprite collisions", NULL, GD_SpriteCollisions, PLACETEXT_RIGHT, NULL, (APTR)SpriteCollisionsClicked,
++	8, 28, 26, 11, (int8 *)"Joystick connected", NULL, GD_Joystick2On, PLACETEXT_RIGHT, NULL, (APTR)Joystick2OnClicked,
++	8, 40, 26, 11, (int8 *)"Map joystick to port 1", NULL, GD_JoystickSwap, PLACETEXT_RIGHT, NULL, (APTR)JoystickSwapClicked,
++	8, 52, 26, 11, (int8 *)"Limit speed", NULL, GD_LimitSpeed, PLACETEXT_RIGHT, NULL, (APTR)LimitSpeedClicked,
++	8, 64, 26, 11, (int8 *)"Fast reset", NULL, GD_FastReset, PLACETEXT_RIGHT, NULL, (APTR)FastResetClicked,
++	8, 76, 26, 11, (int8 *)"Clear CIA ICR on write", NULL, GD_CIAIRQHack, PLACETEXT_RIGHT, NULL, (APTR)CIAIRQHackClicked,
++	8, 88, 26, 11, (int8 *)"SID filters", NULL, GD_SIDFilters, PLACETEXT_RIGHT, NULL, (APTR)SIDFiltersClicked,
++	490, 4, 65, 14, (int8 *)"Cycles per line (CPU)", NULL, GD_NormalCycles, PLACETEXT_LEFT, NULL, (APTR)NormalCyclesClicked,
++	490, 19, 65, 14, (int8 *)"Cycles per Bad Line (CPU)", NULL, GD_BadLineCycles, PLACETEXT_LEFT, NULL, (APTR)BadLineCyclesClicked,
++	490, 34, 65, 14, (int8 *)"Cycles per line (CIA)", NULL, GD_CIACycles, PLACETEXT_LEFT, NULL, (APTR)CIACyclesClicked,
++	490, 49, 65, 14, (int8 *)"Cycles per line (1541)", NULL, GD_FloppyCycles, PLACETEXT_LEFT, NULL, (APTR)FloppyCyclesClicked,
++	490, 64, 65, 14, (int8 *)"Draw every n-th frame", NULL, GD_SkipFrames, PLACETEXT_LEFT, NULL, (APTR)SkipFramesClicked,
++	426, 79, 129, 14, (int8 *)"SID emulation type", NULL, GD_SIDType, PLACETEXT_LEFT, NULL, (APTR)SIDTypeClicked,
++	426, 94, 129, 14, (int8 *)"REU size", NULL, GD_REUSize, PLACETEXT_LEFT, NULL, (APTR)REUSizeClicked,
++	47, 123, 401, 14, (int8 *)"8", NULL, GD_DrivePath8, PLACETEXT_LEFT, NULL, (APTR)DrivePath8Clicked,
+ 	470, 123, 65, 14, NULL, NULL, GD_DriveType8, 0, NULL, (APTR)DriveType8Clicked,
+-	47, 138, 401, 14, (UBYTE *)"9", NULL, GD_DrivePath9, PLACETEXT_LEFT, NULL, (APTR)DrivePath9Clicked,
++	47, 138, 401, 14, (int8 *)"9", NULL, GD_DrivePath9, PLACETEXT_LEFT, NULL, (APTR)DrivePath9Clicked,
+ 	470, 138, 65, 14, NULL, NULL, GD_DriveType9, 0, NULL, (APTR)DriveType9Clicked,
+-	47, 153, 401, 14, (UBYTE *)"10", NULL, GD_DrivePath10, PLACETEXT_LEFT, NULL, (APTR)DrivePath10Clicked,
++	47, 153, 401, 14, (int8 *)"10", NULL, GD_DrivePath10, PLACETEXT_LEFT, NULL, (APTR)DrivePath10Clicked,
+ 	470, 153, 65, 14, NULL, NULL, GD_DriveType10, 0, NULL, (APTR)DriveType10Clicked,
+-	47, 168, 401, 14, (UBYTE *)"11", NULL, GD_DrivePath11, PLACETEXT_LEFT, NULL, (APTR)DrivePath11Clicked,
++	47, 168, 401, 14, (int8 *)"11", NULL, GD_DrivePath11, PLACETEXT_LEFT, NULL, (APTR)DrivePath11Clicked,
+ 	470, 168, 65, 14, NULL, NULL, GD_DriveType11, 0, NULL, (APTR)DriveType11Clicked,
+-	20, 186, 26, 11, (UBYTE *)"Map '/'<->'\' in filenames", NULL, GD_MapSlash, PLACETEXT_RIGHT, NULL, (APTR)MapSlashClicked,
+-	20, 198, 26, 11, (UBYTE *)"Enable 1541 processor emulation", NULL, GD_Emul1541Proc, PLACETEXT_RIGHT, NULL, (APTR)Emul1541ProcClicked,
+-	61, 218, 81, 16, (UBYTE *)"_OK", NULL, GD_OK, PLACETEXT_IN, NULL, (APTR)OKClicked,
+-	416, 218, 81, 16, (UBYTE *)"_Cancel", NULL, GD_Cancel, PLACETEXT_IN, NULL, (APTR)CancelClicked,
+-	448, 123, 20, 14, (UBYTE *)"·", NULL, GD_GetDrive8, PLACETEXT_IN, NULL, (APTR)GetDrive8Clicked,
+-	448, 138, 20, 14, (UBYTE *)"·", NULL, GD_GetDrive9, PLACETEXT_IN, NULL, (APTR)GetDrive9Clicked,
+-	448, 153, 20, 14, (UBYTE *)"·", NULL, GD_GetDrive10, PLACETEXT_IN, NULL, (APTR)GetDrive10Clicked,
+-	448, 168, 20, 14, (UBYTE *)"·", NULL, GD_GetDrive11, PLACETEXT_IN, NULL, (APTR)GetDrive11Clicked
++	20, 186, 26, 11, (int8 *)"Map '/'<->'\' in filenames", NULL, GD_MapSlash, PLACETEXT_RIGHT, NULL, (APTR)MapSlashClicked,
++	20, 198, 26, 11, (int8 *)"Enable 1541 processor emulation", NULL, GD_Emul1541Proc, PLACETEXT_RIGHT, NULL, (APTR)Emul1541ProcClicked,
++	61, 218, 81, 16, (int8 *)"_OK", NULL, GD_OK, PLACETEXT_IN, NULL, (APTR)OKClicked,
++	416, 218, 81, 16, (int8 *)"_Cancel", NULL, GD_Cancel, PLACETEXT_IN, NULL, (APTR)CancelClicked,
++	448, 123, 20, 14, (int8 *)"·", NULL, GD_GetDrive8, PLACETEXT_IN, NULL, (APTR)GetDrive8Clicked,
++	448, 138, 20, 14, (int8 *)"·", NULL, GD_GetDrive9, PLACETEXT_IN, NULL, (APTR)GetDrive9Clicked,
++	448, 153, 20, 14, (int8 *)"·", NULL, GD_GetDrive10, PLACETEXT_IN, NULL, (APTR)GetDrive10Clicked,
++	448, 168, 20, 14, (int8 *)"·", NULL, GD_GetDrive11, PLACETEXT_IN, NULL, (APTR)GetDrive11Clicked
+ };
+ 
+ ULONG PrefsGTags[] = {
+@@ -359,7 +359,7 @@ int OpenPrefsWindow( void )
+ 
+ 		PrefsZoom[0] = PrefsZoom[1] = 0;
+ 	if ( PrefsWdt )
+-		PrefsZoom[2] = TextLength( &Scr->RastPort, (UBYTE *)PrefsWdt, strlen((char *)PrefsWdt )) + 80;
++		PrefsZoom[2] = TextLength( &Scr->RastPort, (int8 *)PrefsWdt, strlen((char *)PrefsWdt )) + 80;
+ 	else
+ 		PrefsZoom[2]  = 80L;
+ 		PrefsZoom[3] = Scr->WBorTop + Scr->RastPort.TxHeight + 1;
+-- 
+1.7.5.3
+
diff --git a/patches/Frodo-4.1b/0005-frodo-more-changes-from-UBYTE-to-int8.patch b/patches/Frodo-4.1b/0005-frodo-more-changes-from-UBYTE-to-int8.patch
new file mode 100644
index 000000000..68a9b7faf
--- /dev/null
+++ b/patches/Frodo-4.1b/0005-frodo-more-changes-from-UBYTE-to-int8.patch
@@ -0,0 +1,199 @@
+From 30876f26f9dcd707df11ef409b6b95d93d33f64d Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Fri, 17 Jun 2011 19:23:22 +0200
+Subject: [PATCH 05/10] frodo: more changes from UBYTE to int8
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Src/AmigaGUI.h      |   16 ++++++++--------
+ Src/Display.h       |    2 +-
+ Src/Display_Acorn.i |    2 +-
+ Src/Display_Amiga.i |    8 ++++----
+ Src/Display_WIN32.i |   12 ++++++------
+ Src/SID_Amiga.i     |    4 ++--
+ 6 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/Src/AmigaGUI.h b/Src/AmigaGUI.h
+index 3009b45..8d4af69 100644
+--- a/Src/AmigaGUI.h
++++ b/Src/AmigaGUI.h
+@@ -78,7 +78,7 @@ extern struct IntuitionBase *IntuitionBase;
+ extern struct Library       *GadToolsBase;
+ 
+ extern struct Screen        *Scr;
+-extern UBYTE                 *PubScreenName;
++extern int8                 *PubScreenName;
+ extern APTR                  VisualInfo;
+ extern struct Window        *PrefsWnd;
+ extern struct Gadget        *PrefsGList;
+@@ -90,16 +90,16 @@ extern UWORD                 PrefsLeft;
+ extern UWORD                 PrefsTop;
+ extern UWORD                 PrefsWidth;
+ extern UWORD                 PrefsHeight;
+-extern UBYTE                *PrefsWdt;
++extern int8                *PrefsWdt;
+ extern struct TextAttr      *Font, Attr;
+ extern UWORD                 FontX, FontY;
+ extern UWORD                 OffX, OffY;
+-extern UBYTE                *SIDType0Labels[];
+-extern UBYTE                *REUSize0Labels[];
+-extern UBYTE                *DriveType80Labels[];
+-extern UBYTE                *DriveType90Labels[];
+-extern UBYTE                *DriveType100Labels[];
+-extern UBYTE                *DriveType110Labels[];
++extern int8                *SIDType0Labels[];
++extern int8                *REUSize0Labels[];
++extern int8                *DriveType80Labels[];
++extern int8                *DriveType90Labels[];
++extern int8                *DriveType100Labels[];
++extern int8                *DriveType110Labels[];
+ extern struct IntuiText      PrefsIText[];
+ extern struct NewMenu        PrefsNewMenu[];
+ extern UWORD                 PrefsGTypes[];
+diff --git a/Src/Display.h b/Src/Display.h
+index 4a3c228..da2bee3 100644
+--- a/Src/Display.h
++++ b/Src/Display.h
+@@ -183,7 +183,7 @@ private:
+ 	BOOL FileNameDialog(char *prefs_path, BOOL save = false);
+ 	void OfferSave();			// Offer chance to save changes
+ 
+-	UBYTE *chunky_buf;			// Chunky buffer for drawing
++	int8 *chunky_buf;			// Chunky buffer for drawing
+ 	BOOL active;				// is application active?
+ 	BOOL paused;				// is application paused?
+ 	BOOL waiting;				// is application waiting?
+diff --git a/Src/Display_Acorn.i b/Src/Display_Acorn.i
+index 14f558c..bf609c0 100644
+--- a/Src/Display_Acorn.i
++++ b/Src/Display_Acorn.i
+@@ -203,7 +203,7 @@ void C64Display::PollKeyboard(uint8 *key_matrix, uint8 *rev_matrix, uint8 *joyst
+   int status;
+   uint8 kjoy, kjoy2;
+   uint32 newkeys[8];
+-  UBYTE kjoy, kjoy2;
++  int8 kjoy, kjoy2;
+ 
+   // Clear keyboard
+   for (code=0; code<8; code++) {key_matrix[code] = 0xff; rev_matrix[code] = 0xff; newkeys[code] = 0;}
+diff --git a/Src/Display_Amiga.i b/Src/Display_Amiga.i
+index c846b68..f8ecc56 100644
+--- a/Src/Display_Amiga.i
++++ b/Src/Display_Amiga.i
+@@ -132,7 +132,7 @@ C64Display::C64Display(C64 *the_c64) : TheC64(the_c64)
+ 		led_state[i] = old_led_state[i] = LED_OFF;
+ 
+ 	// Allocate chunky buffer to draw into
+-	chunky_buf = new UBYTE[DISPLAY_X * DISPLAY_Y];
++	chunky_buf = new int8[DISPLAY_X * DISPLAY_Y];
+ 
+ 	// Open fonts
+ 	led_font = OpenDiskFont(&led_font_attr);
+@@ -360,7 +360,7 @@ void C64Display::Speedometer(int speed)
+  *  Return pointer to bitmap data
+  */
+ 
+-UBYTE *C64Display::BitmapBase(void)
++int8 *C64Display::BitmapBase(void)
+ {
+ 	return chunky_buf;
+ }
+@@ -380,7 +380,7 @@ int C64Display::BitmapXMod(void)
+  *  Handle IDCMP messages
+  */
+ 
+-void C64Display::PollKeyboard(UBYTE *key_matrix, UBYTE *rev_matrix, UBYTE *joystick)
++void C64Display::PollKeyboard(int8 *key_matrix, int8 *rev_matrix, int8 *joystick)
+ {
+ 	struct IntuiMessage *msg;
+ 
+@@ -594,7 +594,7 @@ bool C64Display::NumLock(void)
+  *  Allocate C64 colors
+  */
+ 
+-void C64Display::InitColors(UBYTE *colors)
++void C64Display::InitColors(int8 *colors)
+ {
+ 	// Spread pens into colors array
+ 	for (int i=0; i<256; i++)
+diff --git a/Src/Display_WIN32.i b/Src/Display_WIN32.i
+index c6cccf4..f55b88d 100644
+--- a/Src/Display_WIN32.i
++++ b/Src/Display_WIN32.i
+@@ -117,7 +117,7 @@ private:
+ 
+ static C64Display *TheDisplay;
+ static int keystate[256];
+-static UBYTE rev_matrix[8], key_matrix[8];
++static int8 rev_matrix[8], key_matrix[8];
+ static int quit = 0;
+ static int numlock = 0;
+ static int joystate = 0xff;
+@@ -223,7 +223,7 @@ C64Display::C64Display(C64 *the_c64) : TheC64(the_c64)
+ 		led_state[i] = old_led_state[i] = LED_OFF;
+ 
+ 	// Allocate chunky buffer to draw into.
+-	chunky_buf = new UBYTE[DISPLAY_X * DISPLAY_Y];
++	chunky_buf = new int8[DISPLAY_X * DISPLAY_Y];
+ 
+ 	CalcViewPort();
+ 
+@@ -447,7 +447,7 @@ void C64Display::Speedometer(int speed)
+  *  Return pointer to bitmap data
+  */
+ 
+-UBYTE *C64Display::BitmapBase()
++int8 *C64Display::BitmapBase()
+ {
+ #ifdef WORKBUFFER_BITMAP
+ 	if (colors_depth == 8 && pWork) {
+@@ -465,7 +465,7 @@ UBYTE *C64Display::BitmapBase()
+ 		if (ddrval == DD_OK) {
+ 			workbuffer_locked = TRUE;
+ 			workbuffer_bitmap = TRUE;
+-			return (UBYTE *) bitmap_ddsd.lpSurface;
++			return (int8 *) bitmap_ddsd.lpSurface;
+ 		}
+ 	}
+ 	workbuffer_bitmap = FALSE;
+@@ -492,7 +492,7 @@ int C64Display::BitmapXMod()
+  *  Freshen keyboard state
+  */
+ 
+-void C64Display::PollKeyboard(UBYTE *CIA_key_matrix, UBYTE *CIA_rev_matrix, UBYTE *joystick)
++void C64Display::PollKeyboard(int8 *CIA_key_matrix, int8 *CIA_rev_matrix, int8 *joystick)
+ {
+ 	//Debug("Display::PollKeyboard\n");
+ 
+@@ -532,7 +532,7 @@ bool C64Display::NumLock()
+  *  Allocate C64 colors
+  */
+ 
+-void C64Display::InitColors(UBYTE *array)
++void C64Display::InitColors(int8 *array)
+ {
+ 	if (colors_depth == 8) {
+ 		for (int i = 0; i < 256; i++)
+diff --git a/Src/SID_Amiga.i b/Src/SID_Amiga.i
+index 7ef993d..6467e7a 100644
+--- a/Src/SID_Amiga.i
++++ b/Src/SID_Amiga.i
+@@ -252,13 +252,13 @@ public:
+ 	virtual void Resume(void) {}
+ 
+ private:
+-	UBYTE *sid_base;	// SID card base pointer
++	int8 *sid_base;	// SID card base pointer
+ };
+ 
+ // Constructor: Reset SID
+ SIDCardRenderer::SIDCardRenderer()
+ {
+-	sid_base = (UBYTE *)0xa00001;
++	sid_base = (int8 *)0xa00001;
+ 	Reset();
+ }
+ 
+-- 
+1.7.5.3
+
diff --git a/patches/Frodo-4.1b/0006-frodo-remove-duplicated-defines.patch b/patches/Frodo-4.1b/0006-frodo-remove-duplicated-defines.patch
new file mode 100644
index 000000000..0af3118ef
--- /dev/null
+++ b/patches/Frodo-4.1b/0006-frodo-remove-duplicated-defines.patch
@@ -0,0 +1,56 @@
+From b71409de528a660b25f96a788c9b5b236706472f Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Fri, 17 Jun 2011 20:02:27 +0200
+Subject: [PATCH 06/10] frodo: remove duplicated defines
+
+We currently get these warnings:
+
+In file included from Display.cpp:79:0:
+Display_svga.i:156:0: warning: "KEY_F10" redefined
+/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:186:0: note: this is the location of the previous definition
+Display_svga.i:157:0: warning: "KEY_F11" redefined
+/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:205:0: note: this is the location of the previous definition
+Display_svga.i:158:0: warning: "KEY_F12" redefined
+/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:206:0: note: this is the location of the previous definition
+Display_svga.i:166:0: warning: "KEY_NUMLOCK" redefined
+/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:187:0: note: this is the location of the previous definition
+Display_svga.i:168:0: warning: "KEY_KPPLUS" redefined
+/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:196:0: note: this is the location of the previous definition
+Display_svga.i:169:0: warning: "KEY_KPMINUS" redefined
+/opt/OSELAS.Toolchain-2011.03.0/i586-unknown-linux-gnu/gcc-4.5.2-glibc-2.13-binutils-2.21-kernel-2.6.36-sanitized/bin/../sysroot-i586-unknown-linux-gnu/usr/include/linux/input.h:192:0: note: this is the location of the previous definition
+
+Remove duplicate definitions.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Src/Display_svga.i |    7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/Src/Display_svga.i b/Src/Display_svga.i
+index 37f2194..75fd1b4 100644
+--- a/Src/Display_svga.i
++++ b/Src/Display_svga.i
+@@ -153,9 +153,6 @@ static int8 rev_matrix[8], key_matrix[8];
+   7    R/S  Q   C= SPC  2  CTL  <-  1
+ */
+ #define MATRIX(a,b) (((a) << 3) | (b))
+-#define KEY_F10 512
+-#define KEY_F11 513
+-#define KEY_F12 514
+ 
+ #define KEY_FIRE 515
+ #define KEY_JUP 516
+@@ -163,10 +160,6 @@ static int8 rev_matrix[8], key_matrix[8];
+ #define KEY_JLF 518
+ #define KEY_JRT 519
+ 
+-#define KEY_NUMLOCK 520
+-
+-#define KEY_KPPLUS 521
+-#define KEY_KPMINUS 522
+ #define KEY_KPMULT 523
+ #define KEY_KPDIV 524
+ 
+-- 
+1.7.5.3
+
diff --git a/patches/Frodo-4.1b/0007-frodo-fix-cast.patch b/patches/Frodo-4.1b/0007-frodo-fix-cast.patch
new file mode 100644
index 000000000..4797fab11
--- /dev/null
+++ b/patches/Frodo-4.1b/0007-frodo-fix-cast.patch
@@ -0,0 +1,33 @@
+From b1ee6659eb8a897badaf8f88842faf68511c8e3c Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Fri, 17 Jun 2011 20:04:11 +0200
+Subject: [PATCH 07/10] frodo: fix cast
+
+Fix this error:
+
+In file included from Display.cpp:79:0:
+Display_svga.i: In member function 'void C64Display::Update()':
+Display_svga.i:478:40: error: invalid conversion from 'char*' to 'unsigned char*'
+Display_svga.i:478:40: error:   initializing argument 2 of 'int vga_drawscanline(int, unsigned char*)'
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Src/Display_svga.i |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Src/Display_svga.i b/Src/Display_svga.i
+index 75fd1b4..7dd201b 100644
+--- a/Src/Display_svga.i
++++ b/Src/Display_svga.i
+@@ -475,7 +475,7 @@ void C64Display::Update(void)
+ 	return;
+     
+     for (y = 0; y < DISPLAY_Y; y++) {
+-	vga_drawscanline(y, bufmem + hsize * y);
++	vga_drawscanline(y, (unsigned char*) bufmem + hsize * y);
+     }
+ }
+ 
+-- 
+1.7.5.3
+
diff --git a/patches/Frodo-4.1b/0008-frodo-fix-type.patch b/patches/Frodo-4.1b/0008-frodo-fix-type.patch
new file mode 100644
index 000000000..3443b66b0
--- /dev/null
+++ b/patches/Frodo-4.1b/0008-frodo-fix-type.patch
@@ -0,0 +1,32 @@
+From 169e2be56169efbe4f0e84f5c4bff9edf7dd9447 Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Fri, 17 Jun 2011 20:07:53 +0200
+Subject: [PATCH 08/10] frodo: fix type
+
+Display_svga.i: In member function 'uint8* C64Display::BitmapBase()':
+Display_svga.i:485:23: error: invalid conversion from 'int8*' to 'uint8*'
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Src/Display_svga.i |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Src/Display_svga.i b/Src/Display_svga.i
+index 7dd201b..68bb104 100644
+--- a/Src/Display_svga.i
++++ b/Src/Display_svga.i
+@@ -480,9 +480,9 @@ void C64Display::Update(void)
+ }
+ 
+ 
+-int8 *C64Display::BitmapBase(void)
++uint8 *C64Display::BitmapBase(void)
+ {
+-       return (int8 *)bufmem;
++       return (uint8 *)bufmem;
+ }
+ 
+ 
+-- 
+1.7.5.3
+
diff --git a/patches/Frodo-4.1b/0009-frodo-fix-types.patch b/patches/Frodo-4.1b/0009-frodo-fix-types.patch
new file mode 100644
index 000000000..ae6c02893
--- /dev/null
+++ b/patches/Frodo-4.1b/0009-frodo-fix-types.patch
@@ -0,0 +1,29 @@
+From 3b9eb870e8cebd1ddf7f8162495013bc2adee83f Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Fri, 17 Jun 2011 20:08:52 +0200
+Subject: [PATCH 09/10] frodo: fix types
+
+Display_svga.i:495:6: error: prototype for 'void C64Display::PollKeyboard(int8*, int8*, int8*)' does not match any in class 'C64Display'
+Display.h:60:7: error: candidate is: void C64Display::PollKeyboard(uint8*, uint8*, uint8*)
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Src/Display_svga.i |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Src/Display_svga.i b/Src/Display_svga.i
+index 68bb104..a60ba80 100644
+--- a/Src/Display_svga.i
++++ b/Src/Display_svga.i
+@@ -492,7 +492,7 @@ int C64Display::BitmapXMod(void)
+ }
+ 
+ 
+-void C64Display::PollKeyboard(int8 *CIA_key_matrix, int8 *CIA_rev_matrix, int8 *joystick)
++void C64Display::PollKeyboard(uint8 *CIA_key_matrix, uint8 *CIA_rev_matrix, uint8 *joystick)
+ {
+     keyboard_update();
+     *joystick = joystate;
+-- 
+1.7.5.3
+
diff --git a/patches/Frodo-4.1b/0010-frodo-fix-type.patch b/patches/Frodo-4.1b/0010-frodo-fix-type.patch
new file mode 100644
index 000000000..653a3c1b4
--- /dev/null
+++ b/patches/Frodo-4.1b/0010-frodo-fix-type.patch
@@ -0,0 +1,32 @@
+From c9a969f6dfaed4590f75d0c969658c2261c4c86d Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Fri, 17 Jun 2011 20:09:54 +0200
+Subject: [PATCH 10/10] frodo: fix type
+
+Display_svga.i:530:6: error: prototype for 'void C64Display::InitColors(int8*)' does not match any in class 'C64Display'
+Display.h:63:7: error: candidate is: void C64Display::InitColors(uint8*)
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Src/Display_svga.i |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Src/Display_svga.i b/Src/Display_svga.i
+index a60ba80..e1e4a53 100644
+--- a/Src/Display_svga.i
++++ b/Src/Display_svga.i
+@@ -527,9 +527,9 @@ static int colorval(int v)
+        return ((v & 255)*0x01010101) >> 26;
+ }
+ 
+-void C64Display::InitColors(int8 *colors)
++void C64Display::InitColors(uint8 *colors)
+ {
+-       int i;
++       uint8 i;
+ 
+        for (i=0; i< 256; i++) {
+                vga_setpalette(i, colorval(palette_red[i & 0x0f]), colorval(palette_green[i & 0x0f]), colorval(palette_blue[i & 0x0f]));
+-- 
+1.7.5.3
+
diff --git a/patches/Frodo-4.1b/series b/patches/Frodo-4.1b/series
index dea90ad07..a365944da 100644
--- a/patches/Frodo-4.1b/series
+++ b/patches/Frodo-4.1b/series
@@ -1 +1,10 @@
-enable-sdl.diff
+0001-enable-sdl.diff.patch
+0002-frodo-add-cppflags-support.patch
+0003-frodo-change-more-UBYTEs-into-int8.patch
+0004-frodo-AmigaGUI-change-UBYTE-into-int8.patch
+0005-frodo-more-changes-from-UBYTE-to-int8.patch
+0006-frodo-remove-duplicated-defines.patch
+0007-frodo-fix-cast.patch
+0008-frodo-fix-type.patch
+0009-frodo-fix-types.patch
+0010-frodo-fix-type.patch