some changes for gcc4

[netwatch.git] / video / tnt2.c

diff --git a/video/tnt2.c b/video/tnt2.c
index c79912ca9a435a893a32f27d66bd779ed05999c2..382739370db83a4bfc607aad4b11f1c88096d104 100644 (file)
--- a/video/tnt2.c
+++ b/video/tnt2.c
@@ -4,8 +4,9 @@
 #include <output.h>
 #include <fb.h>
 #include <paging.h>
 #include <output.h>
 #include <fb.h>
 #include <paging.h>

+#include <text.h>

 
 

-#include "checksumrect.h"
+#include "generic.h"

 
 static void tnt2_getvmode(void *priv);
 
 
 static void tnt2_getvmode(void *priv);
 


@@ -30,14 +31,17 @@ static void tnt2_getvmode(void *priv)
                tnt2_fb.curmode.bytestride = 4;
                tnt2_fb.curmode.text = 0;
                tnt2_fb.checksum_rect = checksum_rect_generic32;
                tnt2_fb.curmode.bytestride = 4;
                tnt2_fb.curmode.text = 0;
                tnt2_fb.checksum_rect = checksum_rect_generic32;

+               tnt2_fb.copy_pixels = copy_pixels_generic32;

                break;
        case 0:
                tnt2_fb.curmode.text = 1;
                break;
        case 0:
                tnt2_fb.curmode.text = 1;

-               tnt2_fb.checksum_rect = (checksum_rect_t) 0;
+               tnt2_fb.checksum_rect = text_checksum;
+               tnt2_fb.copy_pixels = text_render;

                break;
        default:
                tnt2_fb.curmode.text = 1;
                break;
        default:
                tnt2_fb.curmode.text = 1;

-               tnt2_fb.checksum_rect = (checksum_rect_t) 0;
+               tnt2_fb.checksum_rect = text_checksum;
+               tnt2_fb.copy_pixels = text_render;

                outputf("Unknown TNT2 format %x", vgard(0x28));
                break;
        }
                outputf("Unknown TNT2 format %x", vgard(0x28));
                break;
        }