diff options
| -rw-r--r-- | emulators/arcem/distinfo | 5 | ||||
| -rw-r--r-- | emulators/arcem/patches/patch-ab | 33 | ||||
| -rw-r--r-- | emulators/arcem/patches/patch-ae | 12 |
3 files changed, 45 insertions, 5 deletions
diff --git a/emulators/arcem/distinfo b/emulators/arcem/distinfo index cc2731159c7..135bb9d3735 100644 --- a/emulators/arcem/distinfo +++ b/emulators/arcem/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 18:49:17 agc Exp $ +$NetBSD: distinfo,v 1.4 2007/10/10 22:36:05 rillig Exp $ SHA1 (arcem-1.00-src.tgz) = d2a487531ce6c66dfbeb59d1f1093c7d8fc3282a RMD160 (arcem-1.00-src.tgz) = 95044eed6e5cd871d5bd926c3d02d17706e0f93b @@ -10,6 +10,7 @@ SHA1 (HardImage1.gz) = ab3c2ddd5a913a4051d4c21707e7701b27a103f3 RMD160 (HardImage1.gz) = 09176071c9c325b50a3a2074938789f4e6136d44 Size (HardImage1.gz) = 3545800 bytes SHA1 (patch-aa) = afc6f0a77315fb7476e10f472441093360b637e8 -SHA1 (patch-ab) = 92408b25cdd23444a7220191ba65348c6bef482f +SHA1 (patch-ab) = f55cf50560e5a3d87ec1540fddd88990981d56ec SHA1 (patch-ac) = a9f3edbd7e7a974b7098936d62790821c5d3d4a1 SHA1 (patch-ad) = 61823a1e47f783d1852c1f50762cdecbe3aeb3fb +SHA1 (patch-ae) = c2580ed6b4940022dc427456519a066413a3c91f diff --git a/emulators/arcem/patches/patch-ab b/emulators/arcem/patches/patch-ab index 5bac55b5ee8..85a9cedc712 100644 --- a/emulators/arcem/patches/patch-ab +++ b/emulators/arcem/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2004/12/03 15:15:23 skrll Exp $ +$NetBSD: patch-ab,v 1.3 2007/10/10 22:36:05 rillig Exp $ ---- X/DispKbd.c.orig 2002-05-05 23:09:39.000000000 +0100 -+++ X/DispKbd.c +--- X/DispKbd.c.orig 2002-05-06 00:09:39.000000000 +0200 ++++ X/DispKbd.c 2007-10-11 00:34:12.000000000 +0200 @@ -45,7 +45,9 @@ #define HD HOSTDISPLAY #define DC DISPLAYCONTROL @@ -27,3 +27,30 @@ $NetBSD: patch-ab,v 1.2 2004/12/03 15:15:23 skrll Exp $ /*-----------------------------------------------------------------------------*/ /* I'm not confident that this is completely correct - if it's wrong all hell is bound to break loose! If it works however it should speed things up +@@ -731,7 +735,7 @@ static void RefreshDisplay_TrueColor_8bp + int DisplayWidth=(VIDC.Horiz_DisplayEnd-VIDC.Horiz_DisplayStart)*2; + int x,y,memoffset; + int VisibleDisplayWidth; +- unsigned char Buffer[MonitorWidth]; ++ char Buffer[MonitorWidth]; + char *ImgPtr=HD.ImageData; + + /* First configure the colourmap */ +@@ -762,7 +766,7 @@ static void RefreshDisplay_TrueColor_8bp + CopyScreenRAM(state,memoffset,VisibleDisplayWidth, Buffer); + + for(x=0;x<VisibleDisplayWidth;x++) { +- XPutPixel(HD.DisplayImage,x,y,HD.pixelMap[Buffer[x]]); ++ XPutPixel(HD.DisplayImage,x,y,HD.pixelMap[(unsigned char)Buffer[x]]); + }; /* X loop */ + }; /* Refresh test */ + }; /* y */ +@@ -1119,7 +1123,7 @@ static void ProcessKey(ARMul_State *stat + { + XColor black, dummy; + Pixmap bm_no; +- static unsigned char bm_no_data[] = { 0,0,0,0, 0,0,0,0 }; ++ static char bm_no_data[] = { 0,0,0,0, 0,0,0,0 }; + XAllocNamedColor(HD.disp,HD.ArcsColormap,"black",&black,&dummy); + bm_no = XCreateBitmapFromData(HD.disp, HD.MainPane, bm_no_data, 8,8); + XDefineCursor(HD.disp, HD.MainPane, XCreatePixmapCursor(HD.disp, bm_no, bm_no, &black, &black,0, 0)); diff --git a/emulators/arcem/patches/patch-ae b/emulators/arcem/patches/patch-ae new file mode 100644 index 00000000000..f41e8278c45 --- /dev/null +++ b/emulators/arcem/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.1 2007/10/10 22:36:05 rillig Exp $ + +--- armdefs.h.orig 2002-03-17 00:30:30.000000000 +0100 ++++ armdefs.h 2007-10-11 00:31:14.000000000 +0200 +@@ -302,7 +302,6 @@ extern ARMword ARMul_OSLastErrorP(ARMul_ + + extern ARMword ARMul_Debug(ARMul_State *state, ARMword pc, ARMword instr); + extern unsigned ARMul_OSException(ARMul_State *state, ARMword vector, ARMword pc); +-extern int rdi_log; + + /***************************************************************************\ + * Host-dependent stuff * |