Changeset 9744

Show
Ignore:
Timestamp:
10/07/08 22:23:47
Author:
eb
Message:

more s/which/which_side/g and reformatting

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.cc

    r9733 r9744  
    3434 
    3535std::vector<db_base_sptr> 
    36 instantiate_dbs(int dbid, usrp_basic * usrp, int which) 
     36instantiate_dbs(int dbid, usrp_basic *usrp, int which_side) 
    3737{ 
    3838  std::vector<db_base_sptr> db; 
    …… 
    4141 
    4242  case(USRP_DBID_BASIC_TX): 
    43     db.push_back(db_base_sptr(new db_basic_tx(usrp, which))); 
     43    db.push_back(db_base_sptr(new db_basic_tx(usrp, which_side))); 
    4444    break; 
    4545 
    4646  case(USRP_DBID_BASIC_RX): 
    47     db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 0))); 
    48     db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 1))); 
     47    db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 0))); 
     48    db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 1))); 
    4949    break; 
    5050 
    5151  case(USRP_DBID_LF_TX): 
    52     db.push_back(db_base_sptr(new db_lf_tx(usrp, which))); 
     52    db.push_back(db_base_sptr(new db_lf_tx(usrp, which_side))); 
    5353    break; 
    5454 
    5555  case(USRP_DBID_LF_RX): 
    56     db.push_back(db_base_sptr(new db_lf_rx(usrp, which, 0))); 
    57     db.push_back(db_base_sptr(new db_lf_rx(usrp, which, 1))); 
     56    db.push_back(db_base_sptr(new db_lf_rx(usrp, which_side, 0))); 
     57    db.push_back(db_base_sptr(new db_lf_rx(usrp, which_side, 1))); 
    5858    break; 
    5959     
    60   case(USRP_DBID_DBS_RX): db.push_back(db_base_sptr(new db_dbs_rx(usrp, which))); break; 
    61  
    62   case(USRP_DBID_TV_RX): db.push_back(db_base_sptr(new db_tv_rx(usrp, which, 43.75e6, 5.75e6))); break; 
    63   case(USRP_DBID_TV_RX_REV_2): db.push_back(db_base_sptr(new db_tv_rx(usrp, which, 44e6, 20e6))); break; 
    64   case(USRP_DBID_TV_RX_REV_3): db.push_back(db_base_sptr(new db_tv_rx(usrp, which, 44e6, 20e6))); break; 
    65  
    66   case(USRP_DBID_FLEX_2400_TX): db.push_back(db_base_sptr(new db_flexrf_2400_tx(usrp, which))); break; 
    67   case(USRP_DBID_FLEX_2400_RX): db.push_back(db_base_sptr(new db_flexrf_2400_rx(usrp, which))); break; 
    68   case(USRP_DBID_FLEX_1200_TX): db.push_back(db_base_sptr(new db_flexrf_1200_tx(usrp, which))); break; 
    69   case(USRP_DBID_FLEX_1200_RX): db.push_back(db_base_sptr(new db_flexrf_1200_rx(usrp, which))); break; 
    70   case(USRP_DBID_FLEX_1800_TX): db.push_back(db_base_sptr(new db_flexrf_1800_tx(usrp, which))); break; 
    71   case(USRP_DBID_FLEX_1800_RX): db.push_back(db_base_sptr(new db_flexrf_1800_rx(usrp, which))); break; 
    72   case(USRP_DBID_FLEX_900_TX):  db.push_back(db_base_sptr(new db_flexrf_900_tx(usrp, which))); break; 
    73   case(USRP_DBID_FLEX_900_RX):  db.push_back(db_base_sptr(new db_flexrf_900_rx(usrp, which))); break; 
    74   case(USRP_DBID_FLEX_400_TX):  db.push_back(db_base_sptr(new db_flexrf_400_tx(usrp, which))); break; 
    75   case(USRP_DBID_FLEX_400_RX):  db.push_back(db_base_sptr(new db_flexrf_400_rx(usrp, which))); break; 
    76  
    77   case(USRP_DBID_FLEX_2400_TX_MIMO_A): db.push_back(db_base_sptr(new db_flexrf_2400_tx_mimo_a(usrp, which))); break; 
    78   case(USRP_DBID_FLEX_2400_RX_MIMO_A): db.push_back(db_base_sptr(new db_flexrf_2400_rx_mimo_a(usrp, which))); break; 
    79   case(USRP_DBID_FLEX_1800_TX_MIMO_A): db.push_back(db_base_sptr(new db_flexrf_1800_tx_mimo_a(usrp, which))); break; 
    80   case(USRP_DBID_FLEX_1800_RX_MIMO_A): db.push_back(db_base_sptr(new db_flexrf_1800_rx_mimo_a(usrp, which))); break; 
    81   case(USRP_DBID_FLEX_1200_TX_MIMO_A): db.push_back(db_base_sptr(new db_flexrf_1200_tx_mimo_a(usrp, which))); break; 
    82   case(USRP_DBID_FLEX_1200_RX_MIMO_A): db.push_back(db_base_sptr(new db_flexrf_1200_rx_mimo_a(usrp, which))); break; 
    83   case(USRP_DBID_FLEX_900_TX_MIMO_A):  db.push_back(db_base_sptr(new db_flexrf_900_tx_mimo_a(usrp, which))); break; 
    84   case(USRP_DBID_FLEX_900_RX_MIMO_A):  db.push_back(db_base_sptr(new db_flexrf_900_rx_mimo_a(usrp, which))); break; 
    85   case(USRP_DBID_FLEX_400_TX_MIMO_A):  db.push_back(db_base_sptr(new db_flexrf_400_tx_mimo_a(usrp, which))); break; 
    86   case(USRP_DBID_FLEX_400_RX_MIMO_A):  db.push_back(db_base_sptr(new db_flexrf_400_rx_mimo_a(usrp, which))); break; 
    87   case(USRP_DBID_FLEX_2400_TX_MIMO_B): db.push_back(db_base_sptr(new db_flexrf_2400_tx_mimo_b(usrp, which))); break; 
    88   case(USRP_DBID_FLEX_2400_RX_MIMO_B): db.push_back(db_base_sptr(new db_flexrf_2400_rx_mimo_b(usrp, which))); break; 
    89   case(USRP_DBID_FLEX_1800_TX_MIMO_B): db.push_back(db_base_sptr(new db_flexrf_1800_tx_mimo_b(usrp, which))); break; 
    90   case(USRP_DBID_FLEX_1800_RX_MIMO_B): db.push_back(db_base_sptr(new db_flexrf_1800_rx_mimo_b(usrp, which))); break; 
    91   case(USRP_DBID_FLEX_1200_TX_MIMO_B): db.push_back(db_base_sptr(new db_flexrf_1200_tx_mimo_b(usrp, which))); break; 
    92   case(USRP_DBID_FLEX_1200_RX_MIMO_B): db.push_back(db_base_sptr(new db_flexrf_1200_rx_mimo_b(usrp, which))); break; 
    93   case(USRP_DBID_FLEX_900_TX_MIMO_B):  db.push_back(db_base_sptr(new db_flexrf_900_tx_mimo_b(usrp, which))); break; 
    94   case(USRP_DBID_FLEX_900_RX_MIMO_B):  db.push_back(db_base_sptr(new db_flexrf_900_rx_mimo_b(usrp, which))); break; 
    95   case(USRP_DBID_FLEX_400_TX_MIMO_B):  db.push_back(db_base_sptr(new db_flexrf_400_tx_mimo_b(usrp, which))); break; 
    96   case(USRP_DBID_FLEX_400_RX_MIMO_B):  db.push_back(db_base_sptr(new db_flexrf_400_rx_mimo_b(usrp, which))); break; 
    97  
    98   case(USRP_DBID_XCVR2450_TX): db.push_back(db_base_sptr(new db_xcvr2450_tx(usrp, which))); break; 
    99   case(USRP_DBID_XCVR2450_RX): db.push_back(db_base_sptr(new db_xcvr2450_rx(usrp, which))); break; 
     60  case(USRP_DBID_DBS_RX): 
     61    db.push_back(db_base_sptr(new db_dbs_rx(usrp, which_side))); break; 
     62 
     63  case(USRP_DBID_TV_RX): 
     64    db.push_back(db_base_sptr(new db_tv_rx(usrp, which_side, 43.75e6, 5.75e6))); 
     65    break; 
     66  case(USRP_DBID_TV_RX_REV_2): 
     67    db.push_back(db_base_sptr(new db_tv_rx(usrp, which_side, 44e6, 20e6))); 
     68    break; 
     69  case(USRP_DBID_TV_RX_REV_3): 
     70    db.push_back(db_base_sptr(new db_tv_rx(usrp, which_side, 44e6, 20e6))); 
     71    break; 
     72 
     73  case(USRP_DBID_FLEX_2400_TX): 
     74    db.push_back(db_base_sptr(new db_flexrf_2400_tx(usrp, which_side))); 
     75    break; 
     76  case(USRP_DBID_FLEX_2400_RX): 
     77    db.push_back(db_base_sptr(new db_flexrf_2400_rx(usrp, which_side))); 
     78    break; 
     79  case(USRP_DBID_FLEX_1200_TX): 
     80    db.push_back(db_base_sptr(new db_flexrf_1200_tx(usrp, which_side))); 
     81    break; 
     82  case(USRP_DBID_FLEX_1200_RX): 
     83    db.push_back(db_base_sptr(new db_flexrf_1200_rx(usrp, which_side))); 
     84    break; 
     85  case(USRP_DBID_FLEX_1800_TX): 
     86    db.push_back(db_base_sptr(new db_flexrf_1800_tx(usrp, which_side))); 
     87    break; 
     88  case(USRP_DBID_FLEX_1800_RX): 
     89    db.push_back(db_base_sptr(new db_flexrf_1800_rx(usrp, which_side))); 
     90    break; 
     91  case(USRP_DBID_FLEX_900_TX): 
     92    db.push_back(db_base_sptr(new db_flexrf_900_tx(usrp, which_side))); 
     93    break; 
     94  case(USRP_DBID_FLEX_900_RX): 
     95    db.push_back(db_base_sptr(new db_flexrf_900_rx(usrp, which_side))); 
     96    break; 
     97  case(USRP_DBID_FLEX_400_TX): 
     98    db.push_back(db_base_sptr(new db_flexrf_400_tx(usrp, which_side))); 
     99    break; 
     100  case(USRP_DBID_FLEX_400_RX): 
     101    db.push_back(db_base_sptr(new db_flexrf_400_rx(usrp, which_side))); 
     102    break; 
     103  case(USRP_DBID_FLEX_2400_TX_MIMO_A): 
     104    db.push_back(db_base_sptr(new db_flexrf_2400_tx_mimo_a(usrp, which_side))); 
     105    break; 
     106  case(USRP_DBID_FLEX_2400_RX_MIMO_A): 
     107    db.push_back(db_base_sptr(new db_flexrf_2400_rx_mimo_a(usrp, which_side))); 
     108    break; 
     109  case(USRP_DBID_FLEX_1800_TX_MIMO_A): 
     110    db.push_back(db_base_sptr(new db_flexrf_1800_tx_mimo_a(usrp, which_side))); 
     111    break; 
     112  case(USRP_DBID_FLEX_1800_RX_MIMO_A): 
     113    db.push_back(db_base_sptr(new db_flexrf_1800_rx_mimo_a(usrp, which_side))); 
     114    break; 
     115  case(USRP_DBID_FLEX_1200_TX_MIMO_A): 
     116    db.push_back(db_base_sptr(new db_flexrf_1200_tx_mimo_a(usrp, which_side))); 
     117    break; 
     118  case(USRP_DBID_FLEX_1200_RX_MIMO_A): 
     119    db.push_back(db_base_sptr(new db_flexrf_1200_rx_mimo_a(usrp, which_side))); 
     120    break; 
     121  case(USRP_DBID_FLEX_900_TX_MIMO_A): 
     122    db.push_back(db_base_sptr(new db_flexrf_900_tx_mimo_a(usrp, which_side))); 
     123    break; 
     124  case(USRP_DBID_FLEX_900_RX_MIMO_A): 
     125    db.push_back(db_base_sptr(new db_flexrf_900_rx_mimo_a(usrp, which_side))); 
     126    break; 
     127  case(USRP_DBID_FLEX_400_TX_MIMO_A): 
     128    db.push_back(db_base_sptr(new db_flexrf_400_tx_mimo_a(usrp, which_side))); 
     129    break; 
     130  case(USRP_DBID_FLEX_400_RX_MIMO_A): 
     131    db.push_back(db_base_sptr(new db_flexrf_400_rx_mimo_a(usrp, which_side))); 
     132    break; 
     133  case(USRP_DBID_FLEX_2400_TX_MIMO_B): 
     134    db.push_back(db_base_sptr(new db_flexrf_2400_tx_mimo_b(usrp, which_side))); 
     135    break; 
     136  case(USRP_DBID_FLEX_2400_RX_MIMO_B): 
     137    db.push_back(db_base_sptr(new db_flexrf_2400_rx_mimo_b(usrp, which_side))); 
     138    break; 
     139  case(USRP_DBID_FLEX_1800_TX_MIMO_B): 
     140    db.push_back(db_base_sptr(new db_flexrf_1800_tx_mimo_b(usrp, which_side))); 
     141    break; 
     142  case(USRP_DBID_FLEX_1800_RX_MIMO_B): 
     143    db.push_back(db_base_sptr(new db_flexrf_1800_rx_mimo_b(usrp, which_side))); 
     144    break; 
     145  case(USRP_DBID_FLEX_1200_TX_MIMO_B): 
     146    db.push_back(db_base_sptr(new db_flexrf_1200_tx_mimo_b(usrp, which_side))); 
     147    break; 
     148  case(USRP_DBID_FLEX_1200_RX_MIMO_B): 
     149    db.push_back(db_base_sptr(new db_flexrf_1200_rx_mimo_b(usrp, which_side))); 
     150    break; 
     151  case(USRP_DBID_FLEX_900_TX_MIMO_B): 
     152    db.push_back(db_base_sptr(new db_flexrf_900_tx_mimo_b(usrp, which_side))); 
     153    break; 
     154  case(USRP_DBID_FLEX_900_RX_MIMO_B): 
     155    db.push_back(db_base_sptr(new db_flexrf_900_rx_mimo_b(usrp, which_side))); 
     156    break; 
     157  case(USRP_DBID_FLEX_400_TX_MIMO_B): 
     158    db.push_back(db_base_sptr(new db_flexrf_400_tx_mimo_b(usrp, which_side))); 
     159    break; 
     160  case(USRP_DBID_FLEX_400_RX_MIMO_B): 
     161    db.push_back(db_base_sptr(new db_flexrf_400_rx_mimo_b(usrp, which_side))); 
     162    break; 
     163 
     164  case(USRP_DBID_XCVR2450_TX): 
     165    db.push_back(db_base_sptr(new db_xcvr2450_tx(usrp, which_side))); 
     166    break; 
     167  case(USRP_DBID_XCVR2450_RX): 
     168    db.push_back(db_base_sptr(new db_xcvr2450_rx(usrp, which_side))); 
     169    break; 
    100170   
    101   case(USRP_DBID_WBX_LO_TX): db.push_back(db_base_sptr(new db_wbx_lo_tx(usrp, which))); break; 
    102   case(USRP_DBID_WBX_LO_RX): db.push_back(db_base_sptr(new db_wbx_lo_rx(usrp, which))); break; 
    103  
    104   case(USRP_DBID_DTT754): db.push_back(db_base_sptr(new db_dtt754(usrp, which))); break; 
    105   case(USRP_DBID_DTT768): db.push_back(db_base_sptr(new db_dtt768(usrp, which))); break; 
     171  case(USRP_DBID_WBX_LO_TX): 
     172    db.push_back(db_base_sptr(new db_wbx_lo_tx(usrp, which_side))); 
     173    break; 
     174  case(USRP_DBID_WBX_LO_RX): 
     175    db.push_back(db_base_sptr(new db_wbx_lo_rx(usrp, which_side))); 
     176    break; 
     177 
     178  case(USRP_DBID_DTT754): 
     179    db.push_back(db_base_sptr(new db_dtt754(usrp, which_side))); 
     180    break; 
     181  case(USRP_DBID_DTT768): 
     182    db.push_back(db_base_sptr(new db_dtt768(usrp, which_side))); 
     183    break; 
    106184 
    107185  case(-1): 
    108186    if(usrp->istx()) { 
    109       db.push_back(db_base_sptr(new db_basic_tx(usrp, which))); 
     187      db.push_back(db_base_sptr(new db_basic_tx(usrp, which_side))); 
    110188    } 
    111189    else { 
    112       db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 0))); 
    113       db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 1))); 
     190      db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 0))); 
     191      db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 1))); 
    114192    } 
    115193    break; 
    …… 
    120198      fprintf(stderr, "\n\aWarning: Treating daughterboard with invalid EEPROM contents as if it were a \"Basic Tx.\"\n"); 
    121199      fprintf(stderr, "Warning: This is almost certainly wrong...  Use appropriate burn-*-eeprom utility.\n\n"); 
    122       db.push_back(db_base_sptr(new db_basic_tx(usrp, which))); 
     200      db.push_back(db_base_sptr(new db_basic_tx(usrp, which_side))); 
    123201    } 
    124202    else { 
    125203      fprintf(stderr, "\n\aWarning: Treating daughterboard with invalid EEPROM contents as if it were a \"Basic Rx.\"\n"); 
    126204      fprintf(stderr, "Warning: This is almost certainly wrong...  Use appropriate burn-*-eeprom utility.\n\n"); 
    127       db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 0))); 
    128       db.push_back(db_base_sptr(new db_basic_rx(usrp, which, 1))); 
     205      db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 0))); 
     206      db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 1))); 
    129207    } 
    130208    break; 

  • gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.h

    r9733 r9744  
    3232typedef boost::shared_ptr<db_base> db_base_sptr; 
    3333 
    34 std::vector<db_base_sptr> instantiate_dbs(int dbid, usrp_basic *usrp, int which); 
     34std::vector<db_base_sptr> instantiate_dbs(int dbid, usrp_basic *usrp, int which_side); 
    3535 
    3636#endif