Serial port output with color table string injection.

diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index e7f4ad7..12d567a 100644 (file)
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -31,6 +31,9 @@ LIBOBJS = \
        sys/stdcon_read.o sys/stdcon_write.o sys/rawcon_read.o          \
        sys/rawcon_write.o sys/err_read.o sys/err_write.o               \
        sys/null_read.o sys/null_write.o sys/serial_write.o             \
+       \
+       sys/xserial_write.o                                             \
+       \
        sys/ansicon_write.o sys/ansiserial_write.o                      \
        \
        sys/vesacon_write.o sys/vesaserial_write.o                      \

diff --git a/com32/lib/sys/ansiserial_write.c b/com32/lib/sys/ansiserial_write.c
index 99301d5..bfb6ef2 100644 (file)
--- a/com32/lib/sys/ansiserial_write.c
+++ b/com32/lib/sys/ansiserial_write.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2004 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2004-2006 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
@@ -40,12 +40,12 @@
 extern int __ansicon_open(void);
 extern int __ansicon_close(struct file_info *);
 extern ssize_t __ansicon_write(struct file_info *, const void *, size_t);
-extern ssize_t __serial_write(struct file_info *, const void *, size_t);
+extern ssize_t __xserial_write(struct file_info *, const void *, size_t);
 
 static ssize_t __ansiserial_write(struct file_info *fp, const void *buf, size_t count)
 {
   __ansicon_write(fp, buf, count);
-  return __serial_write(fp, buf, count);
+  return __xserial_write(fp, buf, count);
 }
 
 const struct output_dev dev_ansiserial_w = {

diff --git a/com32/lib/sys/vesaserial_write.c b/com32/lib/sys/vesaserial_write.c
index da09a68..fa434c3 100644 (file)
--- a/com32/lib/sys/vesaserial_write.c
+++ b/com32/lib/sys/vesaserial_write.c
@@ -40,12 +40,12 @@
 extern int __vesacon_open(void);
 extern int __vesacon_close(struct file_info *);
 extern ssize_t __vesacon_write(struct file_info *, const void *, size_t);
-extern ssize_t __serial_write(struct file_info *, const void *, size_t);
+extern ssize_t __xserial_write(struct file_info *, const void *, size_t);
 
 static ssize_t __vesaserial_write(struct file_info *fp, const void *buf, size_t count)
 {
   __vesacon_write(fp, buf, count);
-  return __serial_write(fp, buf, count);
+  return __xserial_write(fp, buf, count);
 }
 
 const struct output_dev dev_vesaserial_w = {

diff --git a/com32/lib/sys/xserial_write.c b/com32/lib/sys/xserial_write.c
new file mode 100644 (file)
index 0000000..acac99d
--- /dev/null
+++ b/com32/lib/sys/xserial_write.c
@@ -0,0 +1,119 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2004-2006 H. Peter Anvin - All Rights Reserved
+ *
+ *   Permission is hereby granted, free of charge, to any person
+ *   obtaining a copy of this software and associated documentation
+ *   files (the "Software"), to deal in the Software without
+ *   restriction, including without limitation the rights to use,
+ *   copy, modify, merge, publish, distribute, sublicense, and/or
+ *   sell copies of the Software, and to permit persons to whom
+ *   the Software is furnished to do so, subject to the following
+ *   conditions:
+ *
+ *   The above copyright notice and this permission notice shall
+ *   be included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * ----------------------------------------------------------------------- */
+
+/*
+ * xserial_write.c
+ *
+ * Raw writing to the serial port; no \n -> \r\n translation, but
+ * convert \1# sequences.
+ */
+
+#include <errno.h>
+#include <string.h>
+#include <com32.h>
+#include <minmax.h>
+#include <colortbl.h>
+#include "file.h"
+
+static void emit(char ch)
+{
+  static com32sys_t ireg;      /* Zeroed with the BSS */
+
+  ireg.eax.w[0] = 0x0400 | (unsigned char)ch;
+
+  __intcall(0x21, &ireg, NULL);
+}
+
+ssize_t __xserial_write(struct file_info *fp, const void *buf, size_t count)
+{
+  const char *bufp = buf;
+  size_t n = 0;
+  static enum { st_0, st_1, st_2, st_3 } state = st_0;
+  static int ncolor = 0;
+  int num;
+
+  (void)fp;
+
+  while ( count-- ) {
+    unsigned char ch = *bufp++;
+
+    switch (state) {
+    case st_0:
+      if (ch == '\1') {
+       state = st_1;
+      } else {
+       state = st_0;
+       emit(ch);
+      }
+      break;
+
+    case st_1:
+      if (ch == '#') {
+       state = st_2;
+       ncolor = 0;
+      } else {
+       state = st_0;
+       emit(ch);
+      }
+      break;
+
+    case st_2:
+      num = ch-'0';
+      if (num < 10) {
+       ncolor = num*10;
+       state = st_3;
+      } else {
+       state = st_0;
+       emit(ch);
+      }
+      break;
+
+    case st_3:
+      num = ch-'0';
+      if (num < 10) {
+       ncolor += num;
+
+       if (ncolor < console_color_table_size) {
+         emit('\033');
+         emit('[');
+         __xserial_write(fp, console_color_table[ncolor].ansi,
+                         strlen(console_color_table[ncolor].ansi));
+         emit('m');
+       }
+       state = st_0;
+      } else {
+       state = st_0;
+       emit(ch);
+      }
+      break;
+    }
+
+    n++;
+  }
+
+  return n;
+}