etherlabmaster: tool/Command.cpp@63e4bc918640 (annotated)

1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	1	/*****************************************************************************
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	2	*
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	3	* $Id$
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	4	*
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	5	****************************************************************************/
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	6
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	7	#include "Command.h"
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	8
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	9	/*****************************************************************************/
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	10
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	11	Command::Command(const string &name, const string &briefDesc):
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	12	name(name),
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	13	briefDesc(briefDesc),
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	14	verbosity(Normal)
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	15	{
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	16	}
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	17
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	18	/*****************************************************************************/
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	19
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	20	Command::~Command()
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	21	{
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	22	}
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	23
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	24	/*****************************************************************************/
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	25
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	26	void Command::setVerbosity(Verbosity v)
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	27	{
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	28	verbosity = v;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	29	};
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	30
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	31	/*****************************************************************************/
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	32
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	33	void Command::setAlias(int a)
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	34	{
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	35	alias = a;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	36	};
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	37
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	38	/*****************************************************************************/
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	39
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	40	void Command::setPosition(int p)
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	41	{
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	42	position = p;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	43	};
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	44
1166 006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	45	/*****************************************************************************/
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	46
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	47	void Command::setDomain(int d)
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	48	{
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	49	domain = d;
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	50	};
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	51
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	52	/*****************************************************************************/
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	53
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	54	void Command::setDataType(const string &t)
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	55	{
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	56	dataType = t;
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	57	};
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	58
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	59	/*****************************************************************************/
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	60
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	61	void Command::setForce(bool f)
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	62	{
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	63	force = f;
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	64	};
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	65
1707 11ec009e145d Included FoE patch from Olav Zarges. Florian Pose <fp@igh-essen.com> parents: 1629 diff changeset	66	/*****************************************************************************/
11ec009e145d Included FoE patch from Olav Zarges. Florian Pose <fp@igh-essen.com> parents: 1629 diff changeset	67
11ec009e145d Included FoE patch from Olav Zarges. Florian Pose <fp@igh-essen.com> parents: 1629 diff changeset	68	void Command::setOutputFile(const string &f)
11ec009e145d Included FoE patch from Olav Zarges. Florian Pose <fp@igh-essen.com> parents: 1629 diff changeset	69	{
11ec009e145d Included FoE patch from Olav Zarges. Florian Pose <fp@igh-essen.com> parents: 1629 diff changeset	70	outputFile = f;
11ec009e145d Included FoE patch from Olav Zarges. Florian Pose <fp@igh-essen.com> parents: 1629 diff changeset	71	};
11ec009e145d Included FoE patch from Olav Zarges. Florian Pose <fp@igh-essen.com> parents: 1629 diff changeset	72
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	73	/****************************************************************************/
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	74
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	75	bool Command::matchesSubstr(const string &cmd) const
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	76	{
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	77	return name.substr(0, cmd.length()) == cmd;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	78	}
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	79
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	80	/****************************************************************************/
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	81
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	82	bool Command::matchesAbbrev(const string &abb) const
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	83	{
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	84	unsigned int i;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	85	size_t pos = 0;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	86
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	87	for (i = 0; i < abb.length(); i++) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	88	pos = name.find(abb[i], pos);
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	89	if (pos == string::npos)
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	90	return false;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	91	}
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	92
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	93	return true;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	94	}
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	95
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	96	/*****************************************************************************/
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	97
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	98	string Command::numericInfo()
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	99	{
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	100	stringstream str;
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	101
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	102	str << "Numerical values can be specified either with decimal (no" << endl
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	103	<< "prefix), octal (prefix '0') or hexadecimal (prefix '0x') base."
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	104	<< endl;
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	105
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	106	return str.str();
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	107	}
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	108
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	109	/*****************************************************************************/
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	110
1155 bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	111	void Command::throwInvalidUsageException(const stringstream &s) const
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	112	{
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	113	throw InvalidUsageException(s);
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	114	}
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	115
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	116	/*****************************************************************************/
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	117
1155 bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	118	void Command::throwCommandException(const stringstream &s) const
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	119	{
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	120	throw CommandException(s);
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	121	}
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	122
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	123	/*****************************************************************************/
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	124
1155 bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	125	void Command::throwSingleSlaveRequired(unsigned int size) const
bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	126	{
bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	127	stringstream err;
bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	128
1629 70040a399528 merge -c1422 trunk: Fixed output spacing. Florian Pose <fp@igh-essen.com> parents: 1166 diff changeset	129	err << "The slave selection matches " << size << " slaves. '"
1155 bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	130	<< name << "' requires a single slave.";
bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	131
bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	132	throwInvalidUsageException(err);
bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	133	}
bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	134
bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	135	/*****************************************************************************/
bd4e5b544473 Common message for single slave selections. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	136
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	137	Command::SlaveList Command::selectedSlaves(MasterDevice &m)
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	138	{
1160 f02ff486b313 Removed MasterDevice::slaveCount(). Florian Pose <fp@igh-essen.com> parents: 1159 diff changeset	139	ec_ioctl_master_t master;
f02ff486b313 Removed MasterDevice::slaveCount(). Florian Pose <fp@igh-essen.com> parents: 1159 diff changeset	140	unsigned int i, aliasIndex;
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	141	uint16_t lastAlias;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	142	ec_ioctl_slave_t slave;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	143	SlaveList list;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	144
1160 f02ff486b313 Removed MasterDevice::slaveCount(). Florian Pose <fp@igh-essen.com> parents: 1159 diff changeset	145	m.getMaster(&master);
f02ff486b313 Removed MasterDevice::slaveCount(). Florian Pose <fp@igh-essen.com> parents: 1159 diff changeset	146
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	147	if (alias == -1) { // no alias given
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	148	if (position == -1) { // no alias and position given
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	149	// all items
1160 f02ff486b313 Removed MasterDevice::slaveCount(). Florian Pose <fp@igh-essen.com> parents: 1159 diff changeset	150	for (i = 0; i < master.slave_count; i++) {
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	151	m.getSlave(&slave, i);
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	152	list.push_back(slave);
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	153	}
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	154	} else { // no alias, but position given
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	155	// one item by position
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	156	m.getSlave(&slave, position);
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	157	list.push_back(slave);
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	158	}
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	159	} else { // alias given
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	160	if (position == -1) { // alias, but no position given
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	161	// take all items with a given alias
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	162	lastAlias = 0;
1160 f02ff486b313 Removed MasterDevice::slaveCount(). Florian Pose <fp@igh-essen.com> parents: 1159 diff changeset	163	for (i = 0; i < master.slave_count; i++) {
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	164	m.getSlave(&slave, i);
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	165	if (slave.alias) {
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	166	lastAlias = slave.alias;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	167	}
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	168	if (lastAlias == (uint16_t) alias) {
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	169	list.push_back(slave);
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	170	}
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	171	}
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	172	} else { // alias and position given
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	173	lastAlias = 0;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	174	aliasIndex = 0;
1160 f02ff486b313 Removed MasterDevice::slaveCount(). Florian Pose <fp@igh-essen.com> parents: 1159 diff changeset	175	for (i = 0; i < master.slave_count; i++) {
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	176	m.getSlave(&slave, i);
1159 25cc77cf3993 Improved alias/position addressing in case od duplicated aliases. Florian Pose <fp@igh-essen.com> parents: 1157 diff changeset	177	if (slave.alias && slave.alias == (uint16_t) alias) {
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	178	lastAlias = slave.alias;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	179	aliasIndex = 0;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	180	}
1159 25cc77cf3993 Improved alias/position addressing in case od duplicated aliases. Florian Pose <fp@igh-essen.com> parents: 1157 diff changeset	181	if (lastAlias && aliasIndex == (unsigned int) position) {
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	182	list.push_back(slave);
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	183	}
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	184	aliasIndex++;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	185	}
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	186	}
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	187	}
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	188
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	189	return list;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	190	}
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1146 diff changeset	191
1156 ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	192	/*****************************************************************************/
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	193
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	194	bool operator<(
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	195	const ec_ioctl_config_t &a,
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	196	const ec_ioctl_config_t &b
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	197	)
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	198	{
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	199	return a.alias < b.alias
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	200	\|\| (a.alias == b.alias && a.position < b.position);
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	201	}
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	202
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	203	/*****************************************************************************/
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	204
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	205	Command::ConfigList Command::selectedConfigs(MasterDevice &m)
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	206	{
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	207	unsigned int i;
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	208	ec_ioctl_master_t master;
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	209	ec_ioctl_config_t config;
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	210	ConfigList list;
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	211	stringstream err;
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	212
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	213	m.getMaster(&master);
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	214
1157 04d1c950cf9d Added --help for alias and position parameters. Florian Pose <fp@igh-essen.com> parents: 1156 diff changeset	215	if (alias == -1) { // no alias given
1156 ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	216	if (position == -1) { // no alias and position given
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	217	// all items
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	218	for (i = 0; i < master.config_count; i++) {
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	219	m.getConfig(&config, i);
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	220	list.push_back(config);
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	221	}
1157 04d1c950cf9d Added --help for alias and position parameters. Florian Pose <fp@igh-essen.com> parents: 1156 diff changeset	222	} else { // no alias, but position given
04d1c950cf9d Added --help for alias and position parameters. Florian Pose <fp@igh-essen.com> parents: 1156 diff changeset	223	for (i = 0; i < master.config_count; i++) {
04d1c950cf9d Added --help for alias and position parameters. Florian Pose <fp@igh-essen.com> parents: 1156 diff changeset	224	m.getConfig(&config, i);
04d1c950cf9d Added --help for alias and position parameters. Florian Pose <fp@igh-essen.com> parents: 1156 diff changeset	225	if (!config.alias && config.position == position) {
04d1c950cf9d Added --help for alias and position parameters. Florian Pose <fp@igh-essen.com> parents: 1156 diff changeset	226	list.push_back(config);
04d1c950cf9d Added --help for alias and position parameters. Florian Pose <fp@igh-essen.com> parents: 1156 diff changeset	227	break; // there can be at most one matching
04d1c950cf9d Added --help for alias and position parameters. Florian Pose <fp@igh-essen.com> parents: 1156 diff changeset	228	}
04d1c950cf9d Added --help for alias and position parameters. Florian Pose <fp@igh-essen.com> parents: 1156 diff changeset	229	}
1156 ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	230	}
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	231	} else { // alias given
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	232	if (position == -1) { // alias, but no position given
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	233	// take all items with a given alias
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	234	for (i = 0; i < master.config_count; i++) {
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	235	m.getConfig(&config, i);
1157 04d1c950cf9d Added --help for alias and position parameters. Florian Pose <fp@igh-essen.com> parents: 1156 diff changeset	236	if (config.alias == alias) {
1156 ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	237	list.push_back(config);
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	238	}
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	239	}
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	240	} else { // alias and position given
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	241	for (i = 0; i < master.config_count; i++) {
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	242	m.getConfig(&config, i);
1157 04d1c950cf9d Added --help for alias and position parameters. Florian Pose <fp@igh-essen.com> parents: 1156 diff changeset	243	if (config.alias == alias && config.position == position) {
1156 ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	244	list.push_back(config);
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	245	break; // there can be at most one matching
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	246	}
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	247	}
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	248	}
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	249	}
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	250
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	251	list.sort();
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	252	return list;
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	253	}
ecaf2a896ea3 Implemented alias and position for configs. Florian Pose <fp@igh-essen.com> parents: 1155 diff changeset	254
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: diff changeset	255	/****************************************************************************/
1146 f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	256
1166 006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	257	Command::DomainList Command::selectedDomains(MasterDevice &m)
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	258	{
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	259	ec_ioctl_domain_t d;
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	260	DomainList list;
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	261
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	262	if (domain == -1) {
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	263	ec_ioctl_master_t master;
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	264	unsigned int i;
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	265
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	266	m.getMaster(&master);
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	267
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	268	for (i = 0; i < master.domain_count; i++) {
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	269	m.getDomain(&d, i);
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	270	list.push_back(d);
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	271	}
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	272	} else {
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	273	m.getDomain(&d, domain);
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	274	list.push_back(d);
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	275	}
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	276
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	277	return list;
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	278	}
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	279
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	280	/****************************************************************************/
006244d53f68 Removed global variables. Florian Pose <fp@igh-essen.com> parents: 1160 diff changeset	281
1146 f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	282	string Command::alStateString(uint8_t state)
f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	283	{
f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	284	switch (state) {
f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	285	case 1: return "INIT";
f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	286	case 2: return "PREOP";
1709 63e4bc918640 Implemented going to bootstrap state BOOT. Florian Pose <fp@igh-essen.com> parents: 1707 diff changeset	287	case 3: return "BOOT";
1146 f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	288	case 4: return "SAFEOP";
f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	289	case 8: return "OP";
f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	290	default: return "???";
f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	291	}
f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	292	}
f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	293
f18d124d7fbc Moved slaveState() to Command::alStateString(). Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	294	/****************************************************************************/

author	Florian Pose <fp@igh-essen.com>
	Mon, 19 Jan 2009 14:46:55 +0000
branch	1.4-foe
changeset 1709	63e4bc918640
parent 1707	11ec009e145d
child 1363	11c0b2caa253
permissions	-rw-r--r--