fixed merge

[netwatch.git] / aseg-paging / smi.c

diff --git a/aseg-paging/smi.c b/aseg-paging/smi.c
index e1304f3fcb9604dda3ef60c3571d8c65653d1a40..f2b574fabe4347b3e33ffa9c7bb7b752276e5724 100644 (file)
--- a/aseg-paging/smi.c
+++ b/aseg-paging/smi.c
@@ -46,20 +46,13 @@ void smi_entry(void)
                for (p = 0; ass[p][0] != -1; p++)
                {
                        int x, y;
                for (p = 0; ass[p][0] != -1; p++)
                {
                        int x, y;

-                       unsigned long lasta = 0;
-                       unsigned long *lastmap;

                        for (y = 0; y < 8; y++)
                                for (x = 0; x < 8; x++)
                                {
                        for (y = 0; y < 8; y++)
                                for (x = 0; x < 8; x++)
                                {

-                                       unsigned long a =
-                                               (unsigned long) fb->fbaddr +
-                                               ((y+ass[p][1]*8) * fb->curmode.xres + ass[p][0]*8 + x) * 4;
-                                       if ((a & ~4095) != (lasta & ~4095))
-                                       {
-                                               lastmap = (unsigned long *)((unsigned long)p2v(a) & ~4095);
-                                               lasta = a;
-                                       }
-                                       lastmap[(a & 4095) / 4] = 0xFF0000FF;
+                                       unsigned long *a =
+                                               (unsigned long*) fb->fbaddr +
+                                               ((y+ass[p][1]*8) * fb->curmode.xres + ass[p][0]*8 + x);
+                                        *a = 0xFF0000FF;

                                }
                }
        }
                                }
                }
        }