*** empty log message ***

diff --git a/apps/mainloop.c b/apps/mainloop.c
index ad2812e6cd7db5cf38e30f8e49726dbee977fa83..e674b2e06dd61237ba87adcbbe7b8dbc74ffdfeb 100644 (file)
--- a/apps/mainloop.c
+++ b/apps/mainloop.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.10  2008/02/23 13:05:57  staffcvs
+ * *** empty log message ***
+ *
  * Revision 1.9  2008/02/23 11:48:51  james
  * *** empty log message ***
  *
@@ -316,7 +319,7 @@ check_status (Context * c, Clients * cs)
         }
       else if (c->tp->guessed_baud > 0)
         {
-          ptr += sprintf (ptr, " try %d", status.baud / c->tp->guessed_baud);
+          ptr += sprintf (ptr, " try %db", c->tp->guessed_baud);
         }
     }
 

diff --git a/src/prototypes.h b/src/prototypes.h
index ba847e4d463d18c3af4262768acf6f4ef2ed2248..9c5eec4ec59649b3d918af54b7364d08c00c96e1 100644 (file)
--- a/src/prototypes.h
+++ b/src/prototypes.h
@@ -1,162 +1,162 @@
 /* ansi.c */
-extern int ansi_dispatch (ANSI * a, Context * c);
-extern ANSI *ansi_new_from_terminal (TTY * t);
+extern int ansi_dispatch(ANSI *a, Context *c);
+extern ANSI *ansi_new_from_terminal(TTY *t);
 /* crt.c */
-extern void crt_erase (CRT * c, CRT_Pos s, CRT_Pos e, int ea, int color);
-extern void crt_cls (CRT * c);
-extern void crt_scroll_up (CRT * c, CRT_Pos s, CRT_Pos e, int ea, int color);
-extern void crt_scroll_down (CRT * c, CRT_Pos s, CRT_Pos e, int ea,
-                             int color);
-extern void crt_reset (CRT * c);
-extern void crt_insert (CRT * c, CRT_CA ca);
+extern void crt_erase(CRT *c, CRT_Pos s, CRT_Pos e, int ea, int color);
+extern void crt_cls(CRT *c);
+extern void crt_scroll_up(CRT *c, CRT_Pos s, CRT_Pos e, int ea, int color);
+extern void crt_scroll_down(CRT *c, CRT_Pos s, CRT_Pos e, int ea, int color);
+extern void crt_reset(CRT *c);
+extern void crt_insert(CRT *c, CRT_CA ca);
 /* html.c */
-extern ANSI *ansi_new_html (FILE * f);
+extern ANSI *ansi_new_html(FILE *f);
 /* libsympathy.c */
 /* render.c */
 /* version.c */
 /* vt102.c */
