[Mit-cadr-cvs] r356 - trunk/emulator/usim

[ggilley at common-lisp.net]

Author: ggilley
Date: Mon Nov 26 19:46:42 2012
New Revision: 356

Log:
ignore local chaos on non-osx

Modified:
   trunk/emulator/usim/Makefile
   trunk/emulator/usim/chaos.c
   trunk/emulator/usim/chaos.h

Modified: trunk/emulator/usim/Makefile
==============================================================================
--- trunk/emulator/usim/Makefile	Mon Nov 26 19:39:13 2012	(r355)
+++ trunk/emulator/usim/Makefile	Mon Nov 26 19:46:42 2012	(r356)
@@ -35,8 +35,8 @@
 
 #----------- code ------------
 
-USIM_SRC = main.c decode.c ucode.c disk.c iob.c chaos.c ether.c uart.c syms.c config.c Files.c glob.c
-USIM_HDR = ucode.h config.h Files.h glob.h
+USIM_SRC = main.c decode.c ucode.c disk.c iob.c chaos.c ether.c uart.c syms.c config.c 
+USIM_HDR = ucode.h config.h
 
 ifeq ($(DISPLAY), SDL)
 DISPLAY_SRC = sdl.c
@@ -61,6 +61,8 @@
 # Mac OSX
 ifeq ($(OS), OSX)
 LFLAGS = -m32 -framework Cocoa
+USIM_SRC += Files.c glob.c
+USIM_HDR += Files.h glob.h
 USIM_LIBS = -lSDLmain -lSDL -lpthread -lobjc
 CFLAGS = -O -m32 -I/usr/X11/include -DDISPLAY_X11 $(DEFINES)
 # good for G5

Modified: trunk/emulator/usim/chaos.c
==============================================================================
--- trunk/emulator/usim/chaos.c	Mon Nov 26 19:39:13 2012	(r355)
+++ trunk/emulator/usim/chaos.c	Mon Nov 26 19:46:42 2012	(r356)
@@ -36,7 +36,9 @@
 #include "endian.h"
 #include "chaos.h"
 
+#if defined(OSX)
 #define USE_LOCAL_CHAOS     1
+#endif
 
 #ifndef CHAOS_MY_ADDRESS
 # define CHAOS_MY_ADDRESS 0401
@@ -46,7 +48,7 @@
 # define CHAOS_DEBUG 0
 #endif
 
-#define CHAOS_DEBUG_PKT 0
+#define CHAOS_DEBUG_PKT 1
 //#define CHAOS_TOSS_IF_RXBUFF_FULL
 
 #define CHAOS_BUF_SIZE_BYTES 8192
@@ -1233,6 +1235,10 @@
 
 static struct sockaddr_un unix_addr;
 
+typedef struct chaos_packet chaos_packet;
+typedef struct chaos_connection chaos_connection;
+
+
 chaos_packet *
 chaos_allocate_packet(chaos_connection *conn, int opcode, int len)
 {

Modified: trunk/emulator/usim/chaos.h
==============================================================================
--- trunk/emulator/usim/chaos.h	Mon Nov 26 19:39:13 2012	(r355)
+++ trunk/emulator/usim/chaos.h	Mon Nov 26 19:46:42 2012	(r356)
@@ -4,7 +4,9 @@
  */
 
 #include <pthread.h>
+#if defined(OSX)
 #include <dispatch/dispatch.h>
+#endif
 
 void chaos_rx_pkt(void);
 void char_xmit_done_intr(void);