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

Comparing ray/src/rt/devcomm.c (file contents):
Revision 1.16 by greg, Mon Mar 12 11:08:44 1990 UTC vs.
Revision 2.1 by greg, Tue Nov 12 17:09:13 1991 UTC

# Line 28 | Line 28 | static char SCCSid[] = "$SunId$ LBL";
28   #define vfork           fork
29   #endif
30  
31 – extern char     *getpath(), *getenv();
32 –
31   static int      comm_close(), comm_clear(), comm_paintr(), comm_errout(),
32                  comm_getcur(), comm_comout(), comm_comin(), comm_flush();
33  
# Line 51 | Line 49 | char   *dname, *id;
49          int     p1[2], p2[2];
50          char    pin[16], pout[16];
51                                                  /* find driver program */
52 <        if ((devname = getpath(dname, DEVPATH, 1)) == NULL) {
52 >        if ((devname = getpath(dname, DEVPATH, X_OK)) == NULL) {
53                  stderr_v(dname);
54                  stderr_v(": not found\n");
55                  return(NULL);
# Line 82 | Line 80 | char   *dname, *id;
80          if (getw(devin) != COM_RECVM)
81                  return(NULL);
82                                                  /* get driver parameters */
83 <        comm_flush();
83 >        getstate();
84                                                  /* set error vectors */
85          cmdvec = comm_comout;
86          if (wrnvec != NULL)
# Line 141 | Line 139 | comm_flush()                           /* flush output to driver */
139          fflush(devout);
140          if (getc(devin) != COM_FLUSH)
141                  reply_error("flush");
142 <        fread((char *)&comm_driver.pixaspect,
145 <                        sizeof(comm_driver.pixaspect), 1, devin);
146 <        comm_driver.xsiz = getw(devin);
147 <        comm_driver.ysiz = getw(devin);
148 <        comm_driver.inpready = getw(devin);
142 >        getstate();
143   }
144  
145  
# Line 172 | Line 166 | char   *str;
166   {
167          putc(COM_COMOUT, devout);
168          myputs(str, devout);
169 +        if (str[strlen(str)-1] == '\n')
170 +                fflush(devout);
171   }
172  
173  
# Line 191 | 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 236 | 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 (old)
> Changed lines (new)