Merge nyus.joshuawise.com:/storage/git/netwatch

[netwatch.git] / video / text.c

diff --git a/video/text.c b/video/text.c
index 7197bad4e38fcdaba4ab92eaa398bf672cb972cf..a25c8aa22db6df03a3d6472b554c8203a5f97279 100644 (file)
--- a/video/text.c
+++ b/video/text.c
@@ -3,6 +3,8 @@
 #include <paging.h>
 #include <minilib.h>
 #include <stdint.h>
 #include <paging.h>
 #include <minilib.h>
 #include <stdint.h>

+#include <output.h>
+#include <smram.h>

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


@@ -11,29 +13,37 @@ static unsigned char _font[256 * 32];
 void text_init()
 {
        unsigned char oldread;
 void text_init()
 {
        unsigned char oldread;

+       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, 0x05 /* Mode register */);
        outb(0x3CF, inb(0x3CF) & ~(0x10 /* Odd/even */));
        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));
        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 = p2v(0xB8000);
+       unsigned char *video = (unsigned char *)0xB8000;

        unsigned int textx = x / 9;
        unsigned int texty = y / 14;
        unsigned int cx, cy;
        unsigned char ch, at, font;
        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: (%d,%d),(%d,%d)", buf, x, y, w, h);
+       
+       smram_aseg_set_state(SMRAM_ASEG_SMMCODE);

        for (cy = y; cy < (y + h); cy++)
        {
        for (cy = y; cy < (y + h); cy++)
        {

+               cx = x;

                texty = cy / 14;
                textx = cx / 9;
                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++)
                {


@@ -41,8 +51,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 */


@@ -61,36 +71,30 @@ void text_render(char *buf, int x, int y, int w, int h)
                        *(buf++) = 0;
                }
        }
                        *(buf++) = 0;
                }
        }

+       smram_restore_state(old_state);

 }
 
 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 = p2v(0xB8000);
+       unsigned char *video = (unsigned char *)0xB8000;

        unsigned int textx = x / 9;
        unsigned int texty = y / 14;
        int cx, cy;
        unsigned char ch, at;
        uint32_t cksm = 0;
        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();
+       
+       smram_aseg_set_state(SMRAM_ASEG_SMMCODE);

        
        for (cy = y; cy < (y + h); cy++)
        {
        
        for (cy = y; cy < (y + h); cy++)
        {

+               cx = x;

                texty = cy / 14;
                textx = cx / 9;
                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 + 1) * 2);        /* Err on the side of 'too many'. */

        }
        
        }
        

+       smram_restore_state(old_state);
+       

        return cksm;
 }
        return cksm;
 }