Commit 833ce917 authored by Vitaly Lipatov's avatar Vitaly Lipatov

add comments and fix tabs

parent b5a34d4b
...@@ -742,7 +742,7 @@ void IOControl::initIOCard() ...@@ -742,7 +742,7 @@ void IOControl::initIOCard()
try try
{ {
// / // /
// "" (.. ) // "" (.. )
if( it->lamp ) if( it->lamp )
card->configureChannel(it->subdev,it->channel,ComediInterface::DO); card->configureChannel(it->subdev,it->channel,ComediInterface::DO);
else if( it->stype == UniversalIO::DigitalInput ) else if( it->stype == UniversalIO::DigitalInput )
......
...@@ -87,10 +87,10 @@ class TriggerOR ...@@ -87,10 +87,10 @@ class TriggerOR
bool getState(InputType in); bool getState(InputType in);
bool commit(InputType in, bool state); bool commit(InputType in, bool state);
void add(InputType in, bool state); void add(InputType in, bool state);
void remove(InputType in); void remove(InputType in);
typedef std::map<InputType, bool> InputMap; typedef std::map<InputType, bool> InputMap;
...@@ -104,7 +104,7 @@ class TriggerOR ...@@ -104,7 +104,7 @@ class TriggerOR
return inputs.end(); return inputs.end();
} }
void update(); void update();
void reset(); void reset();
protected: protected:
......
...@@ -85,7 +85,7 @@ class TriggerOutput ...@@ -85,7 +85,7 @@ class TriggerOutput
\param out - '' \param out - ''
\param val - \param val -
*/ */
typedef void(Caller::* Action)(OutIdType out, ValueType val); typedef void(Caller::* Action)(OutIdType out, ValueType val);
TriggerOutput(Caller* r, Action a); TriggerOutput(Caller* r, Action a);
~TriggerOutput(); ~TriggerOutput();
...@@ -98,16 +98,16 @@ class TriggerOutput ...@@ -98,16 +98,16 @@ class TriggerOutput
\param out - '' \param out - ''
\param val - \param val -
*/ */
void set(OutIdType out, ValueType val); void set(OutIdType out, ValueType val);
/*! '' . /*! '' .
\param out - '' \param out - ''
\param val - \param val -
*/ */
void add(OutIdType out, ValueType val); void add(OutIdType out, ValueType val);
/*! '' */ /*! '' */
void remove(OutIdType out); void remove(OutIdType out);
void update(); void update();
void reset(); void reset();
......
...@@ -318,7 +318,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv ) ...@@ -318,7 +318,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
new_argv[i] = "-ORBInitRef"; new_argv[i] = "-ORBInitRef";
string name(oind->getRealNodeName(it->id)); string name(oind->getRealNodeName(it->id));
ostringstream param; ostringstream param;
param << name << "=corbaname::" << it->host << ":" << it->port; param << name << "=corbaname::" << it->host << ":" << it->port;
new_argv[i+1] = strdup(param.str().c_str()); new_argv[i+1] = strdup(param.str().c_str());
......
...@@ -198,7 +198,7 @@ character(ch), ...@@ -198,7 +198,7 @@ character(ch),
broadcast(true), broadcast(true),
route(false) route(false)
{ {
this->node = node; this->node = node;
type = Message::Info; type = Message::Info;
this->priority = priority; this->priority = priority;
this->consumer = consumer; this->consumer = consumer;
......
...@@ -39,6 +39,12 @@ ...@@ -39,6 +39,12 @@
using namespace UniSetTypes; using namespace UniSetTypes;
using namespace std; using namespace std;
/* FIXME:
,
, .
libxmlmm.
UniXML.
*/
const string UniXML::InternalEncoding("koi8-r"); const string UniXML::InternalEncoding("koi8-r");
const string UniXML::ExternalEncoding("koi8-r"); const string UniXML::ExternalEncoding("koi8-r");
const string UniXML::xmlEncoding("utf-8"); const string UniXML::xmlEncoding("utf-8");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment