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

Added Lee's patch which adds recognition for all US and UK NSF codes.
Fine work Lee, both on the gathering and the patching.

diff --git a/faxd/NSF.c++ b/faxd/NSF.c++
index ad952fea85f43ebbcb6578c9ee164e1871f58a9e..216b98b14a78e35ea61cdfef122085ab82f12101 100644 (file)
--- a/faxd/NSF.c++
+++ b/faxd/NSF.c++
@@ -116,15 +116,21 @@ static const ModelData Muratec[] =
 {{"\xF4\x91\xFF\xFF\xFF\x42\x2A\xBC\x01\x57", "M4700" },
  {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.
+ */
+
 static const NSFData KnownNSF[] =
 {
     {"\x00\x00\x0E", "Panasonic", false, 3,10, Panasonic0E },
+    {"\x00\x00\x09", "Xerox",     true, 3, 10, Xerox },
     {"\x00\x00\x11", "Canon",     false, 3, 5, Canon },
     {"\x00\x00\x19", "Xerox",     true  },
-    {"\x00\x00\x09", "Xerox",     true, 3, 10, Xerox },
     {"\x00\x00\x21", "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\x51", "Sanyo",     false, 3,10, Sanyo },
     {"\x00\x00\x56", "Brother",   false, 3, 9, Brother },
@@ -134,13 +140,83 @@ static const NSFData KnownNSF[] =
     {"\x59\x59\x01", NULL,        false },
     {"\x86\x00\x8C", "Samsung",   false, 3, 4, Samsung8C },
     {"\x86\x00\x98", "Samsung",   false },
+    {"\xAD\x00\x00", "Pitney Bowes", false, 3, 6, PitneyBowes },
     {"\xAD\x00\x36", "HP",        false, 3, 5, HP },
+    {"\xAD\x00\x42", "FaxTalk",   false },
     {"\xAD\x00\x44", NULL,        true },
+    {"\xB4\x00\xB0", "DCE",       false },
+    {"\xB4\x00\xB1", "Hasler",    false },
+    {"\xB4\x00\xB2", "Interquad", false },
+    {"\xB4\x00\xB3", "Comwave",   false },
+    {"\xB4\x00\xB4", "Iconographic", false },
+    {"\xB4\x00\xB5", "Wordcraft", false },
+    {"\xB4\x00\xB6", "Acorn",     false },
+    {"\xB5\x00\x01", "Picturetel", false },
+    {"\xB5\x00\x20", "Conexant",  false },
+    {"\xB5\x00\x22", "Comsat",    false },
+    {"\xB5\x00\x24", "Octel",     false },
+    {"\xB5\x00\x26", "ROLM",      false },
+    {"\xB5\x00\x28", "SOFNET",    false },
+    {"\xB5\x00\x29", "TIA TR-29 Committee", false },
+    {"\xB5\x00\x2A", "STF Tech",  false },
+    {"\xB5\x00\x2C", "HKB",       false },
     {"\xB5\x00\x2E", "Delrina",   false },
-    {"\x00\x00\x31", "Sharp/Olivetti",     false, 3, 10, Sharp },
-    {"\xAD\x00\x00", "Pitney Bowes", false, 3, 6, PitneyBowes },
-    {"\xB5\x00\x76", "Trust",     false },
-    {"\xAD\x00\x42", "FaxTalk",   false },
+    {"\xB5\x00\x30", "Dialogic",  false },
+    {"\xB5\x00\x32", "Applied Synergy", false },
+    {"\xB5\x00\x34", "Syncro Development", false },
+    {"\xB5\x00\x36", "Genoa",     false },
+    {"\xB5\x00\x38", "Texas Instruments", false },
+    {"\xB5\x00\x3A", "IBM",       false },
+    {"\xB5\x00\x3C", "ViaSat",    false },
+    {"\xB5\x00\x3E", "Ericsson",  false },
+    {"\xB5\x00\x42", "Bogosian",  false },
+    {"\xB5\x00\x44", "Adobe",     false },
+    {"\xB5\x00\x46", "Fremont Communications", false },
+    {"\xB5\x00\x48", "Hayes",     false },
+    {"\xB5\x00\x4A", "Lucent",    false },
+    {"\xB5\x00\x4C", "Data Race", false },
+    {"\xB5\x00\x4E", "TRW",       false },
+    {"\xB5\x00\x52", "Audiofax",  false },
+    {"\xB5\x00\x54", "Computer Automation", false },
+    {"\xB5\x00\x56", "Serca",     false },
+    {"\xB5\x00\x58", "Octocom",   false },
+    {"\xB5\x00\x5C", "Power Solutions", false },
+    {"\xB5\x00\x5A", "Digital Sound", false },
+    {"\xB5\x00\x5E", "Pacific Data", false },
+    {"\xB5\x00\x60", "Commetrex", false },
+    {"\xB5\x00\x62", "BrookTrout", false },
+    {"\xB5\x00\x64", "Gammalink", false },
+    {"\xB5\x00\x66", "Castelle",  false },
+    {"\xB5\x00\x68", "Hybrid Fax", false },
+    {"\xB5\x00\x6A", "Omnifax",   false },
+    {"\xB5\x00\x6C", "HP",        false },
+    {"\xB5\x00\x6E", "Microsoft", false },
+    {"\xB5\x00\x72", "Speaking Devices", false },
+    {"\xB5\x00\x74", "Compaq",    false },
+    {"\xB5\x00\x76", "Trust - Cryptek", false },
+    {"\xB5\x00\x78", "Cylink",    false },
+    {"\xB5\x00\x7A", "Pitney Bowes", false },
+    {"\xB5\x00\x7C", "Digiboard", false },
+    {"\xB5\x00\x7E", "Codex",     false },
+    {"\xB5\x00\x82", "Wang Labs", false },
+    {"\xB5\x00\x84", "Netexpress Communications", false },
+    {"\xB5\x00\x86", "Cable-Sat", false },
+    {"\xB5\x00\x88", "MFPA",      false },
+    {"\xB5\x00\x8A", "Telogy Networks", false },
+    {"\xB5\x00\x8E", "Telecom Multimedia Systems", false },
+    {"\xB5\x00\x8C", "AT&T",      false },
+    {"\xB5\x00\x92", "Nuera",     false },
+    {"\xB5\x00\x94", "K56flex",   false },
+    {"\xB5\x00\x96", "MiBridge",  false },
+    {"\xB5\x00\x98", "Xerox",     false },
+    {"\xB5\x00\x9A", "Fujitsu",   false },
+    {"\xB5\x00\x9B", "Fujitsu",   false },
+    {"\xB5\x00\x9C", "Natural Microsystems",  false },
+    {"\xB5\x00\x9E", "CopyTele",  false },
+    {"\xB5\x00\xA2", "Murata",    false },
+    {"\xB5\x00\xA4", "Lanier",    false },
+    {"\xB5\x00\xA6", "Qualcomm",  false },
+    {"\xB5\x00\xAA", "HylaFAX",  false },
     {NULL}
 };