ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/devcomm.c
(Generate patch)

Comparing ray/src/rt/devcomm.c (file contents):
Revision 1.13 by greg, Thu Feb 22 12:45:27 1990 UTC vs.
Revision 1.17 by greg, Wed Mar 21 09:46:55 1990 UTC

# Line 20 | Line 20 | static char SCCSid[] = "$SunId$ LBL";
20   #define DEVPATH         getenv("PATH")  /* device search path */
21   #endif
22  
23 + #ifndef DELAY
24 + #define DELAY           20              /* seconds to wait for response */
25 + #endif
26 +
27   #ifndef BSD
28   #define vfork           fork
29   #endif
30  
31   extern char     *getpath(), *getenv();
32  
33 < int     onsigio();
30 <
31 < int     comm_close(), comm_clear(), comm_paintr(), comm_errout(),
33 > static int      comm_close(), comm_clear(), comm_paintr(), comm_errout(),
34                  comm_getcur(), comm_comout(), comm_comin(), comm_flush();
35  
36   struct driver   comm_driver = {
# Line 74 | Line 76 | char   *dname, *id;
76                  goto syserr;
77          if ((devin = fdopen(p2[0], "r")) == NULL)
78                  goto syserr;
79 <                                                /* verify & get resolution */
79 >                                                /* verify initialization */
80          putw(COM_SENDM, devout);
81          fflush(devout);
82          if (getw(devin) != COM_RECVM)
83                  return(NULL);
84 <        fread((char *)&comm_driver.pixaspect,
85 <                        sizeof(comm_driver.pixaspect), 1, devin);
84 <        comm_driver.xsiz = getw(devin);
85 <        comm_driver.ysiz = getw(devin);
84 >                                                /* get driver parameters */
85 >        getstate();
86                                                  /* set error vectors */
87          cmdvec = comm_comout;
88          if (wrnvec != NULL)
# Line 141 | Line 141 | comm_flush()                           /* flush output to driver */
141          fflush(devout);
142          if (getc(devin) != COM_FLUSH)
143                  reply_error("flush");
144 <        comm_driver.inpready = getw(devin);
144 >        getstate();
145   }
146  
147  
# Line 168 | Line 168 | char   *str;
168   {
169          putc(COM_COMOUT, devout);
170          myputs(str, devout);
171 –        fflush(devout);
171   }
172  
173  
# Line 188 | Line 187 | char   *prompt;
187          if (getc(devin) != COM_COMIN)
188                  reply_error("comin");
189          mygets(buf, devin);
190 <        comm_driver.inpready = getw(devin);
190 >        getstate();
191   }
192  
193  
# Line 233 | Line 232 | char   *routine;
232          stderr_v(routine);
233          stderr_v(": driver reply error\n");
234          quit(1);
235 + }
236 +
237 +
238 + static
239 + getstate()                              /* get driver state variables */
240 + {
241 +        fread((char *)&comm_driver.pixaspect,
242 +                        sizeof(comm_driver.pixaspect), 1, devin);
243 +        comm_driver.xsiz = getw(devin);
244 +        comm_driver.ysiz = getw(devin);
245 +        comm_driver.inpready = getw(devin);
246   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines