Revision 634a331f

b/host/lib/usrp/dboard/db_dbsrx2.cpp
314 314
void dbsrx2::set_gain(float gain, const std::string &name){
315 315
    assert_has(dbsrx2_gain_ranges.keys(), name, "dbsrx2 gain name");
316 316
    if (name == "BBG"){
317
        //_max2112_write_regs.bbg = gain_to_bbg_vga_reg(gain);
318
        //send_reg(0x9, 0x9);
317
        _max2112_write_regs.bbg = gain_to_bbg_vga_reg(gain);
318
        send_reg(0x9, 0x9);
319 319
    }
320 320
    else if(name == "GC1"){
321 321
        //write the new voltage to the aux dac
......
347 347
 * RX Get and Set
348 348
 **********************************************************************/
349 349
void dbsrx2::rx_get(const wax::obj &key_, wax::obj &val){
350
    wax::obj key; std::string name;
351
    boost::tie(key, name) = extract_named_prop(key_);
350
    named_prop_t key = named_prop_t::extract(key_);
352 351

  
353 352
    //handle the get request conditioned on the key
354 353
    switch(key.as<subdev_prop_t>()){
......
361 360
        return;
362 361

  
363 362
    case SUBDEV_PROP_GAIN:
364
        assert_has(_gains.keys(), name, "dbsrx2 gain name");
365
        val = _gains[name];
363
        assert_has(_gains.keys(), key.name, "dbsrx2 gain name");
364
        val = _gains[key.name];
366 365
        return;
367 366

  
368 367
    case SUBDEV_PROP_GAIN_RANGE:
369
        assert_has(dbsrx2_gain_ranges.keys(), name, "dbsrx2 gain name");
370
        val = dbsrx2_gain_ranges[name];
368
        assert_has(dbsrx2_gain_ranges.keys(), key.name, "dbsrx2 gain name");
369
        val = dbsrx2_gain_ranges[key.name];
371 370
        return;
372 371

  
373 372
    case SUBDEV_PROP_GAIN_NAMES:
......
390 389
        val = dbsrx2_antennas;
391 390
        return;
392 391

  
393
/*
394
    case SUBDEV_PROP_QUADRATURE:
395
        val = true;
396
        return;
397

  
398
    case SUBDEV_PROP_IQ_SWAPPED:
399
        val = true;
400
        return;
401

  
402
    case SUBDEV_PROP_SPECTRUM_INVERTED:
403
        val = false;
404
        return;
405
*/
406 392
    case SUBDEV_PROP_CONNECTION:
407 393
        val = SUBDEV_CONN_COMPLEX_QI;
408 394
        return;
409 395

  
396
    case SUBDEV_PROP_ENABLED:
397
        val = true; //always enabled
398
        return;
399

  
410 400
    case SUBDEV_PROP_USE_LO_OFFSET:
411 401
        val = false;
412 402
        return;
......
415 405
        val = this->get_locked();
416 406
        return;
417 407

  
418
/*
419
    case SUBDEV_PROP_RSSI:
420
        val = this->get_rssi();
421
        return;
422
*/
423

  
424 408
    case SUBDEV_PROP_BANDWIDTH:
425 409
        val = _bandwidth;
426 410
        return;
......
430 414
}
431 415

  
432 416
void dbsrx2::rx_set(const wax::obj &key_, const wax::obj &val){
433
    wax::obj key; std::string name;
434
    boost::tie(key, name) = extract_named_prop(key_);
417
    named_prop_t key = named_prop_t::extract(key_);
435 418

  
436 419
    //handle the get request conditioned on the key
437 420
    switch(key.as<subdev_prop_t>()){
......
441 424
        return;
442 425

  
443 426
    case SUBDEV_PROP_GAIN:
444
        this->set_gain(val.as<float>(), name);
427
        this->set_gain(val.as<float>(), key.name);
445 428
        return;
446 429

  
430
    case SUBDEV_PROP_ENABLED:
431
        return; //always enabled
432

  
447 433
    case SUBDEV_PROP_BANDWIDTH:
448 434
        this->set_bandwidth(val.as<float>());
449 435
        return;

Also available in: Unified diff