From deb6813aee8c0fdc0878df8580d807846fbff3dc Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 2 Oct 2001 01:10:21 +0000 Subject: [PATCH] changed clear channel interface --- src/ca/netiiu.h | 4 ++-- src/ca/virtualCircuit.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ca/netiiu.h b/src/ca/netiiu.h index b7549af8e..4f69cca08 100644 --- a/src/ca/netiiu.h +++ b/src/ca/netiiu.h @@ -51,9 +51,9 @@ public: virtual void writeNotifyRequest ( nciu &, netWriteNotifyIO &, unsigned type, unsigned nElem, const void *pValue ); virtual void readNotifyRequest ( nciu &, netReadNotifyIO &, unsigned type, unsigned nElem ); virtual void createChannelRequest ( nciu & ); - virtual void clearChannelRequest ( nciu & ); + virtual void clearChannelRequest ( ca_uint32_t sid, ca_uint32_t cid ); virtual void subscriptionRequest ( nciu &, netSubscription &subscr ); - virtual void subscriptionCancelRequest ( nciu &, netSubscription &subscr ); + virtual void subscriptionCancelRequest ( nciu & chan, netSubscription & subscr ); virtual void flushRequest (); virtual bool flushBlockThreshold () const; virtual void flushRequestIfAboveEarlyThreshold (); diff --git a/src/ca/virtualCircuit.h b/src/ca/virtualCircuit.h index 431a98d5e..7da323034 100644 --- a/src/ca/virtualCircuit.h +++ b/src/ca/virtualCircuit.h @@ -73,6 +73,7 @@ public: virtual void show ( unsigned level ) const; bool setEchoRequestPending (); void requestRecvProcessPostponedFlush (); + void clearChannelRequest ( ca_uint32_t sid, ca_uint32_t cid ); bool ca_v41_ok () const; bool ca_v42_ok () const; @@ -132,9 +133,8 @@ private: void writeNotifyRequest ( nciu &, netWriteNotifyIO &, unsigned type, unsigned nElem, const void *pValue ); void readNotifyRequest ( nciu &, netReadNotifyIO &, unsigned type, unsigned nElem ); void createChannelRequest ( nciu & ); - void clearChannelRequest ( nciu & ); - void subscriptionRequest ( nciu &, netSubscription &subscr ); - void subscriptionCancelRequest ( nciu &, netSubscription &subscr ); + void subscriptionRequest ( nciu &, netSubscription & subscr ); + void subscriptionCancelRequest ( nciu & chan, netSubscription & subscr ); void flushIfRecvProcessRequested (); bool flush (); // only to be called by the send thread