1 files changed, 22 insertions, 14 deletions
diff --git a/src/irc.h b/src/irc.h
index 0035444..7d8f735 100644
--- a/src/irc.h
+++ b/src/irc.h
@@ -1,32 +1,29 @@
-#define FNET_TRANSLATION 3
 #define MAX_IRC_MSG_LEN 512
-
-#define streq(x,y) !strcmp(x,y)
-#define streq_i(x,y) !strcasecmp(x,y)
+#include "rxtxbuf.h"
 
 /**** main.c */
-extern char *rx_buf;
-extern unsigned short rxbuflen;
+
+extern unsigned int rxbuflen;
+extern unsigned int txbuflen;
+
 extern unsigned char err;
 extern unsigned char trip;
-extern char hz;
 extern char reconnect_timeout;
 
-extern unsigned int txbuflen;
-extern char *tx_buf;
-
 /* clears the transmit buffer. */
 void txbuf_init(void);
 
+void txbuf_append_chr(char c);
+
 /* appends a string to the transmit buffer, updates txbuflen. */
 void txbuf_append_str(const char *str);
 void txbuf_append_str2(const char *s1, const char *s2);
-void txbuf_append_str3(const char *s1, const char *s2, const char *s3);
+// void txbuf_append_str3(const char *s1, const char *s2, const char *s3);
 
 /* clears the transmit buffer, then appends a string to it. */
 void txbuf_set_str(const char *str);
 
-/* as txbuf_set_str2(), but multiple strings. */
+/* as txbuf_set_str(), but multiple strings. */
 void txbuf_set_str2(const char *s1, const char *s2);
 void txbuf_set_str3(const char *s1, const char *s2, const char *s3);
 
@@ -44,13 +41,13 @@ void fn_disconnect(void);
 
 /**** irc.c */
 #define MAX_MSG_ARGS 8
-extern char bell_type;
 extern char numbuf[10];
 extern char *msg_src, *msg_cmd, *msg_dest, *msg_text;
 extern char *msg_args[MAX_MSG_ARGS];
-extern int msg_argcount;
+extern char msg_argcount;
 extern char irc_away;
 extern char bell_type;
+extern char start_latch;
 extern char last_pm_nick[33];
 extern char last_chan[33];
 
@@ -65,6 +62,8 @@ void print_errnum(void);
 
 void __fastcall__ bell(void); /* see src/bell.s */
 
+void start_keystroke(char c);
+
 /**** cmd.c */
 void cmd_command(char *cmd);
 void cmd_execute(void);
@@ -74,3 +73,12 @@ void cmd_send_pm(char *args);
 void cmd_ctcp_ping(char *nick);
 void cmd_server_ping(void);
 unsigned int read_rtclok(void); /* irc.c needs this one so it's not static */
+
+/* see isnum.s */
+extern char __fastcall__ isnum(char c);
+
+/* see a2uint.s */
+extern unsigned int __fastcall__ a2uint(char *str);
+
+/* nextarg.s */
+extern char *nextarg(char *arg);