From: hachti Date: Fri, 24 Aug 2007 14:52:24 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://gitweb.hachti.de/?p=h316.git;a=commitdiff_plain;h=0c71589b599fb65b2faaf0d19e1054e72bac7d08 *** empty log message *** --- diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile index 3767ecd..173dc5e 100644 --- a/lib/fortran/Makefile +++ b/lib/fortran/Makefile @@ -23,7 +23,6 @@ LDC_COMMAND = ldc -saq #OBJ_FILES = $(SRC_FILES:.asm=.obj) #OBJ_FILES_FULL = $(foreach file, $(OBJ_FILES),$(OBJ_DIR)/$(file)) - ########################################## diff --git a/lib/fortran/vpunch-help/font_8x16.c b/lib/fortran/vpunch-help/font_8x16.c index f56c08f..d17293b 100644 --- a/lib/fortran/vpunch-help/font_8x16.c +++ b/lib/fortran/vpunch-help/font_8x16.c @@ -4,11 +4,11 @@ /* */ /**********************************************/ -#include +// #include #define FONTDATAMAX 4096 -unsigned char fontdata_8x16[FONTDATAMAX] = { +unsigned char fontdata[FONTDATAMAX] = { /* 0 0x00 '^@' */ 0x00, /* 00000000 */ @@ -4621,7 +4621,7 @@ unsigned char fontdata_8x16[FONTDATAMAX] = { }; /* -struct font_desc font_vga_8x16 = { +const struct font_desc font_vga_8x16 = { VGA8x16_IDX, "VGA8x16", 8, diff --git a/lib/fortran/vpunch-help/use.c b/lib/fortran/vpunch-help/use.c index f914bd4..7eb9a5b 100644 --- a/lib/fortran/vpunch-help/use.c +++ b/lib/fortran/vpunch-help/use.c @@ -1,8 +1,7 @@ - -extern char fontdata_8x16[4096]; - #include +extern unsigned char fontdata[4096]; + signed short cb (unsigned char a, unsigned char b){ short result=a<<8; result+=b; @@ -21,10 +20,10 @@ char tw(char in){ int main (int argc, char ** argv){ int c; int a; - for (c=0; c<4096; c++) fontdata_8x16[c]=tw(fontdata_8x16[c]); + for (c=0; c<4096; c++) fontdata[c]=tw(fontdata[c]); printf("\tSUBR\tFONT\n"); for (a=0; a<256; a++){ - char * fd =fontdata_8x16 + (a<<4); + char * fd =fontdata + (a<<4); if (a==0) printf("FONT\t"); else printf("\t"); printf("DEC\t%i,%i,%i,%i\n\tDEC\t%i,%i,%i,%i\n", cb(fd[0],fd[1]),cb(fd[2],fd[3]),cb(fd[4],fd[5]), cb(fd[6],fd[7]),