only copy the data section if code resides in flash

[my-code/arm.git] / betty / font2b.c

diff --git a/betty/font2b.c b/betty/font2b.c
index b0e9c7cfc7f69fa497dc83aad83b19e67332b032..d1558551a0f4b7478875938fbb8f10f76a595e84 100644 (file)
--- a/betty/font2b.c
+++ b/betty/font2b.c
@@ -49,7 +49,7 @@ int main(int argc,char **argv) {
        }
 
        if(stat==CHAR)
        }
 
        if(stat==CHAR)

-               printf("const unsigned char default_font[%d]={\n",256*8*2);
+               printf("const unsigned char default_font[%d]={\n",256*8);

 
        for(font=0;font<=0xff;font++) {
 
 
        for(font=0;font<=0xff;font++) {
 


@@ -66,7 +66,7 @@ int main(int argc,char **argv) {
                for(col=0;col<8;col++) {
                        buf=0;
                        for(row=0;row<8;row++)
                for(col=0;col<8;col++) {
                        buf=0;
                        for(row=0;row<8;row++)

-                               buf|=(font_data[font*8+row]&(1<<(7-col)));
+                               buf|=(((font_data[font*8+row]>>(7-col))&1)<<row);

                        if(stat==CHAR) {
                                if(col==0)
                                        printf("\t");
                        if(stat==CHAR) {
                                if(col==0)
                                        printf("\t");