tool/CommandSiiRead.cpp
changeset 1870 0cee1fb7f0fd
parent 1869 14f634f5b613
child 1968 4f682084c643
equal deleted inserted replaced
1869:14f634f5b613 1870:0cee1fb7f0fd
    74 
    74 
    75 /****************************************************************************/
    75 /****************************************************************************/
    76 
    76 
    77 void CommandSiiRead::execute(const StringVector &args)
    77 void CommandSiiRead::execute(const StringVector &args)
    78 {
    78 {
    79 	MasterIndexList masterIndices;
       
    80     SlaveList slaves;
    79     SlaveList slaves;
    81     ec_ioctl_slave_t *slave;
    80     ec_ioctl_slave_t *slave;
    82     ec_ioctl_slave_sii_t data;
    81     ec_ioctl_slave_sii_t data;
    83     unsigned int i;
    82     unsigned int i;
    84     const uint16_t *categoryHeader;
    83     const uint16_t *categoryHeader;
    88     if (args.size()) {
    87     if (args.size()) {
    89         err << "'" << getName() << "' takes no arguments!";
    88         err << "'" << getName() << "' takes no arguments!";
    90         throwInvalidUsageException(err);
    89         throwInvalidUsageException(err);
    91     }
    90     }
    92 
    91 
    93 	masterIndices = getMasterIndices();
    92     MasterDevice m(getSingleMasterIndex());
    94     if (masterIndices.size() != 1) {
       
    95         err << getName() << " requires to select a single master!";
       
    96         throwInvalidUsageException(err);
       
    97     }
       
    98     MasterDevice m(masterIndices.front());
       
    99     m.open(MasterDevice::Read);
    93     m.open(MasterDevice::Read);
   100     slaves = selectedSlaves(m);
    94     slaves = selectedSlaves(m);
   101 
    95 
   102     if (slaves.size() != 1) {
    96     if (slaves.size() != 1) {
   103         throwSingleSlaveRequired(slaves.size());
    97         throwSingleSlaveRequired(slaves.size());