|
1473
|
1 |
diff -bur crrcsim-0.9.9.orig/crrc_config.h crrcsim-0.9.9/crrc_config.h
|
|
|
2 |
--- crrcsim-0.9.9.orig/crrc_config.h Thu May 29 23:16:42 2008
|
|
|
3 |
+++ crrcsim-0.9.9/crrc_config.h Sun Oct 5 15:13:12 2008
|
|
|
4 |
@@ -29,7 +29,7 @@
|
|
|
5 |
#define HAVE_STRING_H 1
|
|
|
6 |
|
|
|
7 |
/* Define to 1 if you have the <sys/io.h> header file. */
|
|
|
8 |
-#define HAVE_SYS_IO_H 1
|
|
|
9 |
+/* #undef HAVE_SYS_IO_H */
|
|
|
10 |
|
|
|
11 |
/* Define to 1 if you have the <sys/stat.h> header file. */
|
|
|
12 |
#define HAVE_SYS_STAT_H 1
|
|
|
13 |
@@ -62,7 +62,7 @@
|
|
|
14 |
#define PACKAGE_VERSION "0.9.9"
|
|
|
15 |
|
|
|
16 |
/* Portaudio version, 0 to disable audio interface */
|
|
|
17 |
-#define PORTAUDIO 18
|
|
|
18 |
+#define PORTAUDIO 0
|
|
|
19 |
|
|
|
20 |
/* Define to the necessary symbol if this constant uses a non-standard name on
|
|
|
21 |
your system. */
|
|
|
22 |
diff -bur crrcsim-0.9.9.orig/chardevice/chardevicecommon.h crrcsim-0.9.9/chardevice/chardevicecommon.h
|
|
|
23 |
--- crrcsim-0.9.9.orig/chardevice/chardevicecommon.h Thu Jan 24 18:01:31 2008
|
|
|
24 |
+++ crrcsim-0.9.9/chardevice/chardevicecommon.h Sun Oct 5 16:16:24 2008
|
|
|
25 |
@@ -88,8 +88,12 @@
|
|
|
26 |
#endif
|
|
|
27 |
#ifndef MSG_NOSIGNAL
|
|
|
28 |
/* FreeBSD and OS X use SO_NOSIGPIPE instead */
|
|
|
29 |
+#ifndef GD_CHIOTTE
|
|
|
30 |
+#define MSG_NOSIGNAL 0
|
|
|
31 |
+#else
|
|
|
32 |
#define MSG_NOSIGNAL SO_NOSIGPIPE
|
|
|
33 |
#endif
|
|
|
34 |
+#endif
|
|
|
35 |
#ifndef ENONET
|
|
|
36 |
/* always use these two together */
|
|
|
37 |
#define ENONET EHOSTDOWN
|
|
|
38 |
diff -bur crrcsim-0.9.9.orig/chardevice/serialchardevice.cpp crrcsim-0.9.9/chardevice/serialchardevice.cpp
|
|
|
39 |
--- crrcsim-0.9.9.orig/chardevice/serialchardevice.cpp Thu Feb 7 22:54:19 2008
|
|
|
40 |
+++ crrcsim-0.9.9/chardevice/serialchardevice.cpp Sun Oct 5 15:52:45 2008
|
|
|
41 |
@@ -45,6 +45,10 @@
|
|
|
42 |
#include <pinconstant.h> // for enabling rs485
|
|
|
43 |
#endif
|
|
|
44 |
|
|
|
45 |
+// for bzero
|
|
|
46 |
+#ifndef GD_CHIOTTE
|
|
|
47 |
+#include <strings.h>
|
|
|
48 |
+#endif
|
|
|
49 |
|
|
|
50 |
#ifdef WIN32
|
|
|
51 |
|
|
|
52 |
diff -bur crrcsim-0.9.9.orig/interface_parallel/parallel.cpp crrcsim-0.9.9/interface_parallel/parallel.cpp
|
|
|
53 |
--- crrcsim-0.9.9.orig/interface_parallel/parallel.cpp Tue Apr 29 22:00:35 2008
|
|
|
54 |
+++ crrcsim-0.9.9/interface_parallel/parallel.cpp Sun Oct 5 16:41:44 2008
|
|
|
55 |
@@ -14,7 +14,9 @@
|
|
|
56 |
# include <sys/io.h>
|
|
|
57 |
# else
|
|
|
58 |
# include <unistd.h>
|
|
|
59 |
-# include <asm/io.h>
|
|
|
60 |
+# define ioperm(a,b,c) -1
|
|
|
61 |
+# define inb(a) 0
|
|
|
62 |
+# define outb(a,b)
|
|
|
63 |
# endif
|
|
|
64 |
# endif
|
|
|
65 |
#endif // __APPLE__
|
|
|
66 |
diff -bur crrcsim-0.9.9.orig/interface_serial2/LoggerReader_ttyS.cpp crrcsim-0.9.9/interface_serial2/LoggerReader_ttyS.cpp
|
|
|
67 |
--- crrcsim-0.9.9.orig/interface_serial2/LoggerReader_ttyS.cpp Sun Jan 9 18:07:44 2005
|
|
|
68 |
+++ crrcsim-0.9.9/interface_serial2/LoggerReader_ttyS.cpp Sun Oct 5 15:41:14 2008
|
|
|
69 |
@@ -185,7 +185,12 @@
|
|
|
70 |
tattr.c_cc[VTIME] = 0;
|
|
|
71 |
cfsetospeed(&tattr, speed); // BAUD-rate einstellen
|
|
|
72 |
cfsetispeed(&tattr, speed); // BAUD-rate einstellen
|
|
|
73 |
+
|
|
|
74 |
+// Ca existe pas sous Solaris GD 20081005
|
|
|
75 |
+#ifdef GD_CHIOTTE
|
|
|
76 |
cfmakeraw(&tattr); // damit man Zugriff auf die "rohen" Daten bekommt
|
|
|
77 |
+#endif
|
|
|
78 |
+
|
|
|
79 |
/* tattr.c_cflag |= PARENB; // enable parity generation on output and parity
|
|
|
80 |
// checking for input. cfmakeraw stellt das aus!
|
|
|
81 |
*/
|