Fixes for 2.6.8 compilation:

* Replace the completion variable with two atomic counters and a wait queue
  the xbus_poll() code is revamped to use this.
* genzaptelconf: Adapt to different module parameter location in sysfs .

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1416 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 5 insertions, 2 deletions

diff --git a/xpp/xpd.h b/xpp/xpd.h
index 6a66b8d..3c6229f 100644
--- a/xpp/xpd.h
+++ b/xpp/xpd.h
@@ -132,7 +132,6 @@ struct	card_desc_struct {
 	xpd_addr_t		xpd_addr;
 };
 
-
 /*
  * An xbus is a transport layer for Xorcom Protocol commands
  */
@@ -164,8 +163,12 @@ struct xbus {
 	atomic_t		count_poll_answers;
 	struct list_head	poll_results;
 	wait_queue_head_t	wait_for_polls;
+
 	struct work_struct	xpds_init_work;
-	struct completion	xpds_initialized;
+
+	atomic_t		count_xpds_to_initialize;
+	atomic_t		count_xpds_initialized;
+	wait_queue_head_t	wait_for_xpd_initialization;
 
 	struct	rw_semaphore	in_use;
 	int			num_xpds;