[Bug 326] HylaFAX gets its own T.35 NSF manufacturer code

This patch adds those Japanese Fax Manufacturers to the NSF list.  Note that
the translation was not done and/or was rough in a few spots.  Also note that
if you intend to read the previously posted "Fax Manufacturer" TIFF, that you
must read the binary numbers right-to-left and not left-to-right as
traditional.
Fine work Lee - thanks!

diff --git a/faxd/NSF.c++ b/faxd/NSF.c++
index 216b98b14a78e35ea61cdfef122085ab82f12101..ee78224e025eed4b03dbdde409ab06a50b5e4c5c 100644 (file)
--- a/faxd/NSF.c++
+++ b/faxd/NSF.c++
@@ -112,10 +112,15 @@ static const ModelData PitneyBowes[] =
 {{"\x79\x91\xB1\xB8\x7A\xD8", "9550" },
  {NULL}};
 
-static const ModelData Muratec[] =
+static const ModelData Muratec45[] =
 {{"\xF4\x91\xFF\xFF\xFF\x42\x2A\xBC\x01\x57", "M4700" },
  {NULL}};
 
+// Muratec uses unregistered Japan code "00 00 48" 
+static const ModelData Muratec48[] =
+{{"\x53\x53\x61", "M620" },
+ {NULL}};
+
 /*
  * Country code first byte, then manufacturer is last two bytes. See T.35.  
  * Japan is x00, USA xB5, UK xB4, Canada x20, Tunisia xAD, Papua New Guinea x86.
@@ -123,19 +128,69 @@ static const ModelData Muratec[] =
 
 static const NSFData KnownNSF[] =
 {
-    {"\x00\x00\x0E", "Panasonic", false, 3,10, Panasonic0E },
+    {"\x00\x00\x00", "unknown - Japan", true },
+    {"\x00\x00\x01", "unlisted",  false },
+    {"\x00\x00\x02", "Nippon Telephone", false },
+    {"\x00\x00\x05", "unknown - Japan", false },
+    {"\x00\x00\x06", "Master Net", false },
     {"\x00\x00\x09", "Xerox",     true, 3, 10, Xerox },
+    {"\x00\x00\x0A", "Kokusai",   false },
+    {"\x00\x00\x0D", "Logic System International", false },
+    {"\x00\x00\x0E", "Panasonic", false, 3,10, Panasonic0E },
     {"\x00\x00\x11", "Canon",     false, 3, 5, Canon },
+    {"\x00\x00\x15", "Toyo Network", false },
+    {"\x00\x00\x16", "System House Mind", false },
     {"\x00\x00\x19", "Xerox",     true  },
-    {"\x00\x00\x21", "Lanier",    true  },
+    {"\x00\x00\x1D", "Hitachi Software", false },
+    {"\x00\x00\x21", "Oki Electric/Lanier", true },
     {"\x00\x00\x25", "Ricoh",     true,  3,10, Ricoh },
-    {"\x00\x00\x26", NULL,        false },
-    {"\x00\x00\x31", "Sharp/Olivetti",     false, 3, 10, Sharp },
-    {"\x00\x00\x45", "Muratec",   false, 3,10, Muratec },
+    {"\x00\x00\x26", "Konica",    false },
+    {"\x00\x00\x29", "unknown - Japan", false },
+    {"\x00\x00\x2D", "Sony",      false },
+    {"\x00\x00\x31", "Sharp/Olivetti", false, 3, 10, Sharp },
+    {"\x00\x00\x35", "Matsushita", false },
+    {"\x00\x00\x36", "Japan Telecom", false },
+    {"\x00\x00\x3D", "IBM Japan", false },
+    {"\x00\x00\x39", "Panasonic", false },
+    {"\x00\x00\x41", "Swasaki Network Steel", false },
+    {"\x00\x00\x45", "Muratec",   false, 3,10, Muratec45 },
+    {"\x00\x00\x46", "Fairnix",   false },
+    {"\x00\x00\x48", "Muratec",   false, 3,3, Muratec48 },
+    {"\x00\x00\x49", "Japan Electric", false },
+    {"\x00\x00\x4D", "Okura Electric", false },
     {"\x00\x00\x51", "Sanyo",     false, 3,10, Sanyo },
+    {"\x00\x00\x55", "unknown - Japan", false },
     {"\x00\x00\x56", "Brother",   false, 3, 9, Brother },
-    {"\x00\x00\x66", "UTAX",      true  },
+    {"\x00\x00\x59", "Fuji Networks", false },
+    {"\x00\x00\x5D", "Kuoni",     false },
+    {"\x00\x00\x61", "Casio",     false },
+    {"\x00\x00\x65", "Tateishi Electric", false },
+    {"\x00\x00\x66", "Utax/Mita", true  },
+    {"\x00\x00\x69", "Hitachi",   false },
+    {"\x00\x00\x6D", "Hitachi Telecom", false },
+    {"\x00\x00\x71", "Tamura Electric Works", false },
+    {"\x00\x00\x75", "Tokyo Electric Corp.", false },
+    {"\x00\x00\x76", "Advance",   false },
     {"\x00\x00\x79", "Panasonic", false, 3,10, Panasonic79 },
+    {"\x00\x00\x7D", "Silver",    false },
+    {"\x00\x08\x00", "unknown - Japan", false },
+    {"\x00\x10\x00", "Funai Electric", false },
+    {"\x00\x20\x00", "Eagle System", false },
+    {"\x00\x30\x00", "Nippon Business Systems", false },
+    {"\x00\x40\x00", "Comtron",   false },
+    {"\x00\x48\x00", "Cosmo Console", false },
+    {"\x00\x50\x00", "Orion Electric", false },
+    {"\x00\x60\x00", "Nagano Nippon", false },
+    {"\x00\x70\x00", "unknown - Japan",   false },
+    {"\x00\x80\x00", "Kanda Networks", false },
+    {"\x00\x88\x00", "Soft Front", false },
+    {"\x00\x90\x00", "Al Tech",   false },
+    {"\x00\xA0\x00", "Nakushima", false },
+    {"\x00\xB0\x00", "Minoru Takamora", false },
+    {"\x00\xC0\x00", "Pioneer",   false },
+    {"\x00\xD0\x00", "USC",       false },
+    {"\x00\xE0\x00", "unknown - Japan", false },
+    {"\x00\xF0\x00", "Sumitomo Electric", false },
     {"\x20\x41\x59", "Siemens",   false },
     {"\x59\x59\x01", NULL,        false },
     {"\x86\x00\x8C", "Samsung",   false, 3, 4, Samsung8C },