X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=test%2Fbaudrate.cpp;h=fe6c63a006b52616b341466571ee18481a062da7;hp=7db5d43cbf01c5425d7ef68221a1a15eff72ff37;hb=71030195f48bbf49b84de66a425ae10e5577774e;hpb=c4517f98b9cd913b848d5257ad59b4db4842fbdb

diff --git a/test/baudrate.cpp b/test/baudrate.cpp
index 7db5d43..fe6c63a 100644
--- a/test/baudrate.cpp
+++ b/test/baudrate.cpp
@@ -1,7 +1,7 @@
 /**@file
 @brief Test baudrate calculator code
 
-@author Thomas Jarosch
+@author Thomas Jarosch and Uwe Bonnes
 */
 
 /***************************************************************************
@@ -17,7 +17,9 @@
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
+#include <vector>
 #include <map>
+#include <math.h>
 
 using namespace std;
 
@@ -37,7 +39,7 @@ public:
         ftdi = ftdi_new();
     }
 
-    ~BaseFTDIFixture()
+    virtual ~BaseFTDIFixture()
     {
         delete ftdi;
         ftdi = NULL;
@@ -50,20 +52,23 @@ BOOST_FIXTURE_TEST_SUITE(Baudrate, BaseFTDIFixture)
 struct calc_result
 {
     int actual_baudrate;
-    unsigned short expected_value;
-    unsigned short expected_index;
+    unsigned short divisor;
+    unsigned short fractional_bits;
+    unsigned short clock;
 
-    calc_result(int actual, int my_value, int my_index)
+    calc_result(int actual, unsigned short my_divisor, unsigned short my_fractional_bits, unsigned short my_clock)
         : actual_baudrate(actual)
-        , expected_value(my_value)
-        , expected_index(my_index)
+        , divisor(my_divisor)
+        , fractional_bits(my_fractional_bits)
+        , clock(my_clock)
     {
     }
 
     calc_result()
         : actual_baudrate(0)
-        , expected_value(0)
-        , expected_index(0)
+        , divisor(0)
+        , fractional_bits(0)
+        , clock(0)
     {
     }
 };
@@ -83,13 +88,35 @@ static void test_baudrates(ftdi_context *ftdi, const map<int, calc_result> &baud
 
         const calc_result *res = &baudrate.second;
 
+        unsigned short divisor = calc_value & 0x3fff;
+        unsigned short fractional_bits = (calc_value >> 14);
+        unsigned short clock = (calc_index & 0x200) ? 120 : 48;
+
+        switch (ftdi->type)
+        {
+        case TYPE_232H:
+        case TYPE_2232H:
+        case TYPE_4232H:
+            fractional_bits |= (calc_index & 0x100) ? 4 : 0;
+            break;
+        case TYPE_R:
+        case TYPE_2232C:
+        case TYPE_BM:
+        case TYPE_230X:
+            fractional_bits |= (calc_index & 0x001) ? 4 : 0;
+            break;
+        default:;
+        }
+
         // Aid debugging since this test is a generic function
-        BOOST_CHECK_MESSAGE(res->actual_baudrate == calc_baudrate && res->expected_value == calc_value && res->expected_index == calc_index,
+        BOOST_CHECK_MESSAGE(res->actual_baudrate == calc_baudrate && res->divisor == divisor && res->fractional_bits == fractional_bits
+                            && res->clock == clock,
                             "\n\nERROR: baudrate calculation failed for --" << baudrate.first << " baud--. Details below: ");
 
         BOOST_CHECK_EQUAL(res->actual_baudrate, calc_baudrate);
-        BOOST_CHECK_EQUAL(res->expected_value, calc_value);
-        BOOST_CHECK_EQUAL(res->expected_index, calc_index);
+        BOOST_CHECK_EQUAL(res->divisor, divisor);
+        BOOST_CHECK_EQUAL(res->fractional_bits, fractional_bits);
+        BOOST_CHECK_EQUAL(res->clock, clock);
     }
 }
 
@@ -98,160 +125,145 @@ BOOST_AUTO_TEST_CASE(TypeAMFixedBaudrates)
     ftdi->type = TYPE_AM;
 
     map<int, calc_result> baudrates;
-    baudrates[300] = calc_result(300, 10000, 0);
-    baudrates[600] = calc_result(600, 5000, 0);
-    baudrates[600] = calc_result(600, 5000, 0);
-    baudrates[1200] = calc_result(1200, 2500, 0);
-    baudrates[2400] = calc_result(2400, 1250, 0);
-    baudrates[4800] = calc_result(4800, 625, 0);
-    baudrates[9600] = calc_result(9600, 16696, 0);
-    baudrates[19200] = calc_result(19200, 32924, 0);
-    baudrates[38400] = calc_result(38400, 49230, 0);
-    baudrates[57600] = calc_result(57554, 49204, 0);
-    baudrates[115200] = calc_result(115385, 26, 0);
-    baudrates[230400] = calc_result(230769, 13, 0);
-    baudrates[460800] = calc_result(461538, 16390, 0);
-    baudrates[921600] = calc_result(923077, 32771, 0);
+    baudrates[183] = calc_result(183, 16383, 0, 48);
+    baudrates[300] = calc_result(300, 10000, 0, 48);
+    baudrates[600] = calc_result(600,  5000, 0, 48);
+    baudrates[1200] = calc_result(1200, 2500, 0, 48);
+    baudrates[2400] = calc_result(2400, 1250, 0, 48);
+    baudrates[4800] = calc_result(4800, 625, 0, 48);
+    baudrates[9600] = calc_result(9600, 312, 1, 48);
+    baudrates[19200] = calc_result(19200, 156, 2, 48);
+    baudrates[38400] = calc_result(38400, 78, 3, 48);
+    baudrates[57600] = calc_result(57554, 52, 3, 48);
+    baudrates[115200] = calc_result(115385, 26, 0, 48);
+    baudrates[230400] = calc_result(230769, 13, 0, 48);
+    baudrates[460800] = calc_result(461538,  6, 1, 48);
+    baudrates[921600] = calc_result(923077,  3, 2, 48);
+    baudrates[1000000] = calc_result(1000000, 3, 0, 48);
+    baudrates[1090512] = calc_result(1000000, 3, 0, 48);
+    baudrates[1090909] = calc_result(1000000, 3, 0, 48);
+    baudrates[1090910] = calc_result(1000000, 3, 0, 48);
+    baudrates[1200000] = calc_result(1200000, 2, 1, 48);
+    baudrates[1333333] = calc_result(1333333, 2, 2, 48);
+    baudrates[1411764] = calc_result(1411765, 2, 3, 48);
+    baudrates[1500000] = calc_result(1500000, 2, 0, 48);
+    baudrates[2000000] = calc_result(1500000, 2, 0, 48);
+    baudrates[3000000] = calc_result(3000000, 0, 0, 48);
 
     test_baudrates(ftdi, baudrates);
 }
 
 BOOST_AUTO_TEST_CASE(TypeBMFixedBaudrates)
 {
-    ftdi->type = TYPE_BM;
-
-    map<int, calc_result> baudrates;
-    baudrates[300] = calc_result(300, 10000, 0);
-    baudrates[600] = calc_result(600, 5000, 0);
-    baudrates[600] = calc_result(600, 5000, 0);
-    baudrates[1200] = calc_result(1200, 2500, 0);
-    baudrates[2400] = calc_result(2400, 1250, 0);
-    baudrates[4800] = calc_result(4800, 625, 0);
-    baudrates[9600] = calc_result(9600, 16696, 0);
-    baudrates[19200] = calc_result(19200, 32924, 0);
-    baudrates[38400] = calc_result(38400, 49230, 0);
-    baudrates[57600] = calc_result(57554, 49204, 0);
-    baudrates[115200] = calc_result(115385, 26, 0);
-    baudrates[230400] = calc_result(230769, 13, 0);
-    baudrates[460800] = calc_result(461538, 16390, 0);
-    baudrates[921600] = calc_result(923077, 32771, 0);
-
-    test_baudrates(ftdi, baudrates);
-}
-
-BOOST_AUTO_TEST_CASE(Type2232CFixedBaudrates)
-{
-    ftdi->type = TYPE_2232C;
+    // Unify testing of chips behaving the same
+    std::vector<enum ftdi_chip_type> test_types;
+    test_types.push_back(TYPE_BM);
+    test_types.push_back(TYPE_2232C);
+    test_types.push_back(TYPE_R);
+    test_types.push_back(TYPE_230X);
 
     map<int, calc_result> baudrates;
-    baudrates[300] = calc_result(300, 10000, 1);
-    baudrates[600] = calc_result(600, 5000, 1);
-    baudrates[600] = calc_result(600, 5000, 1);
-    baudrates[1200] = calc_result(1200, 2500, 1);
-    baudrates[2400] = calc_result(2400, 1250, 1);
-    baudrates[4800] = calc_result(4800, 625, 1);
-    baudrates[9600] = calc_result(9600, 16696, 1);
-    baudrates[19200] = calc_result(19200, 32924, 1);
-    baudrates[38400] = calc_result(38400, 49230, 1);
-    baudrates[57600] = calc_result(57554, 49204, 1);
-    baudrates[115200] = calc_result(115385, 26, 1);
-    baudrates[230400] = calc_result(230769, 13, 1);
-    baudrates[460800] = calc_result(461538, 16390, 1);
-    baudrates[921600] = calc_result(923077, 32771, 1);
-
-    test_baudrates(ftdi, baudrates);
-}
-
-BOOST_AUTO_TEST_CASE(TypeRFixedBaudrates)
-{
-    ftdi->type = TYPE_R;
-
-    map<int, calc_result> baudrates;
-    baudrates[300] = calc_result(300, 10000, 0);
-    baudrates[600] = calc_result(600, 5000, 0);
-    baudrates[600] = calc_result(600, 5000, 0);
-    baudrates[1200] = calc_result(1200, 2500, 0);
-    baudrates[2400] = calc_result(2400, 1250, 0);
-    baudrates[4800] = calc_result(4800, 625, 0);
-    baudrates[9600] = calc_result(9600, 16696, 0);
-    baudrates[19200] = calc_result(19200, 32924, 0);
-    baudrates[38400] = calc_result(38400, 49230, 0);
-    baudrates[57600] = calc_result(57554, 49204, 0);
-    baudrates[115200] = calc_result(115385, 26, 0);
-    baudrates[230400] = calc_result(230769, 13, 0);
-    baudrates[460800] = calc_result(461538, 16390, 0);
-    baudrates[921600] = calc_result(923077, 32771, 0);
-
-    test_baudrates(ftdi, baudrates);
-}
-
-BOOST_AUTO_TEST_CASE(Type2232HFixedBaudrates)
-{
-    ftdi->type = TYPE_2232H;
-
-    map<int, calc_result> baudrates;
-    baudrates[300] = calc_result(300, 10000, 1);
-    baudrates[600] = calc_result(600, 5000, 1);
-    baudrates[600] = calc_result(600, 5000, 1);
-    baudrates[1200] = calc_result(1200, 2500, 1);
-    baudrates[2400] = calc_result(2400, 1250, 1);
-    baudrates[4800] = calc_result(4800, 625, 1);
-    baudrates[9600] = calc_result(9600, 16696, 1);
-    baudrates[19200] = calc_result(19200, 32924, 1);
-    baudrates[38400] = calc_result(38400, 49230, 1);
-    baudrates[57600] = calc_result(57554, 49204, 1);
-    baudrates[115200] = calc_result(115385, 26, 1);
-    baudrates[230400] = calc_result(230769, 13, 1);
-    baudrates[460800] = calc_result(461538, 16390, 1);
-    baudrates[921600] = calc_result(923077, 32771, 1);
-
-    test_baudrates(ftdi, baudrates);
-}
-
-BOOST_AUTO_TEST_CASE(Type4232HFixedBaudrates)
-{
-    ftdi->type = TYPE_4232H;
-
-    map<int, calc_result> baudrates;
-    baudrates[300] = calc_result(300, 10000, 1);
-    baudrates[600] = calc_result(600, 5000, 1);
-    baudrates[600] = calc_result(600, 5000, 1);
-    baudrates[1200] = calc_result(1200, 2500, 1);
-    baudrates[2400] = calc_result(2400, 1250, 1);
-    baudrates[4800] = calc_result(4800, 625, 1);
-    baudrates[9600] = calc_result(9600, 16696, 1);
-    baudrates[19200] = calc_result(19200, 32924, 1);
-    baudrates[38400] = calc_result(38400, 49230, 1);
-    baudrates[57600] = calc_result(57554, 49204, 1);
-    baudrates[115200] = calc_result(115385, 26, 1);
-    baudrates[230400] = calc_result(230769, 13, 1);
-    baudrates[460800] = calc_result(461538, 16390, 1);
-    baudrates[921600] = calc_result(923077, 32771, 1);
-
-    test_baudrates(ftdi, baudrates);
+    baudrates[183] = calc_result(183, 16383, 7, 48);
+    baudrates[184] = calc_result(184, 16304, 4, 48);
+    baudrates[300] = calc_result(300, 10000, 0, 48);
+    baudrates[600] = calc_result(600,  5000, 0, 48);
+    baudrates[1200] = calc_result(1200, 2500, 0, 48);
+    baudrates[2400] = calc_result(2400, 1250, 0, 48);
+    baudrates[4800] = calc_result(4800, 625, 0, 48);
+    baudrates[9600] = calc_result(9600, 312, 1, 48);
+    baudrates[19200] = calc_result(19200, 156, 2, 48);
+    baudrates[38400] = calc_result(38400, 78, 3, 48);
+    baudrates[57600] = calc_result(57554, 52, 3, 48);
+    baudrates[115200] = calc_result(115385, 26, 0, 48);
+    baudrates[230400] = calc_result(230769, 13, 0, 48);
+    baudrates[460800] = calc_result(461538,  6, 1, 48);
+    baudrates[921600] = calc_result(923077,  3, 2, 48);
+    baudrates[1000000] = calc_result(1000000, 3, 0, 48);
+    baudrates[1050000] = calc_result(1043478, 2, 7, 48);
+    baudrates[1400000] = calc_result(1411765, 2, 3, 48);
+    baudrates[1500000] = calc_result(1500000, 2, 0, 48);
+    baudrates[2000000] = calc_result(2000000, 1, 0, 48);
+    baudrates[3000000] = calc_result(3000000, 0, 0, 48);
+
+    baudrates[(3000000*16/(2*16+15))-1] = calc_result(round(3000000/3.000), 3, 0, 48);
+    baudrates[ 3000000*16/(2*16+15)   ] = calc_result(round(3000000/3.000), 3, 0, 48);
+    baudrates[(3000000*16/(2*16+15))+1] = calc_result(round(3000000/2.875), 2, 7, 48);
+    baudrates[ 3000000*16/(2*16+13)   ] = calc_result(round(3000000/2.875), 2, 7, 48);
+    baudrates[(3000000*16/(2*16+13))+1] = calc_result(round(3000000/2.750), 2, 6, 48);
+    baudrates[ 3000000*16/(2*16+11)   ] = calc_result(round(3000000/2.750), 2, 6, 48);
+    baudrates[(3000000*16/(2*16+11))+1] = calc_result(round(3000000/2.625), 2, 5, 48);
+    baudrates[ 3000000*16/(2*16+ 9)   ] = calc_result(round(3000000/2.625), 2, 5, 48);
+    baudrates[(3000000*16/(2*16+ 9))+1] = calc_result(round(3000000/2.500), 2, 1, 48);
+    baudrates[ 3000000*16/(2*16+ 7)   ] = calc_result(round(3000000/2.500), 2, 1, 48);
+    baudrates[(3000000*16/(2*16+ 7))+1] = calc_result(round(3000000/2.375), 2, 4, 48);
+    baudrates[ 3000000*16/(2*16+ 5)   ] = calc_result(round(3000000/2.375), 2, 4, 48);
+    baudrates[(3000000*16/(2*16+ 5))+1] = calc_result(round(3000000/2.250), 2, 2, 48);
+    baudrates[ 3000000*16/(2*16+ 3)   ] = calc_result(round(3000000/2.250), 2, 2, 48);
+    baudrates[(3000000*16/(2*16+ 3))+1] = calc_result(round(3000000/2.125), 2, 3, 48);
+    baudrates[ 3000000*16/(2*16+ 1)   ] = calc_result(round(3000000/2.125), 2, 3, 48);
+    baudrates[(3000000*16/(2*16+ 1))+1] = calc_result(round(3000000/2.000), 2, 0, 48);
+
+    BOOST_FOREACH(const enum ftdi_chip_type &test_chip_type, test_types)
+    {
+        ftdi->type = test_chip_type;
+        test_baudrates(ftdi, baudrates);
+    }
 }
 
-BOOST_AUTO_TEST_CASE(Type232HFixedBaudrates)
+BOOST_AUTO_TEST_CASE(TypeHFixedBaudrates)
 {
-    ftdi->type = TYPE_232H;
+    // Unify testing of chips behaving the same
+    std::vector<enum ftdi_chip_type> test_types;
+    test_types.push_back(TYPE_2232H);
+    test_types.push_back(TYPE_4232H);
+    test_types.push_back(TYPE_232H);
 
     map<int, calc_result> baudrates;
-    baudrates[300] = calc_result(300, 10000, 1);
-    baudrates[600] = calc_result(600, 5000, 1);
-    baudrates[600] = calc_result(600, 5000, 1);
-    baudrates[1200] = calc_result(1200, 2500, 1);
-    baudrates[2400] = calc_result(2400, 1250, 1);
-    baudrates[4800] = calc_result(4800, 625, 1);
-    baudrates[9600] = calc_result(9600, 16696, 1);
-    baudrates[19200] = calc_result(19200, 32924, 1);
-    baudrates[38400] = calc_result(38400, 49230, 1);
-    baudrates[57600] = calc_result(57554, 49204, 1);
-    baudrates[115200] = calc_result(115385, 26, 1);
-    baudrates[230400] = calc_result(230769, 13, 1);
-    baudrates[460800] = calc_result(461538, 16390, 1);
-    baudrates[921600] = calc_result(923077, 32771, 1);
-
-    test_baudrates(ftdi, baudrates);
+    baudrates[183] = calc_result(183, 16383, 7, 48);
+    baudrates[184] = calc_result(184, 16304, 4, 48);
+    baudrates[300] = calc_result(300, 10000, 0, 48);
+    baudrates[600] = calc_result(600,  5000, 0, 48);
+    baudrates[1200] = calc_result(1200, 10000, 0, 120);
+    baudrates[2400] = calc_result(2400,  5000, 0, 120);
+    baudrates[4800] = calc_result(4800,  2500, 0, 120);
+    baudrates[9600] = calc_result(9600,  1250, 0, 120);
+    baudrates[19200] = calc_result(19200, 625, 0, 120);
+    baudrates[38400] = calc_result(38400, 312, 1, 120);
+    baudrates[57600] = calc_result(57588, 208, 4, 120);
+    baudrates[115200] = calc_result(115246, 104, 3, 120);
+    baudrates[230400] = calc_result(230216, 52, 3, 120);
+    baudrates[460800] = calc_result(461538, 26, 0, 120);
+    baudrates[921600] = calc_result(923077, 13, 0, 120);
+    baudrates[1000000] = calc_result(1000000, 12, 0, 120);
+    baudrates[1000000] = calc_result(1000000, 12, 0, 120);
+    baudrates[6000000] = calc_result(6000000, 2, 0, 120);
+    baudrates[4173913] = calc_result(4173913, 2, 7, 120);
+    baudrates[8000000] = calc_result(8000000, 1, 0, 120);
+    baudrates[12000000] = calc_result(12000000, 0, 0, 120);
+
+    baudrates[(12000000*16/(2*16+15))-1] = calc_result(round(12000000/3.000), 3, 0, 120);
+    baudrates[ 12000000*16/(2*16+15)   ] = calc_result(round(12000000/3.000), 3, 0, 120);
+    baudrates[(12000000*16/(2*16+15))+1] = calc_result(round(12000000/2.875), 2, 7, 120);
+    baudrates[ 12000000*16/(2*16+13)   ] = calc_result(round(12000000/2.875), 2, 7, 120);
+    baudrates[(12000000*16/(2*16+13))+1] = calc_result(round(12000000/2.750), 2, 6, 120);
+    baudrates[ 12000000*16/(2*16+11)   ] = calc_result(round(12000000/2.750), 2, 6, 120);
+    baudrates[(12000000*16/(2*16+11))+1] = calc_result(round(12000000/2.625), 2, 5, 120);
+    baudrates[ 12000000*16/(2*16+ 9)   ] = calc_result(round(12000000/2.625), 2, 5, 120);
+    baudrates[(12000000*16/(2*16+ 9))+1] = calc_result(round(12000000/2.500), 2, 1, 120);
+    baudrates[ 12000000*16/(2*16+ 7)   ] = calc_result(round(12000000/2.500), 2, 1, 120);
+    baudrates[(12000000*16/(2*16+ 7))+1] = calc_result(round(12000000/2.375), 2, 4, 120);
+    baudrates[ 12000000*16/(2*16+ 5)   ] = calc_result(round(12000000/2.375), 2, 4, 120);
+    baudrates[(12000000*16/(2*16+ 5))+1] = calc_result(round(12000000/2.250), 2, 2, 120);
+    baudrates[ 12000000*16/(2*16+ 3)   ] = calc_result(round(12000000/2.250), 2, 2, 120);
+    baudrates[(12000000*16/(2*16+ 3))+1] = calc_result(round(12000000/2.125), 2, 3, 120);
+    baudrates[ 12000000*16/(2*16+ 1)   ] = calc_result(round(12000000/2.125), 2, 3, 120);
+    baudrates[(12000000*16/(2*16+ 1))+1] = calc_result(round(12000000/2.000), 2, 0, 120);
+
+    BOOST_FOREACH(const enum ftdi_chip_type &test_chip_type, test_types)
+    {
+        ftdi->type = test_chip_type;
+        test_baudrates(ftdi, baudrates);
+    }
 }
 
 BOOST_AUTO_TEST_SUITE_END()