X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=test%2Fbaudrate.cpp;h=fe6c63a006b52616b341466571ee18481a062da7;hp=b7d02824fc7cdfbac1fe6fcfac5a4c3479af18cf;hb=2a2c8b9cb4bcf773492d27dfc179a2e45e1e83d2;hpb=aae08071a70ead6cf550921fbad399f0d7d796d2

diff --git a/test/baudrate.cpp b/test/baudrate.cpp
index b7d0282..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
 */
 
 /***************************************************************************
@@ -19,6 +19,7 @@
 #include <boost/foreach.hpp>
 #include <vector>
 #include <map>
+#include <math.h>
 
 using namespace std;
 
@@ -38,7 +39,7 @@ public:
         ftdi = ftdi_new();
     }
 
-    ~BaseFTDIFixture()
+    virtual ~BaseFTDIFixture()
     {
         delete ftdi;
         ftdi = NULL;
@@ -101,10 +102,12 @@ static void test_baudrates(ftdi_context *ftdi, const map<int, calc_result> &baud
         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->divisor == divisor && res->fractional_bits == fractional_bits
                             && res->clock == clock,
@@ -122,7 +125,7 @@ BOOST_AUTO_TEST_CASE(TypeAMFixedBaudrates)
     ftdi->type = TYPE_AM;
 
     map<int, calc_result> baudrates;
-    baudrates[183] = calc_result(183, 16383, 3, 48);
+    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);
@@ -139,12 +142,12 @@ BOOST_AUTO_TEST_CASE(TypeAMFixedBaudrates)
     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(1200000, 2, 1, 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(2000000, 1, 0, 48);
+    baudrates[2000000] = calc_result(1500000, 2, 0, 48);
     baudrates[3000000] = calc_result(3000000, 0, 0, 48);
 
     test_baudrates(ftdi, baudrates);
@@ -157,6 +160,7 @@ BOOST_AUTO_TEST_CASE(TypeBMFixedBaudrates)
     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[183] = calc_result(183, 16383, 7, 48);
@@ -181,6 +185,24 @@ BOOST_AUTO_TEST_CASE(TypeBMFixedBaudrates)
     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;
@@ -198,6 +220,7 @@ BOOST_AUTO_TEST_CASE(TypeHFixedBaudrates)
 
     map<int, calc_result> 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);
@@ -218,6 +241,24 @@ BOOST_AUTO_TEST_CASE(TypeHFixedBaudrates)
     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;