some changes for gcc4

[netwatch.git] / video / text.c

diff --git a/video/text.c b/video/text.c
index c9068b9794d5fae973e2b54fec2c402c5d3f3e2e..962af0ca0afc65d7587e11f0970336cc4fd15b7f 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,25 +13,33 @@ 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);
 }
 
        outb(0x3CF, oldread);
 }
 

-void text_render(unsigned char *buf, unsigned int x, unsigned int y, unsigned int w, unsigned int h)
+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: buf %08x, (%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;
                ch = video[texty * 50 + textx * 2];
                texty = cy / 14;
                textx = cx / 9;
                ch = video[texty * 50 + textx * 2];


@@ -58,21 +68,29 @@ void text_render(unsigned char *buf, unsigned int x, unsigned int y, unsigned in
                                *(buf++) = (at & 0x20) ? 0xFF : 0x00;
                                *(buf++) = (at & 0x40) ? 0xFF : 0x00;
                        }
                                *(buf++) = (at & 0x20) ? 0xFF : 0x00;
                                *(buf++) = (at & 0x40) ? 0xFF : 0x00;
                        }

+                       *(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();
+       
+       outputf("checksum: (%d,%d),(%d,%d)", 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;
                ch = video[texty * 50 + textx * 2];
                texty = cy / 14;
                textx = cx / 9;
                ch = video[texty * 50 + textx * 2];


@@ -91,5 +109,9 @@ uint32_t text_checksum(int x, int y, int w, int h)
                }
        }
        
                }
        }
        

+       smram_restore_state(old_state);
+       
+       outputf("checksum: %08x", cksm);
+       

        return cksm;
 }
        return cksm;
 }