-extern void vt102_log_line (Context * c, int line);
-extern void vt102_history (Context * c, CRT_Pos t, CRT_Pos b);
-extern void vt102_clip_cursor (VT102 * v, CRT_Pos tl, CRT_Pos br);
-extern void vt102_cursor_normalize (VT102 * v);
-extern void vt102_cursor_carriage_return (VT102 * v);
-extern void vt102_cursor_advance_line (Context * c);
-extern void vt102_do_pending_wrap (Context * c);
-extern void vt102_cursor_advance (Context * c);
-extern void vt102_cursor_retard (VT102 * v);
-extern void vt102_reset_tabs (VT102 * v);
-extern void vt102_cursor_advance_tab (VT102 * v);
-extern void vt102_cursor_retard_tab (VT102 * v);
-extern int vt102_cursor_home (VT102 * v);
-extern int vt102_cursor_absolute (VT102 * v, int x, int y);
-extern int vt102_cursor_relative (VT102 * v, int x, int y);
-extern void vt102_delete_from_line (VT102 * v, CRT_Pos p);
-extern void vt102_insert_into_line (VT102 * v, CRT_Pos p);
-extern void vt102_change_mode (VT102 * v, int private, char *ns, int set);
-extern void vt102_parse_mode_string (VT102 * v, char *buf, int len);
-extern void vt102_change_attr (VT102 * v, char *na);
-extern void vt102_parse_attr_string (VT102 * v, char *buf, int len);
-extern void vt102_save_state (VT102 * v);
-extern void vt102_restore_state (VT102 * v);
-extern void vt102_regular_char (Context * c, VT102 * v, char ch);
-extern void vt102_scs (Context * c, int g, int s);
-extern void vt102_parse_esc (Context * c, int ch);
-extern void vt102_parse_csi (Context * c, char *buf, int len);
-extern void vt102_status_line (VT102 * v, char *str);
-extern void vt102_parser_reset (VT102_parser * p);
-extern void vt102_reset_state (VT102 * v);
-extern void vt102_parse_char (Context * c, int ch);
-extern void vt102_send (Context * c, uint8_t key);
-extern void vt102_reset (VT102 * v);
-extern VT102 *vt102_new (void);
-extern void vt102_set_ansi (VT102 * v, int ansi);
-extern void vt102_free (VT102 * v);
+extern void vt102_log_line(Context *c, int line);
+extern void vt102_history(Context *c, CRT_Pos t, CRT_Pos b);
+extern void vt102_clip_cursor(VT102 *v, CRT_Pos tl, CRT_Pos br);
+extern void vt102_cursor_normalize(VT102 *v);
+extern void vt102_cursor_carriage_return(VT102 *v);
+extern void vt102_cursor_advance_line(Context *c);
+extern void vt102_do_pending_wrap(Context *c);
+extern void vt102_cursor_advance(Context *c);
+extern void vt102_cursor_retard(VT102 *v);
+extern void vt102_reset_tabs(VT102 *v);
+extern void vt102_cursor_advance_tab(VT102 *v);
+extern void vt102_cursor_retard_tab(VT102 *v);
+extern int vt102_cursor_home(VT102 *v);
+extern int vt102_cursor_absolute(VT102 *v, int x, int y);
+extern int vt102_cursor_relative(VT102 *v, int x, int y);
+extern void vt102_delete_from_line(VT102 *v, CRT_Pos p);
+extern void vt102_insert_into_line(VT102 *v, CRT_Pos p);
+extern void vt102_change_mode(VT102 *v, int private, char *ns, int set);
+extern void vt102_parse_mode_string(VT102 *v, char *buf, int len);
+extern void vt102_change_attr(VT102 *v, char *na);
+extern void vt102_parse_attr_string(VT102 *v, char *buf, int len);
+extern void vt102_save_state(VT102 *v);
+extern void vt102_restore_state(VT102 *v);
+extern void vt102_regular_char(Context *c, VT102 *v, char ch);
+extern void vt102_scs(Context *c, int g, int s);
+extern void vt102_parse_esc(Context *c, int ch);
+extern void vt102_parse_csi(Context *c, char *buf, int len);
+extern void vt102_status_line(VT102 *v, char *str);
+extern void vt102_parser_reset(VT102_parser *p);
+extern void vt102_reset_state(VT102 *v);
+extern void vt102_parse_char(Context *c, int ch);
+extern void vt102_send(Context *c, uint8_t key);
+extern void vt102_reset(VT102 *v);
+extern VT102 *vt102_new(void);
+extern void vt102_set_ansi(VT102 *v, int ansi);
+extern void vt102_free(VT102 *v);
 /* tty.c */
-extern void tty_pre_select (TTY * t, fd_set * rfds, fd_set * wfds);
-extern int tty_get_status (TTY * t, TTY_Status * s);
-extern void tty_set_baud (TTY * t, int rate);
-extern void tty_send_break (TTY * t);
-extern void tty_set_flow (TTY * t, int flow);
-extern void tty_hangup (TTY * t);
-extern void tty_parse_reset (Context * c);
-extern void analyse (Context * c);
-extern TTY_Parser *tty_parser_new (void);
-extern void tty_parse (Context * c, uint8_t * buf, int len);
+extern void tty_pre_select(TTY *t, fd_set *rfds, fd_set *wfds);
+extern int tty_get_status(TTY *t, TTY_Status *s);
+extern int tty_get_baud(TTY *t);
+extern void tty_set_baud(TTY *t, int rate);
+extern void tty_send_break(TTY *t);
+extern void tty_set_flow(TTY *t, int flow);
+extern void tty_hangup(TTY *t);
+extern void tty_parse_reset(Context *c);
+extern void tty_analyse(Context *c);
+extern TTY_Parser *tty_parser_new(void);
+extern void tty_parse(Context *c, uint8_t *buf, int len);
 /* keydis.c */
