Commit b62b9049 authored by ahoms's avatar ahoms
Browse files

* added EspiaDev::isMeta for Espia::MetaDev

* implemented EspiaAcq::acqLock calling that on EspiaDev


git-svn-id: https://scm.blissgarden.org/svn/lima/trunk@66 45c4679d-1946-429d-baad-37912b19538b
parent 43f52849
...@@ -16,6 +16,7 @@ class Espia ...@@ -16,6 +16,7 @@ class Espia
Invalid = SCDXIPCI_INVALID, Invalid = SCDXIPCI_INVALID,
NoBlock = SCDXIPCI_NO_BLOCK, NoBlock = SCDXIPCI_NO_BLOCK,
BlockForever = SCDXIPCI_BLOCK_FOREVER, BlockForever = SCDXIPCI_BLOCK_FOREVER,
MetaDev = SCDXIPCI_META_DEV,
}; };
unsigned long sec2usec(double sec); unsigned long sec2usec(double sec);
......
...@@ -106,6 +106,11 @@ inline void EspiaAcq::getStartTimestamp(Timestamp& start_ts) ...@@ -106,6 +106,11 @@ inline void EspiaAcq::getStartTimestamp(Timestamp& start_ts)
start_ts = m_start_ts; start_ts = m_start_ts;
} }
inline AutoMutex EspiaAcq::acqLock()
{
return m_dev.acqLock();
}
} // namespace lima } // namespace lima
......
...@@ -17,15 +17,17 @@ class EspiaDev : public Espia ...@@ -17,15 +17,17 @@ class EspiaDev : public Espia
operator espia_t(); operator espia_t();
bool isMeta();
void registerCallback(struct espia_cb_data& cb_data, int& cb_nr); void registerCallback(struct espia_cb_data& cb_data, int& cb_nr);
void unregisterCallback(int& cb_nr); void unregisterCallback(int& cb_nr);
AutoMutex acqLock();
private: private:
void open(int dev_nb); void open(int dev_nb);
void close(); void close();
AutoMutex acqLock();
int m_dev_nb; int m_dev_nb;
espia_t m_dev; espia_t m_dev;
...@@ -37,6 +39,10 @@ inline EspiaDev::operator espia_t() ...@@ -37,6 +39,10 @@ inline EspiaDev::operator espia_t()
return m_dev; return m_dev;
} }
inline bool EspiaDev::isMeta()
{
return (m_dev_nb == MetaDev);
}
inline AutoMutex EspiaDev::acqLock() inline AutoMutex EspiaDev::acqLock()
{ {
......
Supports Markdown
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