Changeset 9660

Show
Ignore:
Timestamp:
09/24/08 14:49:49
Author:
eb
Message:

work-in-progress: added support for config_mimo; untested

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/control.h

    r9528 r9660  
    5151    u2_eth_packet_t   h; 
    5252    op_config_tx_v2_t op; 
     53    op_generic_t      eop; 
     54  }; 
     55 
     56  struct op_config_mimo_cmd 
     57  { 
     58    u2_eth_packet_t   h; 
     59    op_config_mimo_t  op; 
    5360    op_generic_t      eop; 
    5461  }; 

  • gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2_impl.cc

    r9657 r9660  
    6969    case OP_START_RX_STREAMING: return "OP_START_RX_STREAMING"; 
    7070    case OP_STOP_RX: return "OP_STOP_RX"; 
     71    case OP_CONFIG_MIMO: return "OP_CONFIG_MIMO"; 
    7172#if 0 
    7273    case OP_WRITE_REG: return "OP_WRITE_REG"; 
    …… 
    851852  usrp2::impl::config_mimo(int flags) 
    852853  { 
    853     return false;       // FIXME implement 
     854    op_config_mimo_cmd cmd; 
     855    op_generic_t reply; 
     856 
     857    memset(&cmd, 0, sizeof(cmd)); 
     858    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1); 
     859    cmd.op.opcode = OP_CONFIG_MIMO; 
     860    cmd.op.len = sizeof(cmd.op); 
     861    cmd.op.rid = d_next_rid++; 
     862    cmd.eop.opcode = OP_EOP; 
     863    cmd.eop.len = sizeof(cmd.eop); 
     864     
     865    pending_reply p(cmd.op.rid, &reply, sizeof(reply)); 
     866    if (!transmit_cmd(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT)) 
     867      return false; 
     868 
     869    return ntohx(reply.ok) == 1; 
    854870  } 
    855871 
    …… 
    857873  usrp2::impl::fpga_master_clock_freq(long *freq) 
    858874  { 
    859     *freq = 100000000L; 
     875    *freq = 100000000L;                // 100 MHz 
    860876    return true; 
    861877  }