diff options
Diffstat (limited to 'src/systemc/ext/channel')
-rw-r--r-- | src/systemc/ext/channel/sc_event_queue.hh | 2 | ||||
-rw-r--r-- | src/systemc/ext/channel/sc_fifo.hh | 4 | ||||
-rw-r--r-- | src/systemc/ext/channel/sc_mutex.hh | 2 | ||||
-rw-r--r-- | src/systemc/ext/channel/sc_semaphore.hh | 2 | ||||
-rw-r--r-- | src/systemc/ext/channel/sc_signal.hh | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/systemc/ext/channel/sc_event_queue.hh b/src/systemc/ext/channel/sc_event_queue.hh index 05ff46ecb..d9b041da9 100644 --- a/src/systemc/ext/channel/sc_event_queue.hh +++ b/src/systemc/ext/channel/sc_event_queue.hh @@ -72,7 +72,7 @@ class sc_event_queue : public sc_event_queue_if, public sc_module private: void _trigger(); - sc_event _defaultEvent; + sc_gem5::InternalScEvent _defaultEvent; std::priority_queue< sc_time, std::vector<sc_time>, std::greater<sc_time> > _times; }; diff --git a/src/systemc/ext/channel/sc_fifo.hh b/src/systemc/ext/channel/sc_fifo.hh index 02a0ddb98..a1c454a8f 100644 --- a/src/systemc/ext/channel/sc_fifo.hh +++ b/src/systemc/ext/channel/sc_fifo.hh @@ -211,8 +211,8 @@ class sc_fifo : public sc_fifo_in_if<T>, {} sc_fifo &operator = (const sc_fifo<T> &) { return *this; } - sc_event _dataReadEvent; - sc_event _dataWriteEvent; + sc_gem5::InternalScEvent _dataReadEvent; + sc_gem5::InternalScEvent _dataWriteEvent; sc_port_base *_reader; sc_port_base *_writer; diff --git a/src/systemc/ext/channel/sc_mutex.hh b/src/systemc/ext/channel/sc_mutex.hh index 12205da9b..0b85ca68f 100644 --- a/src/systemc/ext/channel/sc_mutex.hh +++ b/src/systemc/ext/channel/sc_mutex.hh @@ -56,7 +56,7 @@ class sc_mutex : public sc_mutex_if, public sc_object sc_mutex &operator = (const sc_mutex &) { return *this; } sc_process_handle holder; - sc_event unlockEvent; + sc_gem5::InternalScEvent unlockEvent; }; } // namespace sc_core diff --git a/src/systemc/ext/channel/sc_semaphore.hh b/src/systemc/ext/channel/sc_semaphore.hh index 31af9c708..3669f771e 100644 --- a/src/systemc/ext/channel/sc_semaphore.hh +++ b/src/systemc/ext/channel/sc_semaphore.hh @@ -59,7 +59,7 @@ class sc_semaphore : public sc_semaphore_if, public sc_object sc_semaphore &operator = (const sc_semaphore &) { return *this; } int _value; - sc_event posted; + sc_gem5::InternalScEvent posted; }; } // namespace sc_core diff --git a/src/systemc/ext/channel/sc_signal.hh b/src/systemc/ext/channel/sc_signal.hh index 3b2765db5..522638dde 100644 --- a/src/systemc/ext/channel/sc_signal.hh +++ b/src/systemc/ext/channel/sc_signal.hh @@ -71,7 +71,7 @@ class ScSignalBase : public sc_core::sc_prim_channel virtual sc_core::sc_writer_policy get_writer_policy() const = 0; - sc_core::sc_event _valueChangedEvent; + InternalScEvent _valueChangedEvent; uint64_t _changeStamp; sc_core::sc_port_base *_gem5WriterPort; }; @@ -91,8 +91,8 @@ class ScSignalBaseBinary : public ScSignalBase bool posedge() const; bool negedge() const; - sc_core::sc_event _posedgeEvent; - sc_core::sc_event _negedgeEvent; + InternalScEvent _posedgeEvent; + InternalScEvent _negedgeEvent; uint64_t _posStamp; uint64_t _negStamp; |