-extern KeyDis *keydis_vt102_new (void);
-extern KeyDis *keydis_ipc_new (Socket * s);
-extern int keydis_key (KeyDis * t, Context * c, int key);
+extern KeyDis *keydis_vt102_new(void);
+extern KeyDis *keydis_ipc_new(Socket *s);
+extern int keydis_key(KeyDis *t, Context *c, int key);
 /* history.c */
-extern History *history_new (int n);
-extern void history_free (History * h);
-extern void history_add (History * h, CRT_CA * c);
+extern History *history_new(int n);
+extern void history_free(History *h);
+extern void history_add(History *h, CRT_CA *c);
 /* ring.c */
-extern int ring_read (Ring * r, void *b, int n);
-extern int ring_write (Ring * r, void *b, int n);
-extern int ring_space (Ring * r);
-extern int ring_bytes (Ring * r);
-extern Ring *ring_new (int n);
+extern int ring_read(Ring *r, void *b, int n);
+extern int ring_write(Ring *r, void *b, int n);
+extern int ring_space(Ring *r);
+extern int ring_bytes(Ring *r);
+extern Ring *ring_new(int n);
 /* ptty.c */
-extern TTY *ptty_open (char *path, char *argv[]);
+extern TTY *ptty_open(char *path, char *argv[]);
 /* terminal.c */
 extern int terminal_winches;
-extern void terminal_atexit (void);
-extern void terminal_getsize (TTY * _t);
-extern void terminal_dispatch (void);
-extern void terminal_register_handlers (void);
-extern TTY *terminal_open (int rfd, int wfd);
+extern void terminal_atexit(void);
+extern void terminal_getsize(TTY *_t);
+extern void terminal_dispatch(void);
+extern void terminal_register_handlers(void);
+extern TTY *terminal_open(int rfd, int wfd);
 /* util.c */
-extern int wrap_read (int fd, void *buf, int len);
-extern int wrap_write (int fd, void *buf, int len);
-extern void set_nonblocking (int fd);
-extern void set_blocking (int fd);
-extern void raw_termios (struct termios *termios);
-extern void default_termios (struct termios *termios);
+extern int wrap_read(int fd, void *buf, int len);
+extern int wrap_write(int fd, void *buf, int len);
+extern void set_nonblocking(int fd);
+extern void set_blocking(int fd);
+extern void raw_termios(struct termios *termios);
+extern void default_termios(struct termios *termios);
 /* log.c */
-extern Log *file_log_new (char *fn);
-extern void log_f (Log * log, char *fmt, ...);
+extern Log *file_log_new(char *fn);
+extern void log_f(Log *log, char *fmt, ...);
 /* ipc.c */
-extern IPC_Msg *ipc_check_for_message_in_slide (Slide * s);
-extern void ipc_consume_message_in_slide (Slide * s);
-extern int ipc_msg_send (Socket * s, IPC_Msg * m);
-extern int ipc_msg_send_debug (Socket * s, char *msg);
-extern int ipc_msg_send_history (Socket * s, History_ent * l);
-extern int ipc_msg_send_vt102 (Socket * s, VT102 * v);
-extern int ipc_msg_send_key (Socket * s, int key);
-extern int ipc_msg_send_term (Socket * s, void *buf, int len);
-extern int ipc_msg_send_status (Socket * s, char *buf);
-extern int ipc_msg_send_setbaud (Socket * s, int baud);
-extern int ipc_msg_send_sendbreak (Socket * s);
-extern int ipc_msg_send_setflow (Socket * s, int flow);
-extern int ipc_msg_send_setansi (Socket * s, int ansi);
-extern int ipc_msg_send_hangup (Socket * s);
+extern IPC_Msg *ipc_check_for_message_in_slide(Slide *s);
+extern void ipc_consume_message_in_slide(Slide *s);
+extern int ipc_msg_send(Socket *s, IPC_Msg *m);
+extern int ipc_msg_send_debug(Socket *s, char *msg);
+extern int ipc_msg_send_history(Socket *s, History_ent *l);
+extern int ipc_msg_send_vt102(Socket *s, VT102 *v);
+extern int ipc_msg_send_key(Socket *s, int key);
+extern int ipc_msg_send_term(Socket *s, void *buf, int len);
+extern int ipc_msg_send_status(Socket *s, char *buf);
+extern int ipc_msg_send_setbaud(Socket *s, int baud);
+extern int ipc_msg_send_sendbreak(Socket *s);
+extern int ipc_msg_send_setflow(Socket *s, int flow);
+extern int ipc_msg_send_setansi(Socket *s, int ansi);
+extern int ipc_msg_send_hangup(Socket *s);
 /* slide.c */
