tool/CommandSiiRead.cpp
changeset 1869 14f634f5b613
parent 1826 ec6223c3b7ec
child 1870 0cee1fb7f0fd
equal deleted inserted replaced
1868:489ea0becd74 1869:14f634f5b613
    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;
    79     SlaveList slaves;
    80     SlaveList slaves;
    80     ec_ioctl_slave_t *slave;
    81     ec_ioctl_slave_t *slave;
    81     ec_ioctl_slave_sii_t data;
    82     ec_ioctl_slave_sii_t data;
    82     unsigned int i;
    83     unsigned int i;
    83     const uint16_t *categoryHeader;
    84     const uint16_t *categoryHeader;
    87     if (args.size()) {
    88     if (args.size()) {
    88         err << "'" << getName() << "' takes no arguments!";
    89         err << "'" << getName() << "' takes no arguments!";
    89         throwInvalidUsageException(err);
    90         throwInvalidUsageException(err);
    90     }
    91     }
    91 
    92 
    92     if (getMasterIndices().size() != 1) {
    93 	masterIndices = getMasterIndices();
       
    94     if (masterIndices.size() != 1) {
    93         err << getName() << " requires to select a single master!";
    95         err << getName() << " requires to select a single master!";
    94         throwInvalidUsageException(err);
    96         throwInvalidUsageException(err);
    95     }
    97     }
    96     MasterDevice m(getMasterIndices().front());
    98     MasterDevice m(masterIndices.front());
    97     m.open(MasterDevice::Read);
    99     m.open(MasterDevice::Read);
    98     slaves = selectedSlaves(m);
   100     slaves = selectedSlaves(m);
    99 
   101 
   100     if (slaves.size() != 1) {
   102     if (slaves.size() != 1) {
   101         throwSingleSlaveRequired(slaves.size());
   103         throwSingleSlaveRequired(slaves.size());