aboutsummaryrefslogtreecommitdiff
path: root/emulators/x48/files
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/x48/files')
-rw-r--r--emulators/x48/files/patch-Imakefile (renamed from emulators/x48/files/patch-ac)4
-rw-r--r--emulators/x48/files/patch-ae11
-rw-r--r--emulators/x48/files/patch-config.h (renamed from emulators/x48/files/patch-ab)4
-rw-r--r--emulators/x48/files/patch-src+X48.ad13
-rw-r--r--emulators/x48/files/patch-src+dump2rom.c12
-rw-r--r--emulators/x48/files/patch-src+hp48.h11
-rw-r--r--emulators/x48/files/patch-src+serial.c (renamed from emulators/x48/files/patch-ad)37
-rw-r--r--emulators/x48/files/patch-src+x48_x11.c19
-rw-r--r--emulators/x48/files/src+X48.ad19
9 files changed, 101 insertions, 29 deletions
diff --git a/emulators/x48/files/patch-ac b/emulators/x48/files/patch-Imakefile
index 156e1db6a27a..3513e6ecee95 100644
--- a/emulators/x48/files/patch-ac
+++ b/emulators/x48/files/patch-Imakefile
@@ -1,5 +1,5 @@
---- src/Imakefile.orig Thu Jun 17 00:32:19 1999
-+++ src/Imakefile Sat Oct 14 13:22:30 2000
+--- src/Imakefile.orig Sun Jul 4 17:04:21 1999
++++ src/Imakefile Sat Jun 28 19:01:04 2003
@@ -60,7 +60,7 @@
LDOPTIONS = LDOPTIONS_DEF
#endif
diff --git a/emulators/x48/files/patch-ae b/emulators/x48/files/patch-ae
deleted file mode 100644
index 8e0e422c140a..000000000000
--- a/emulators/x48/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/x48_x11.c.orig Tue Jun 29 07:12:29 1999
-+++ src/x48_x11.c Tue Aug 15 22:30:17 2000
-@@ -3605,6 +3605,8 @@
- break;
- case XK_Alt_L:
- case XK_Alt_R:
-+ case XK_Meta_L:
-+ case XK_Meta_R:
- key_event(BUTTON_ALPHA, xev);
- wake = 1;
- break;
diff --git a/emulators/x48/files/patch-ab b/emulators/x48/files/patch-config.h
index b4a39a868171..540baa943b11 100644
--- a/emulators/x48/files/patch-ab
+++ b/emulators/x48/files/patch-config.h
@@ -1,5 +1,5 @@
---- config.h.orig Tue Jun 29 07:36:58 1999
-+++ config.h Tue Aug 15 20:52:55 2000
+--- config.h.orig Mon Jun 28 17:36:58 1999
++++ config.h Sat Jun 28 21:40:54 2003
@@ -56,12 +56,12 @@
/*
* Which Compiler to use:
diff --git a/emulators/x48/files/patch-src+X48.ad b/emulators/x48/files/patch-src+X48.ad
new file mode 100644
index 000000000000..25880923ee81
--- /dev/null
+++ b/emulators/x48/files/patch-src+X48.ad
@@ -0,0 +1,13 @@
+--- src/X48.ad.orig Wed Jan 11 13:24:05 1995
++++ src/X48.ad Sun Jun 29 10:46:17 2003
+@@ -49,8 +49,8 @@
+ ! resources controlling the connections
+ !
+ *useTerminal: True
+-*useSerial: False
+-*serialLine: /dev/ttyS0
++*useSerial: True
++*serialLine: /dev/cuaa0
+
+ !
+ ! stuff controlling initialization
diff --git a/emulators/x48/files/patch-src+dump2rom.c b/emulators/x48/files/patch-src+dump2rom.c
new file mode 100644
index 000000000000..f104d279fe97
--- /dev/null
+++ b/emulators/x48/files/patch-src+dump2rom.c
@@ -0,0 +1,12 @@
+--- src/dump2rom.c.orig Tue Sep 7 10:41:48 1999
++++ src/dump2rom.c Sun Jun 29 10:44:05 2003
+@@ -130,8 +130,7 @@
+ {
+ FILE *dump;
+ long addr, size;
+- char ch;
+- int i, gx, error;
++ int ch, i, gx, error;
+
+ if (argc < 2) {
+ fprintf(stderr, "usage: %s hp48-dump-file\n", argv[0]);
diff --git a/emulators/x48/files/patch-src+hp48.h b/emulators/x48/files/patch-src+hp48.h
new file mode 100644
index 000000000000..602a5b37f4e3
--- /dev/null
+++ b/emulators/x48/files/patch-src+hp48.h
@@ -0,0 +1,11 @@
+--- src/hp48.h.orig Sat Jun 28 20:50:52 2003
++++ src/hp48.h Sat Jun 28 20:52:14 2003
+@@ -246,7 +246,7 @@
+
+ word_8 unknown2;
+
+- char timer1; /* may NOT be unsigned !!! */
++ signed char timer1; /* may NOT be unsigned !!! */
+ word_32 timer2;
+
+ long t1_instr;
diff --git a/emulators/x48/files/patch-ad b/emulators/x48/files/patch-src+serial.c
index b86e6e6e4f10..bcc52d4d5c65 100644
--- a/emulators/x48/files/patch-ad
+++ b/emulators/x48/files/patch-src+serial.c
@@ -1,11 +1,20 @@
---- src/serial.c.orig Tue Jun 29 07:12:29 1999
-+++ src/serial.c Tue Aug 15 20:46:02 2000
+--- src/serial.c.orig Tue Sep 7 10:41:48 1999
++++ src/serial.c Sat Jun 28 21:27:06 2003
+@@ -69,7 +69,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <sys/time.h>
+-#if defined(LINUX) || defined(HPUX)
++#if defined(LINUX) || defined(HPUX) || defined(CSRG_BASED)
+ #include <sys/ioctl.h>
+ #endif
+ #include <unistd.h>
@@ -77,6 +77,8 @@
#ifdef SOLARIS
#include <sys/stream.h>
#include <sys/stropts.h>
+#endif
-+#if defined(SOLARIS) || defined(__FreeBSD__) || defined (__bsdi__)
++#if defined(SOLARIS) || defined(CSRG_BASED)
#include <sys/termios.h>
#endif
@@ -14,7 +23,7 @@
if (ttyp >= 0)
{
-#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined(__FreeBSD__) || defined (__bsdi__)
++#if defined(SUNOS) || defined(HPUX) || defined (CSRG_BASED)
if (tcgetattr(ttyp, &ttybuf) < 0)
#else
if (ioctl(ttyp, TCGETS, (char *)&ttybuf) < 0)
@@ -23,7 +32,7 @@
if (ttyp >= 0)
{
-#if defined(SUNOS) || defined (HPUX)
-+#if defined(SUNOS) || defined (HPUX) || defined(__FreeBSD__) || defined (__bsdi__)
++#if defined(SUNOS) || defined (HPUX) || defined(CSRG_BASED)
if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
#else
if (ioctl(ttyp, TCSETS, (char *)&ttybuf) < 0)
@@ -32,7 +41,7 @@
if (ir_fd >= 0)
{
-#if defined(SUNOS) || defined (HPUX)
-+#if defined(SUNOS) || defined (HPUX) || defined (__FreeBSD__) || defined (__bsdi__)
++#if defined(SUNOS) || defined (HPUX) || defined (CSRG_BASED)
if (tcgetattr(ir_fd, &ttybuf) < 0)
#else
if (ioctl(ir_fd, TCGETS, (char *)&ttybuf) < 0)
@@ -41,7 +50,7 @@
if (ir_fd >= 0)
{
-#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined (__FreeBSD__) || defined (__bsdi__)
++#if defined(SUNOS) || defined(HPUX) || defined (CSRG_BASED)
if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
#else
if (ioctl(ir_fd, TCSETS, (char *)&ttybuf) < 0)
@@ -50,7 +59,7 @@
if (ir_fd >= 0)
{
-#if defined(SUNOS) || defined (HPUX)
-+#if defined(SUNOS) || defined (HPUX) || defined (__FreeBSD__) || defined (__bsdi__)
++#if defined(SUNOS) || defined (HPUX) || defined (CSRG_BASED)
if (tcgetattr(ir_fd, &ttybuf) < 0)
#else
if (ioctl(ir_fd, TCGETS, (char *)&ttybuf) < 0)
@@ -58,7 +67,7 @@
}
}
-+#if defined(__FreeBSD__) || defined(__bsdi__)
++#if defined(CSRG_BASED)
+ cfsetspeed(&ttybuf, baud);
+#else
+
@@ -69,12 +78,12 @@
ttybuf.c_cflag |= B9600;
}
-+#endif /* FreeBSD */
++#endif /* CSRG_BASED */
+
if (ir_fd >= 0)
{
-#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined (__FreeBSD__) || defined(__bsdi__)
++#if defined(SUNOS) || defined(HPUX) || defined (CSRG_BASED)
if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
#else
if (ioctl(ir_fd, TCSETS, (char *)&ttybuf) < 0)
@@ -83,7 +92,7 @@
if (ttyp >= 0)
{
-#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined (__FreeBSD__) || defined(__bsdi__)
++#if defined(SUNOS) || defined(HPUX) || defined (CSRG_BASED)
if (tcgetattr(ttyp, &ttybuf) < 0)
#else
if (ioctl(ttyp, TCGETS, (char *)&ttybuf) < 0)
@@ -91,7 +100,7 @@
}
}
-+#if defined(__FreeBSD__) || defined(__bsdi__)
++#if defined(CSRG_BASED)
+ cfsetspeed(&ttybuf, baud);
+#else
ttybuf.c_cflag &= ~CBAUD;
@@ -106,7 +115,7 @@
if (ttyp >= 0)
{
-#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined (__FreeBSD__) || defined(__bsdi__)
++#if defined(SUNOS) || defined(HPUX) || defined (CSRG_BASED)
if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
#else
if (ioctl(ttyp, TCSETS, (char *)&ttybuf) < 0)
diff --git a/emulators/x48/files/patch-src+x48_x11.c b/emulators/x48/files/patch-src+x48_x11.c
new file mode 100644
index 000000000000..a094232d7873
--- /dev/null
+++ b/emulators/x48/files/patch-src+x48_x11.c
@@ -0,0 +1,19 @@
+--- src/x48_x11.c.orig Thu Sep 9 01:05:58 1999
++++ src/x48_x11.c Sat Jun 28 20:55:35 2003
+@@ -4108,6 +4108,7 @@
+ break;
+ case XK_KP_Add:
+ case XK_plus:
++ case XK_equal:
+ key_event(BUTTON_PLUS, xev);
+ wake = 1;
+ break;
+@@ -4168,6 +4169,8 @@
+ break;
+ case XK_Alt_L:
+ case XK_Alt_R:
++ case XK_Meta_L:
++ case XK_Meta_R:
+ key_event(BUTTON_ALPHA, xev);
+ wake = 1;
+ break;
diff --git a/emulators/x48/files/src+X48.ad b/emulators/x48/files/src+X48.ad
new file mode 100644
index 000000000000..812729cd00bf
--- /dev/null
+++ b/emulators/x48/files/src+X48.ad
@@ -0,0 +1,19 @@
+--- src/X48.ad.orig Sat Jun 28 22:22:06 2003
++++ src/X48.ad Sat Jun 28 22:26:22 2003
+@@ -50,14 +50,14 @@
+ !
+ *useTerminal: True
+ *useSerial: False
+-*serialLine: /dev/ttyS0
++*serialLine: /dev/cuaa0
+
+ !
+ ! stuff controlling initialization
+ !
+ *completeInitialize: False
+ *resetOnStartup: False
+-*romFileName: rom.dump
++*romFileName: gxrom-r
+ *homeDirectory: .hp48
+
+ !
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 08:25:35 +0000