-extern void slide_free (Slide * s);
-extern void slide_consume (Slide * s, int n);
-extern void slide_added (Slide * s, int n);
-extern Slide *slide_new (int n);
-extern void slide_expand (Slide * s, int n);
+extern void slide_free(Slide *s);
+extern void slide_consume(Slide *s, int n);
+extern void slide_added(Slide *s, int n);
+extern Slide *slide_new(int n);
+extern void slide_expand(Slide *s, int n);
 /* symsocket.c */
-extern int wrap_recv (int fd, void *buf, int len);
-extern int wrap_send (int fd, void *buf, int len);
-extern void socket_free (Socket * s);
-extern void socket_free_parent (Socket * s);
-extern Socket *socket_listen (char *path);
-extern Socket *socket_accept (Socket * l);
-extern Socket *socket_connect (char *path);
-extern void socket_consume_msg (Socket * s);
-extern void socket_pre_select (Socket * s, fd_set * rfds, fd_set * wfds);
-extern int socket_post_select (Socket * s, fd_set * rfds, fd_set * wfds);
-extern int socket_write (Socket * s, void *buf, int len);
+extern int wrap_recv(int fd, void *buf, int len);
+extern int wrap_send(int fd, void *buf, int len);
+extern void socket_free(Socket *s);
+extern void socket_free_parent(Socket *s);
+extern Socket *socket_listen(char *path);
+extern Socket *socket_accept(Socket *l);
+extern Socket *socket_connect(char *path);
+extern void socket_consume_msg(Socket *s);
+extern void socket_pre_select(Socket *s, fd_set *rfds, fd_set *wfds);
+extern int socket_post_select(Socket *s, fd_set *rfds, fd_set *wfds);
+extern int socket_write(Socket *s, void *buf, int len);
 /* serial.c */
-extern TTY *serial_open (char *path, int lock_mode);
+extern TTY *serial_open(char *path, int lock_mode);
 /* cmd.c */
-extern void cmd_parse (Cmd * c, Context * ctx, char *buf);
-extern void cmd_show_status (Cmd * c, Context * ctx);
-extern int cmd_key (Cmd * c, Context * ctx, int key);
-extern int cmd_activate (Cmd * c, Context * ctx);
-extern void cmd_new_status (Cmd * c, Context * ctx, char *msg);
-extern Cmd *cmd_new (void);
+extern void cmd_parse(Cmd *c, Context *ctx, char *buf);
+extern void cmd_show_status(Cmd *c, Context *ctx);
+extern int cmd_key(Cmd *c, Context *ctx, int key);
+extern int cmd_activate(Cmd *c, Context *ctx);
+extern void cmd_new_status(Cmd *c, Context *ctx, char *msg);
+extern Cmd *cmd_new(void);
 /* lockfile.c */
