Bus -> Ivy

Simplified management of different versions of channel management.
SetChannelManagement has disappeared.

3 files changed, 21 insertions, 19 deletions

diff --git a/src/ivychannel.h b/src/ivychannel.h
index b92ee93..ed6ef44 100644
--- a/src/ivychannel.h
+++ b/src/ivychannel.h
@@ -2,7 +2,7 @@
  *
  * Ivy, C interface
  *
- * Copyright 1997-1998 
+ * Copyright 1997-1999
  * Centre d'Etudes de la Navigation Aerienne
  *
  * Basic I/O handling
@@ -38,16 +38,18 @@ typedef void (*ChannelInit)(void);
 						
 /* fonction appele par le bus pour mise en place des callback sur le canal */
 typedef Channel (*ChannelSetUp)(
-						HANDLE fd,
-						void *data,
-						ChannelHandleDelete handle_delete,
-						ChannelHandleRead handle_read
-						);
+	HANDLE fd,
+	void *data,
+	ChannelHandleDelete handle_delete,
+	ChannelHandleRead handle_read
+);
+
 /* fonction appele par le bus pour fermeture du canal */
 typedef void (*ChannelClose)( Channel channel );
 
-/* mise en place des fonction de gestion des canaux */
-void BusSetChannelManagement( ChannelInit init_chan, ChannelSetUp setup_chan, ChannelClose close_chan );
+extern ChannelInit channel_init;
+extern ChannelClose channel_close;
+extern ChannelSetUp channel_setup;
 
 #ifdef __cplusplus
 }
diff --git a/src/ivysocket.h b/src/ivysocket.h
index 4641bfa..5e8d2c0 100644
--- a/src/ivysocket.h
+++ b/src/ivysocket.h
@@ -2,7 +2,7 @@
  *
  * Ivy, C interface
  *
- * Copyright 1997-1998 
+ * Copyright 1997-1999
  * Centre d'Etudes de la Navigation Aerienne
  *
  * Sockets
diff --git a/src/ivyxtloop.h b/src/ivyxtloop.h
index 0784714..591d6a1 100644
--- a/src/ivyxtloop.h
+++ b/src/ivyxtloop.h
@@ -2,7 +2,7 @@
  *
  * Ivy, C interface
  *
- * Copyright 1997-1998 
+ * Copyright 1997-1999
  * Centre d'Etudes de la Navigation Aerienne
  *
  * Main loop based on X Toolkit
@@ -33,18 +33,18 @@ extern "C" {
 
 #include "ivychannel.h"
 
-extern void BusXtChannelInit(void);
+extern void IvyXtChannelInit(void);
 
-extern Channel BusXtChannelSetUp(
-						HANDLE fd,
-						void *data,
-						ChannelHandleDelete handle_delete,
-						ChannelHandleRead handle_read
-						);
+extern Channel IvyXtChannelSetUp(
+		HANDLE fd,
+		void *data,
+		ChannelHandleDelete handle_delete,
+		ChannelHandleRead handle_read
+);
 
-extern void BusXtChannelClose( Channel channel );
+extern void IvyXtChannelClose( Channel channel );
 
-extern void BusXtChannelAppContext( XtAppContext cntx );
+extern void IvyXtChannelAppContext( XtAppContext cntx );
 
 #ifdef __cplusplus
 }