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

[ggilley at common-lisp.net]

Author: ggilley
Date: Mon Dec  3 21:50:42 2012
New Revision: 387

Log:
fix compilation on ubuntu

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

Modified: trunk/emulator/usim/Files.c
==============================================================================
--- trunk/emulator/usim/Files.c	Mon Dec  3 20:58:49 2012	(r386)
+++ trunk/emulator/usim/Files.c	Mon Dec  3 21:50:42 2012	(r387)
@@ -131,8 +131,8 @@
 #define LOG_ERR		1
 #define LOG_NOTICE      2
 
-int log_verbose = 0;
-int log_stderr_tofile = 0;
+int log_verbose = 1;
+int log_stderr_tofile = 1;
 
 static void
 log(int level, char *fmt, ...)
@@ -4909,14 +4909,27 @@
 {
     register struct xfer *x = (struct xfer *)ax;
     
-    myxfer = x;
     log(LOG_INFO, "startxfer: entering\n");
-    setjmp(closejmp);
     for (;;) {
        if (log_verbose) {
             log(LOG_INFO, "Switch pos: %ld, status: %ld\n",
                 tell(x->x_fd), x->x_state);
         }
+
+        while ((x->x_flags & X_CLOSE) == 0) {
+             if (x->x_work)
+             {
+                 struct transaction *t;
+                     
+                 t = x->x_work;
+                 x->x_work = t->t_next;
+                 log(LOG_INFO, "FILE: startxfer command: %s\n", t->t_command->c_name);
+                 (*t->t_command->c_func)(x, t);
+             }
+             else
+                 break;
+        }
+
         switch (dowork(x)) {
             case X_SYNCMARK:
                 syncmark(x->x_fh);	/* Ignore errors */

Modified: trunk/emulator/usim/Makefile
==============================================================================
--- trunk/emulator/usim/Makefile	Mon Dec  3 20:58:49 2012	(r386)
+++ trunk/emulator/usim/Makefile	Mon Dec  3 21:50:42 2012	(r387)
@@ -86,7 +86,7 @@
 #CFLAGS= -O3 -march=pentium3 -mfpmath=sse -mmmx -msse $(DEFINES) -Walle
 #CFLAGS = -O3 -fomit-frame-pointer -mcpu=i686 -g $(DEFINES)
 #CFLAGS= -O3 -mfpmath=sse -mmmx -msse $(DEFINES) -Walle
-CFLAGS = -O3 -mfpmath=sse -mmmx -msse $(DEFINES) $(M32) -g
+CFLAGS = -mfpmath=sse -mmmx -msse $(DEFINES) $(M32) -g
 LFLAGS = $(M32) -ldl -L/usr/lib
 USIM_SRC += Files.c glob.c
 USIM_HDR += Files.h glob.h

Modified: trunk/emulator/usim/chaos.c
==============================================================================
--- trunk/emulator/usim/chaos.c	Mon Dec  3 20:58:49 2012	(r386)
+++ trunk/emulator/usim/chaos.c	Mon Dec  3 21:50:42 2012	(r387)
@@ -48,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