-extern Filelist *filelist_new (void);
-extern void filelist_remove (Filelist * fl, Filelist_ent * fle);
-extern void filelist_add (Filelist * fl, char *fn);
-extern void filelist_free (Filelist * fl);
-extern void filelist_print (Filelist * fl, FILE * f);
-extern int lockfile_make (char *name);
-extern void lockfile_add_places (Filelist * fl, char *leaf);
-extern void lockfile_regularize_and_add (Filelist * fl, char *leaf);
-extern void lockfile_add_name_from_path (Filelist * fl, char *file);
-extern void lockfile_add_name_from_dev (Filelist * fl, dev_t dev);
-extern void lockfile_check_dir_for_dev (Filelist * fl, char *dir, dev_t dev);
-extern Filelist *lockfile_make_list (char *device);
-extern void lockfile_remove_stale (Filelist * fl);
-extern Filelist *lockfile_lock (Filelist * fl);
-extern void lockfile_unlock (Filelist * fl);
-extern int serial_lock_check (Serial_lock * l);
-extern void serial_lock_free (Serial_lock * l);
-extern Serial_lock *serial_lock_new (char *dev, int mode);
+extern Filelist *filelist_new(void);
+extern void filelist_remove(Filelist *fl, Filelist_ent *fle);
+extern void filelist_add(Filelist *fl, char *fn);
+extern void filelist_free(Filelist *fl);
+extern void filelist_print(Filelist *fl, FILE *f);
+extern int lockfile_make(char *name);
+extern void lockfile_add_places(Filelist *fl, char *leaf);
+extern void lockfile_regularize_and_add(Filelist *fl, char *leaf);
+extern void lockfile_add_name_from_path(Filelist *fl, char *file);
+extern void lockfile_add_name_from_dev(Filelist *fl, dev_t dev);
+extern void lockfile_check_dir_for_dev(Filelist *fl, char *dir, dev_t dev);
+extern Filelist *lockfile_make_list(char *device);
+extern void lockfile_remove_stale(Filelist *fl);
+extern Filelist *lockfile_lock(Filelist *fl);
+extern void lockfile_unlock(Filelist *fl);
+extern int serial_lock_check(Serial_lock *l);
+extern void serial_lock_free(Serial_lock *l);
+extern Serial_lock *serial_lock_new(char *dev, int mode);
 /* utf8.c */
-extern void utf8_flush (Context * c);
-extern void utf8_parse (Context * c, int ch);
-extern UTF8 *utf8_new (void);
+extern void utf8_flush(Context *c);
+extern void utf8_parse(Context *c, int ch);
+extern UTF8 *utf8_new(void);

diff --git a/src/ptty.c b/src/ptty.c
index b0b247a0f70a8c169da1715fc6705df7c904da4f..e2688259a51b591ff692073d15232b97ef96abea 100644 (file)
--- a/src/ptty.c
+++ b/src/ptty.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.9  2008/02/23 13:05:58  staffcvs
+ * *** empty log message ***
+ *
  * Revision 1.8  2008/02/23 11:48:37  james
  * *** empty log message ***
  *
@@ -134,12 +137,14 @@ ptty_open (char *path, char *argv[])
   pid_t child;
   char name[1024];
   struct winsize winsize = { 0 };
-  struct termios termios;
+  struct termios termios = { 0 };
   int fd;
   char *default_argv[] = { "-", (char *) 0 };
 
 
   default_termios (&termios);
+  cfsetispeed (&termios, B9600);
+  cfsetospeed (&termios, B9600);
 
   winsize.ws_row = VT102_ROWS;
   winsize.ws_col = VT102_COLS;

diff --git a/src/serial.c b/src/serial.c
index bd4450cfa92738e7fc0c0e30e67124179aa647a6..378457365296fa7bfe2f0cae2662269ffe92a96c 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.8  2008/02/23 13:05:58  staffcvs
+ * *** empty log message ***
+ *
  * Revision 1.7  2008/02/15 23:52:12  james
  * *** empty log message ***
  *
@@ -163,12 +166,25 @@ serial_open (char *path, int lock_mode)
   if (!l)
     return NULL;
 
-  default_termios (&termios);
 
   fd = open (path, O_RDWR | O_NOCTTY | O_NONBLOCK);
 
   set_nonblocking (fd);
 
+
+  if (tcgetattr (fd, &termios))
+    {
+      close (fd);
+      return NULL;
+    }
+  default_termios (&termios);
+
+  if (tcsetattr (fd, TCSANOW, &termios))
+    {
+      close (fd);
+      return NULL;
+    }
+
   t = (Serial *) malloc (sizeof (Serial));
 
   t->lock = l;

diff --git a/src/tty.c b/src/tty.c
index 3b8f731b61e079e9ff4fef09f29d582ced9768c7..3171c6c74620f0e3804df57299eaca498ac10d57 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.14  2008/02/23 13:05:58  staffcvs
+ * *** empty log message ***
+ *
  * Revision 1.13  2008/02/23 11:48:37  james
  * *** empty log message ***
  *
@@ -258,6 +261,18 @@ tty_get_status (TTY * t, TTY_Status * s)
   return 0;
 }
 
