patch-2.2.15 linux/include/net/irda/irmod.h

• Lines: 75
• Date: Fri Apr 21 23:18:42 2000
• Orig file: v2.2.14/include/net/irda/irmod.h
• Orig date: Sat Aug 14 02:26:01 1999

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/include/net/irda/irmod.h linux/include/net/irda/irmod.h
@@ -6,10 +6,10 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Mon Dec 15 13:58:52 1997
- * Modified at:   Fri Apr  9 11:13:39 1999
+ * Modified at:   Sun Oct 31 20:01:17 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  *
- *     Copyright (c) 1998 Dag Brattli, All Rights Reserved.
+ *     Copyright (c) 1998-1999 Dag Brattli, All Rights Reserved.
  *      
  *     This program is free software; you can redistribute it and/or 
  *     modify it under the terms of the GNU General Public License as 
@@ -42,10 +42,10 @@
 	EVENT_REQUEST_MODULE,
 	EVENT_IRLAN_START,
 	EVENT_IRLAN_STOP,
-	EVENT_IRLPT_START,
-	EVENT_IRLPT_STOP,
-	EVENT_IROBEX_START,
-	EVENT_IROBEX_STOP,
+	EVENT_IRLPT_START,  /* Obsolete */
+	EVENT_IRLPT_STOP,   /* Obsolete */
+	EVENT_IROBEX_START, /* Obsolete */
+	EVENT_IROBEX_STOP,  /* Obsolete */
 	EVENT_IRDA_STOP,
 	EVENT_NEED_PROCESS_CONTEXT,
 } IRMGR_EVENT;
@@ -69,7 +69,7 @@
  *  addtional information
  */
 struct irda_event {
-	QUEUE q; /* Must be first */
+	queue_t q; /* Must be first */
 	
 	struct irmanager_event event;
 };
@@ -78,7 +78,7 @@
  *  Funtions with needs to be called with a process context
  */
 struct irda_todo {
-	QUEUE q; /* Must be first */
+	queue_t q; /* Must be first */
 
 	void *self;
 	TODO_CALLBACK callback;
@@ -94,8 +94,8 @@
 
 	int in_use;
 
-	QUEUE *event_queue; /* Events queued for the irmanager */
-	QUEUE *todo_queue;  /* Todo list */
+	queue_t *event_queue; /* Events queued for the irmanager */
+	queue_t *todo_queue;  /* Todo list */
 };
 
 int irmod_init_module(void);
@@ -110,7 +110,7 @@
 static inline int irda_lock(int *lock) 
 {
 	if (test_and_set_bit( 0, (void *) lock))  {
-		DEBUG(3, __FUNCTION__ 
+		IRDA_DEBUG(3, __FUNCTION__ 
 		      "(), Trying to lock, already locked variable!\n");
 		return FALSE;
         }  
@@ -119,7 +119,7 @@
 
 inline int irda_unlock(int *lock);
 
-void irda_notify_init(struct notify_t *notify);
+void irda_notify_init(notify_t *notify);
 
 void irda_execute_as_process(void *self, TODO_CALLBACK callback, __u32 param);
 void irmanager_notify(struct irmanager_event *event);