Fix parameters for outputf in text.c.

[netwatch.git] / video / text.c

diff --git a/video/text.c b/video/text.c
index 962af0ca0afc65d7587e11f0970336cc4fd15b7f..172b84e002f536d02df4430794190e97ea76f4b5 100644 (file)
--- a/video/text.c
+++ b/video/text.c
@@ -5,36 +5,60 @@
 #include <stdint.h>
 #include <output.h>
 #include <smram.h>
 #include <stdint.h>
 #include <output.h>
 #include <smram.h>

+#include <crc32.h>
+#include <video_defines.h>

 
 static unsigned char _font[256 * 32];
 
 
 static unsigned char _font[256 * 32];
 

+/* XXX reunify this with vga-overlay? */
+#define VRAM_BASE              0xA0000UL
+#define TEXT_CONSOLE_OFFSET    0x18000UL 
+
+#define TEXT_CONSOLE_BASE      (VRAM_BASE + TEXT_CONSOLE_OFFSET)
+
+static unsigned char vga_read(unsigned char idx)
+{
+       outb(CRTC_IDX_REG, idx);
+       return inb(CRTC_DATA_REG);
+}
+
+static char * vga_base()
+{
+       return (char *) (
+               TEXT_CONSOLE_BASE
+               + (((unsigned int) vga_read(CRTC_START_ADDR_MSB_IDX)) << 9)
+               + (((unsigned int) vga_read(CRTC_START_ADDR_LSB_IDX)) << 1)
+       );
+}
+

 /* Must be called from a firstrun context, where we don't care about saving
  * 0x3CE state. */
 void text_init()
 {
        unsigned char oldread;
 /* Must be called from a firstrun context, where we don't care about saving
  * 0x3CE state. */
 void text_init()
 {
        unsigned char oldread;

+

        smram_state_t old_state = smram_save_state();
        smram_state_t old_state = smram_save_state();

-       outb(0x3CE, 0x05 /* Mode register */);
-       outb(0x3CF, inb(0x3CF) & ~(0x10 /* Odd/even */));

        outb(0x3CE, 0x04 /* Read register */);
        oldread = inb(0x3CF);
        outb(0x3CF, 0x02 /* Font plane */);
        outb(0x3CE, 0x04 /* Read register */);
        oldread = inb(0x3CF);
        outb(0x3CF, 0x02 /* Font plane */);

+

        smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
        memcpy(_font, p2v(0xB8000), sizeof(_font));
        smram_restore_state(old_state);
        smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
        memcpy(_font, p2v(0xB8000), sizeof(_font));
        smram_restore_state(old_state);

+

        outb(0x3CF, oldread);
 }
 
 void text_render(char *buf, int x, int y, int w, int h)
 {
        outb(0x3CF, oldread);
 }
 
 void text_render(char *buf, int x, int y, int w, int h)
 {

-       unsigned char *video = (unsigned char *)0xB8000;
+       unsigned char *video = (unsigned char *)vga_base();

        unsigned int textx = x / 9;
        unsigned int texty = y / 14;
        unsigned int cx, cy;
        unsigned char ch, at, font;
        smram_state_t old_state = smram_save_state();
        
        unsigned int textx = x / 9;
        unsigned int texty = y / 14;
        unsigned int cx, cy;
        unsigned char ch, at, font;
        smram_state_t old_state = smram_save_state();
        

-       outputf("text_render: buf %08x, (%d,%d),(%d,%d)", buf, x, y, w, h);
+       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++)
        
        smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
        for (cy = y; cy < (y + h); cy++)


@@ -42,8 +66,8 @@ void text_render(char *buf, int x, int y, int w, int h)
                cx = x;
                texty = cy / 14;
                textx = cx / 9;
                cx = x;
                texty = cy / 14;
                textx = cx / 9;

-               ch = video[texty * 50 + textx * 2];
-               at = video[texty * 50 + textx * 2 + 1];
+               ch = video[texty * 160 + textx * 2];
+               at = video[texty * 160 + textx * 2 + 1];

                font = _font[ch * 32 + cy % 14];
                for (cx = x; cx < (x + w); cx++)
                {
                font = _font[ch * 32 + cy % 14];
                for (cx = x; cx < (x + w); cx++)
                {


@@ -51,8 +75,8 @@ void text_render(char *buf, int x, int y, int w, int h)
                        if (pos == 0)
                        {
                                textx = cx / 9;
                        if (pos == 0)
                        {
                                textx = cx / 9;

-                               ch = video[texty * 50 + textx * 2];
-                               at = video[texty * 50 + textx * 2 + 1];
+                               ch = video[texty * 160 + textx * 2];
+                               at = video[texty * 160 + textx * 2 + 1];

                                font = _font[ch * 32 + cy % 14];
                        }
                        /* XXX always BGR888 */
                                font = _font[ch * 32 + cy % 14];
                        }
                        /* XXX always BGR888 */


@@ -76,16 +100,13 @@ 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)
 {
 
 uint32_t text_checksum(int x, int y, int w, int h)
 {

-       unsigned char *video = (unsigned char *)0xB8000;
+       unsigned char *video = (unsigned char *)vga_base();

        unsigned int textx = x / 9;
        unsigned int texty = y / 14;
        int cx, cy;
        unsigned int textx = x / 9;
        unsigned int texty = y / 14;
        int cx, cy;

-       unsigned char ch, at;

        uint32_t cksm = 0;
        smram_state_t old_state = smram_save_state();
        
        uint32_t cksm = 0;
        smram_state_t old_state = smram_save_state();
        

-       outputf("checksum: (%d,%d),(%d,%d)", x,y,w,h);
-       

        smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
        
        for (cy = y; cy < (y + h); cy++)
        smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
        
        for (cy = y; cy < (y + h); cy++)


@@ -93,25 +114,10 @@ uint32_t text_checksum(int x, int y, int w, int h)
                cx = x;
                texty = cy / 14;
                textx = cx / 9;
                cx = x;
                texty = cy / 14;
                textx = cx / 9;

-               ch = video[texty * 50 + textx * 2];
-               at = video[texty * 50 + textx * 2 + 1];
-               for (cx = x; cx < (x + w); cx++)
-               {
-                       unsigned int pos = cx % 9;
-                       if (pos == 0)
-                       {
-                               textx = cx / 9;
-                               ch = video[texty * 50 + textx * 2];
-                               at = video[texty * 50 + textx * 2 + 1];
-                       }
-                       
-                       cksm += ch + (at << 16);
-               }
+               cksm = crc32(video + texty * 160 + textx * 2, (w / 9) * 2 + 2, cksm);   /* Err on the side of 'too many'. */

        }
        
        smram_restore_state(old_state);
        
        }
        
        smram_restore_state(old_state);
        

-       outputf("checksum: %08x", cksm);
-       

        return cksm;
 }
        return cksm;
 }