+int
+tty_get_baud (TTY * t)
+{
+  struct termios tios = { 0 };
+
+  if (tcgetattr (t->rfd, &tios))
+    return;
+
+  return speed_t_to_baud (cfgetispeed (&tios));
+}
+
+
 void
 tty_set_baud (TTY * t, int rate)
 {
@@ -348,10 +363,22 @@ typedef struct
        while (0)
 
 static void
-tty_bit_analyse (TTY_Parser * p, int err, int ch)
+tty_bit_analyse (Context * c, int err, int ch)
 {
-  int c = 128;
+  int d;
   int zc = 0, oc = 0;
+  TTY_Parser *p = c->tp;
+
+
+  bit (p, 0, zc, oc);
+
+  for (d = 1; d < 0x100; d <<= 1)
+    {
+      bit (p, ch & d, zc, oc);
+    }
+  bit (p, 1, zc, oc);
+
+
 
   if (err)
     {
@@ -359,14 +386,18 @@ tty_bit_analyse (TTY_Parser * p, int err, int ch)
       gettimeofday (&p->lasterr, NULL);
     }
 
-  bit (p, 0, zc, oc);
-
-  while (c)
+  if (p->biterrs)
     {
-      bit (p, ch & c, zc, oc);
-      c >>= 1;
+      log_f (c->l,
+             "<tty_bit_analyse: 0%d%d%d%d%d%d%d%d1  [%d,%d,%d,%d,%d,%d,%d,%d,%d,%d]>",
+             ch & 0x01 ? 1 : 0, ch & 0x02 ? 1 : 0, ch & 0x04 ? 1 : 0,
+             ch & 0x08 ? 1 : 0, ch & 0x10 ? 1 : 0, ch & 0x20 ? 1 : 0,
+             ch & 0x40 ? 1 : 0, ch & 0x80 ? 1 : 0, p->bitfreq[0],
+             p->bitfreq[1], p->bitfreq[2], p->bitfreq[3], p->bitfreq[4],
+             p->bitfreq[5], p->bitfreq[6], p->bitfreq[7], p->bitfreq[8],
+             p->bitfreq[9]);
     }
-  bit (p, 1, zc, oc);
+
 }
 
 void
@@ -379,11 +410,11 @@ tty_parse_reset (Context * c)
 }
 
 void
-analyse (Context * c)
+tty_analyse (Context * c)
 {
   TTY_Parser *p = c->tp;
   struct timeval now, dif;
-  int i;
+  int i, j, max;
 
   if (!p->biterrs)
     {
@@ -401,18 +432,48 @@ analyse (Context * c)
       return;
     }
 
-#define TTY_BITFREQ_LEN 10
 
-  for (i = 0; i < TTY_BITFREQ_LEN && (!p->bitfreq[i]); ++i);
+  max = -1;
+  j = 0;
+  for (i = 0; i < TTY_BITFREQ_LEN; ++i)
+    {
+      if (p->bitfreq[i] > max)
+        {
+          max = p->bitfreq[i];
+          j = i;
+        }
+    }
 
-  if (!i)
+  if (c->t)
+    i = tty_get_baud (c->t);
+  else
+    i = -1;
+
+  if (j == 1)
     {
       /*Closest bit edge is one bit, so the baud rate is too low */
       p->guessed_baud = -1;
 
     }
+  else
+    {
+      if (i > 0)
+        p->guessed_baud = i / j;
+      else
+        p->guessed_baud = 0;
+
+    }
 
-  p->guessed_baud = i;
+  if (p->guessed_baud == -1)
+    {
+      log_f (c->l, "<tty_analyse: %6d errors, current rate %db is too low>",
+             p->biterrs, i);
+    }
+  else
+    {
+      log_f (c->l, "<tty_analyse: %6d errors, current rate %db, suggest %db>",
+             p->biterrs, i, p->guessed_baud);
+    }
 
 }
 
