patch-2.1.50 linux/drivers/char/conmakehash.c

• Lines: 61
• Date: Mon Aug 11 17:28:19 1997
• Orig file: v2.1.49/linux/drivers/char/conmakehash.c
• Orig date: Sun Sep 17 21:42:45 1995

diff -u --recursive --new-file v2.1.49/linux/drivers/char/conmakehash.c linux/drivers/char/conmakehash.c
@@ -7,7 +7,7 @@
  * memory not allocated by kmalloc(), and doing our own memory management
  * just for this seems like massive overkill.
  *
- * Copyright (C) 1995 H. Peter Anvin
+ * Copyright (C) 1995-1997 H. Peter Anvin
  *
  * This program is a part of the Linux kernel, and may be freely
  * copied under the terms of the GNU General Public License (GPL),
@@ -248,18 +248,15 @@
   
   printf("\
 /*\n\
- * uni_hash.tbl\n\
- *\n\
  * Do not edit this file; it was automatically generated by\n\
  *\n\
- * conmakehash %s > uni_hash.tbl\n\
+ * conmakehash %s > [this file]\n\
  *\n\
  */\n\
 \n\
 #include <linux/types.h>\n\
-#include <linux/kd.h>\n\
 \n\
-static u8 dfont_unicount[%d] = \n\
+u8 dfont_unicount[%d] = \n\
 {\n\t", argv[1], fontlen);
 
   for ( i = 0 ; i < fontlen ; i++ )
@@ -272,20 +269,20 @@
       else
         printf(", ");
     }
-
-  printf("\nstatic u16 dfont_unitable[%d] = \n{\n\t", nuni);
-
+  
+  printf("\nu16 dfont_unitable[%d] = \n{\n\t", nuni);
+  
   fp0 = 0;
   nent = 0;
   for ( i = 0 ; i < nuni ; i++ )
     {
-       while ( nent >= unicount[fp0] )
-         {
-            fp0++;
-            nent = 0;
-         }
-       printf("0x%04x", unitable[fp0][nent++]);
-       if ( i == nuni-1 )
+      while ( nent >= unicount[fp0] )
+	{
+	  fp0++;
+	  nent = 0;
+	}
+      printf("0x%04x", unitable[fp0][nent++]);
+      if ( i == nuni-1 )
          printf("\n};");
        else if ( i % 8 == 7 )
          printf(",\n\t");