From f12313f310db53a9d85df09acb0ca045849d2205 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Tue, 12 Sep 2006 20:03:54 -0700
Subject: [PATCH] Remove VESA demo and function used only by it

---
 com32/lib/sys/vesa/drawtxt.c | 21 ---------------------
 com32/samples/Makefile       |  2 +-
 com32/samples/vesa.c         | 31 -------------------------------
 3 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 com32/samples/vesa.c

diff --git a/com32/lib/sys/vesa/drawtxt.c b/com32/lib/sys/vesa/drawtxt.c
index 5a42457..ddb1720 100644
--- a/com32/lib/sys/vesa/drawtxt.c
+++ b/com32/lib/sys/vesa/drawtxt.c
@@ -256,27 +256,6 @@ void __vesacon_scroll_up(int nrows, uint8_t attr, int rev)
   vesacon_touch(0, 0, __vesacon_text_rows, TEXT_PIXEL_COLS/FONT_WIDTH);
 }
 
-/* Draw text at a specific area of the screen */
-void __vesacon_write_at(int x, int y, const char *str,
-			uint8_t attr, int rev)
-{
-  int n = 0;
-  struct vesa_char *ptr = &__vesacon_text_display
-    [(y+1)*(TEXT_PIXEL_COLS/FONT_WIDTH+2)+(x+1)];
-
-  while (*str) {
-    ptr->ch   = *str;
-    ptr->attr = attr;
-    ptr->sha  = rev;
-
-    n++;
-    str++;
-    ptr++;
-  }
-
-  vesacon_touch(y, x, 1, n);
-}
-
 /* Draw one character text at a specific area of the screen */
 void __vesacon_write_char(int x, int y, uint8_t ch, uint8_t attr, int rev)
 {
diff --git a/com32/samples/Makefile b/com32/samples/Makefile
index b07667c..214c0c7 100644
--- a/com32/samples/Makefile
+++ b/com32/samples/Makefile
@@ -38,7 +38,7 @@ LNXLIBS	   = ../libutil/libutil_lnx.a
 
 .SUFFIXES: .lss .c .o .elf .c32 .lnx
 
-all: 	hello.c32 cat.c32 resolv.c32 vesa.c32 \
+all: 	hello.c32 cat.c32 resolv.c32 \
 	fancyhello.c32 fancyhello.lnx \
 	keytest.c32 keytest.lnx \
 
diff --git a/com32/samples/vesa.c b/com32/samples/vesa.c
deleted file mode 100644
index 159a55d..0000000
--- a/com32/samples/vesa.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-#include <inttypes.h>
-#include "../lib/sys/vesa/video.h"
-
-int __vesacon_init(void);
-void vesacon_write_at(int row, int col, const char *str, uint8_t attr, int rev);
-
-int main(void)
-{
-  int row, col;
-  int attr;
-  char attr_buf[16];
-
-  __vesacon_init();
-  vesacon_load_background("stacy.png");
-
-  row = col = 0;
-  
-  for (attr = 0; attr < 256; attr++) {
-    snprintf(attr_buf, sizeof attr_buf, " [%02X] ", attr);
-    __vesacon_write_at(row, col, attr_buf, attr, attr & 3);
-    row++;
-    if (row >= 29) {
-      row = 0;
-      col += 8;
-    }
-  }  
-
-  while (1)
-    asm volatile("hlt");
-}
-- 
2.7.4