Merge atnf.csiro.au:/workaholix1/kernel/v2.5/linus

into atnf.csiro.au:/workaholix1/kernel/v2.5/rgooch-2.5

3 files changed, 21 insertions, 11 deletions

diff --git a/include/linux/b1lli.h b/include/linux/b1lli.h
index 24ec4670a033..713f712685d3 100644
--- a/include/linux/b1lli.h
+++ b/include/linux/b1lli.h
@@ -61,12 +61,12 @@ typedef struct avmb1_extcarddef {
 } avmb1_extcarddef;
 
 #define	AVMB1_LOAD		0	/* load image to card */
-#define AVMB1_ADDCARD		1	/* add a new card */
+#define AVMB1_ADDCARD		1	/* add a new card - OBSOLETE */
 #define AVMB1_RESETCARD		2	/* reset a card */
 #define	AVMB1_LOAD_AND_CONFIG	3	/* load image and config to card */
 #define	AVMB1_ADDCARD_WITH_TYPE	4	/* add a new card, with cardtype */
 #define AVMB1_GET_CARDINFO	5	/* get cardtype */
-#define AVMB1_REMOVECARD	6	/* remove a card (useful for T1) */
+#define AVMB1_REMOVECARD	6	/* remove a card - OBSOLETE */
 
 #define	AVMB1_REGISTERCARD_IS_OBSOLETE
 
diff --git a/include/linux/isdn/capilli.h b/include/linux/isdn/capilli.h
index 76eb4e1d2fad..cd10cf67b6f3 100644
--- a/include/linux/isdn/capilli.h
+++ b/include/linux/isdn/capilli.h
@@ -12,7 +12,10 @@
 #ifndef __CAPILLI_H__
 #define __CAPILLI_H__
 
+#include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/capi.h>
+#include <linux/kernelcapi.h>
 
 typedef struct capiloaddatapart {
 	int user;		/* data in userspace ? */
@@ -60,10 +63,6 @@ struct capi_ctr {
         void (*handle_capimsg)(struct capi_ctr * card,
 			   	__u16 appl, struct sk_buff *skb);
 
-        void (*new_ncci)(struct capi_ctr * card,
-			   	__u16 appl, __u32 ncci, __u32 winsize);
-        void (*free_ncci)(struct capi_ctr * card, __u16 appl, __u32 ncci);
-
 	/* management information for kcapi */
 
 	unsigned long nrecvctlpkt;
@@ -81,11 +80,10 @@ struct capi_driver {
 	char revision[32];
 	int (*load_firmware)(struct capi_ctr *, capiloaddata *);
 	void (*reset_ctr)(struct capi_ctr *);
-	void (*remove_ctr)(struct capi_ctr *);
 	void (*register_appl)(struct capi_ctr *, __u16 appl,
 			      capi_register_params *);
 	void (*release_appl)(struct capi_ctr *, __u16 appl);
-	void (*send_message)(struct capi_ctr *, struct sk_buff *skb);
+	u16  (*send_message)(struct capi_ctr *, struct sk_buff *skb);
 	
 	char *(*procinfo)(struct capi_ctr *);
 	int (*ctr_read_proc)(char *page, char **start, off_t off,
@@ -93,8 +91,6 @@ struct capi_driver {
 	int (*driver_read_proc)(char *page, char **start, off_t off,
 				int count, int *eof, struct capi_driver *driver);
 	
-	int (*add_card)(struct capi_driver *driver, capicardparams *data);
-	
 	/* intitialized by kcapi */
 	struct list_head contr_head;		/* list of controllers */
 	struct list_head driver_list;
@@ -109,4 +105,16 @@ void detach_capi_driver(struct capi_driver *driver);
 struct capi_ctr *attach_capi_ctr(struct capi_driver *driver, char *name, void *data);
 int detach_capi_ctr(struct capi_ctr *);
 
+
+
+// ---------------------------------------------------------------------------
+// library functions for use by hardware controller drivers
+
+void capilib_new_ncci(struct list_head *head, u16 applid, u32 ncci, u32 winsize);
+void capilib_free_ncci(struct list_head *head, u16 applid, u32 ncci);
+void capilib_release_appl(struct list_head *head, u16 applid);
+void capilib_release(struct list_head *head);
+void capilib_data_b3_conf(struct list_head *head, u16 applid, u32 ncci, u16 msgid);
+u16  capilib_data_b3_req(struct list_head *head, u16 applid, u32 ncci, u16 msgid);
+
 #endif				/* __CAPILLI_H__ */
diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h
index c162ff96f53b..e6312ebffbc4 100644
--- a/include/linux/kernelcapi.h
+++ b/include/linux/kernelcapi.h
@@ -32,7 +32,7 @@ typedef struct kcapi_carddef {
 
 /* new ioctls >= 10 */
 #define KCAPI_CMD_TRACE		10
-#define KCAPI_CMD_ADDCARD	11	/* add card to named driver */
+#define KCAPI_CMD_ADDCARD	11	/* OBSOLETE */
 
 /* 
  * flag > 2 => trace also data
@@ -47,6 +47,8 @@ typedef struct kcapi_carddef {
 
 #ifdef __KERNEL__
 
+#include <linux/skbuff.h>
+
 struct capi_interface {
 	__u16 (*capi_isinstalled) (void);