X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/826e2bd2a1aa8d425989ee3d38d5dd5a8040b9f8..c7eda62d83dd463895a3b096f8c32502077e7bcd:/video/text.c?ds=sidebyside

diff --git a/video/text.c b/video/text.c
index f6c9f52..4f26b8e 100644
--- a/video/text.c
+++ b/video/text.c
@@ -1,3 +1,13 @@
+/* text.c
+ * Text console checksum and rendering functions
+ * NetWatch system management mode administration console
+ *
+ * Copyright (c) 2008 Jacob Potter and Joshua Wise.  All rights reserved.
+ * This program is free software; you can redistribute and/or modify it under
+ * the terms found in the file LICENSE in the root of this source tree.
+ *
+ */
+
 #include <io.h>
 #include <text.h>
 #include <paging.h>
@@ -69,9 +79,9 @@ void text_render(char *buf, int x, int y, int w, int h)
 	unsigned int cx, cy;
 	unsigned char ch, at, font;
 	smram_state_t old_state = smram_save_state();
-	
+/*
 	outputf("text_render: (%d,%d),(%d,%d)", x, y, w, h);
-	
+*/	
 	smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
 	for (cy = y; cy < (y + h); cy++)
 	{
@@ -83,10 +93,10 @@ void text_render(char *buf, int x, int y, int w, int h)
 		font = _font[ch * 32 + cy % 16];
 		for (cx = x; cx < (x + w); cx++)
 		{
-			unsigned int pos = cx % 9;
+			unsigned int pos = cx % 8;
 			if (pos == 0)
 			{
-				textx = cx / 9;
+				textx = cx / 8;
 				ch = video[texty * 160 + textx * 2];
 				at = video[texty * 160 + textx * 2 + 1];
 				font = _font[ch * 32 + cy % 16];
@@ -113,7 +123,7 @@ void text_render(char *buf, int x, int y, int w, int h)
 uint32_t text_checksum(int x, int y, int w, int h)
 {
 	unsigned char *video = (unsigned char *)vga_base();
-	unsigned int textx = x / 9;
+	unsigned int textx = x / 8;
 	unsigned int texty = y / 16;
 	int cx, cy;
 	uint32_t cksm = 0;
@@ -125,8 +135,8 @@ uint32_t text_checksum(int x, int y, int w, int h)
 	{
 		cx = x;
 		texty = cy / 16;
-		textx = cx / 9;
-		cksm = crc32(video + texty * 160 + textx * 2, (w / 9) * 2 + 2, cksm);	/* Err on the side of 'too many'. */
+		textx = cx / 8;
+		cksm = crc32(video + texty * 160 + textx * 2, (w / 8) * 2 + 2, cksm);	/* Err on the side of 'too many'. */
 	}
 	
 	smram_restore_state(old_state);