fixed merge

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

diff --git a/aseg-paging/smi.c b/aseg-paging/smi.c
index bc0960f3428221f2da820e15ca38cf3c6dd21fef..f2b574fabe4347b3e33ffa9c7bb7b752276e5724 100644 (file)
--- a/aseg-paging/smi.c
+++ b/aseg-paging/smi.c
@@ -34,7 +34,6 @@ void smi_entry(void)
        /* wee! */
        if (fb && !fb->curmode.text)
        {
        /* wee! */
        if (fb && !fb->curmode.text)
        {

-               output("not text! nope nope nope");

                int ass[][2] = {
                              {1,0},       {4,0},{5,0},{6,0}, {8,0},{9,0},{10,0},
                        {0,1},      {2,1}, {4,1},             {8,1},
                int ass[][2] = {
                              {1,0},       {4,0},{5,0},{6,0}, {8,0},{9,0},{10,0},
                        {0,1},      {2,1}, {4,1},             {8,1},


@@ -50,10 +49,10 @@ void smi_entry(void)
                        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;
-                                       *(unsigned long *)p2v(a) = 0xFF0000FF;
+                                       unsigned long *a =
+                                               (unsigned long*) fb->fbaddr +
+                                               ((y+ass[p][1]*8) * fb->curmode.xres + ass[p][0]*8 + x);
+                                        *a = 0xFF0000FF;

                                }
                }
        }
                                }
                }
        }