@@ -444,7 +505,7 @@ tty_parse (Context * c, uint8_t * buf, int len)
           switch (*buf)
             {
             case DLE:
-              tty_bit_analyse (p, 0, *buf);
+              tty_bit_analyse (c, 0, *buf);
               utf8_parse (c, *buf);
               break;
             case 0:
@@ -458,13 +519,13 @@ tty_parse (Context * c, uint8_t * buf, int len)
       else if (p->in_errmark)
         {
           p->in_errmark = 0;
+
           log_f (c->l, "%s:%d tty reports error: \\377 \\000 \\%03o",
                  __FILE__, __LINE__, *buf);
 
+          tty_bit_analyse (c, 1, *buf);
 
-          tty_bit_analyse (p, 1, *buf);
-
-          analyse (c);
+          tty_analyse (c);
 
           utf8_parse (c, *buf);
 
@@ -478,9 +539,9 @@ tty_parse (Context * c, uint8_t * buf, int len)
         }
       else
         {
-          tty_bit_analyse (p, 0, *buf);
+          tty_bit_analyse (c, 0, *buf);
 
-          analyse (c);
+          tty_analyse (c);
 
           utf8_parse (c, *buf);
 

diff --git a/src/utf8.c b/src/utf8.c
index 9d04d19925e756f3dc409a2fff4a2cc0174675c9..52ba39896a67e1c1291e5392842e905cc54bd0b5 100644 (file)
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.4  2008/02/23 13:05:58  staffcvs
+ * *** empty log message ***
+ *
  * Revision 1.3  2008/02/23 11:48:37  james
  * *** empty log message ***
  *
@@ -33,21 +36,19 @@ utf8_flush (Context * c)
   switch (u->utf_ptr)
     {
     case 1:
-      log_f (c->l, "%s:%d invalid utf-8 sequence: \\%03o",
-             __FILE__, __LINE__, u->utf_buf[0]);
+      log_f (c->l, "<invalid utf-8 sequence: \\%03o>", u->utf_buf[0]);
       break;
     case 2:
-      log_f (c->l, "%s:%d invalid utf-8 sequence: \\%03o \\%03o",
-             __FILE__, __LINE__, u->utf_buf[0], u->utf_buf[1]);
+      log_f (c->l, "<invalid utf-8 sequence: \\%03o \\%03o>",
+             u->utf_buf[0], u->utf_buf[1]);
       break;
     case 3:
-      log_f (c->l, "%s:%d invalid utf-8 sequence: \\%03o \\%03o \\%03o",
-             __FILE__, __LINE__, u->utf_buf[0], u->utf_buf[1], u->utf_buf[2]);
+      log_f (c->l, "<invalid utf-8 sequence: \\%03o \\%03o \\%03o>",
+             u->utf_buf[0], u->utf_buf[1], u->utf_buf[2]);
       break;
     case 4:
       log_f (c->l,
-             "%s:%d invalid utf-8 sequence: \\%03o \\%03o \\%03o \\%03o",
-             __FILE__, __LINE__,
+             "<invalid utf-8 sequence: \\%03o \\%03o \\%03o \\%03o>",
              u->utf_buf[0], u->utf_buf[1], u->utf_buf[2], u->utf_buf[3]);
       break;
     }

diff --git a/src/util.c b/src/util.c
index 0a74869144b5cc2ae69dd15d22985dd0c1c990eb..ba1e30946584a627019b4166e4a0b1f4065fad6b 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.4  2008/02/23 13:05:58  staffcvs
+ * *** empty log message ***
+ *
  * Revision 1.3  2008/02/13 16:57:29  james
  * *** empty log message ***
  *
@@ -79,10 +82,13 @@ void
 raw_termios (struct termios *termios)
 {
 
-  termios->c_iflag = ICRNL | IXON;
-  termios->c_oflag = OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0;
-  termios->c_lflag =
+  termios->c_iflag = 0;
+/*ICRNL | IXON;*/
+  termios->c_oflag = NL0 | CR0 | TAB0 | BS0 | VT0 | FF0;
+  termios->c_lflag = 0;
+/*
     ISIG | ICANON | IEXTEN | ECHO | ECHOE | ECHOK | ECHOCTL | ECHOKE;
+*/
 
   termios->c_cc[VINTR] = 003;
   termios->c_cc[VQUIT] = 034;
@@ -105,12 +111,13 @@ void
 default_termios (struct termios *termios)
 {
 
-  memset (termios, 0, sizeof (termios));
+//  memset (termios, 0, sizeof (termios));
 
   raw_termios (termios);
 
   termios->c_cflag = CS8 | CREAD | CLOCAL;
+  termios->c_iflag |= PARMRK | INPCK;
 
-  cfsetispeed (termios, B9600);
-  cfsetospeed (termios, B9600);
+  //cfsetispeed (termios, B9600);
+  //cfsetospeed (termios, B9600);
 }