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

• Lines: 79
• Date: Fri Apr 21 23:28:32 2000
• Orig file: v2.2.14/include/net/irda/irias_object.h
• Orig date: Sun Mar 7 23:26:43 1999

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/include/net/irda/irias_object.h linux/include/net/irda/irias_object.h
@@ -6,10 +6,10 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Thu Oct  1 22:49:50 1998
- * Modified at:   Wed Feb  3 10:38:02 1999
+ * Modified at:   Wed Dec 15 11:20:57 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 
@@ -25,6 +25,7 @@
 #ifndef LM_IAS_OBJECT_H
 #define LM_IAS_OBJECT_H
 
+#include <net/irda/irda.h>
 #include <net/irda/irqueue.h>
 
 /* LM-IAS Attribute types */
@@ -37,8 +38,8 @@
  *  LM-IAS Object
  */
 struct ias_object {
-	QUEUE queue;     /* Must be first! */
-	int magic;
+	queue_t q;     /* Must be first! */
+	magic_t magic;
 	
 	char  *name;
 	int   id;
@@ -65,19 +66,19 @@
  *  Attributes used by LM-IAS objects
  */
 struct ias_attrib {
-	QUEUE queue; /* Must be first! */
+	queue_t q; /* Must be first! */
 	int magic;
 
         char *name;   	         /* Attribute name */
 	struct ias_value *value; /* Attribute value */
 };
 
-char *strdup( char *str);
+char *strdup(char *str);
 
-struct ias_object *irias_new_object( char *name, int id);
-void irias_insert_object( struct ias_object *obj);
-void __irias_delete_object( struct ias_object *obj);
-void irias_delete_object( char *name);
+struct ias_object *irias_new_object(char *name, int id);
+void irias_insert_object(struct ias_object *obj);
+int  irias_delete_object(struct ias_object *obj);
+void __irias_delete_object(struct ias_object *obj);
 
 void irias_add_integer_attrib(struct ias_object *obj, char *name, int value);
 void irias_add_string_attrib(struct ias_object *obj, char *name, char *value);
@@ -85,13 +86,14 @@
 			     int len);
 int irias_object_change_attribute(char *obj_name, char *attrib_name, 
 				  struct ias_value *new_value);
-struct ias_object *irias_find_object( char *name);
-struct ias_attrib *irias_find_attrib( struct ias_object *obj, char *name);
+struct ias_object *irias_find_object(char *name);
+struct ias_attrib *irias_find_attrib(struct ias_object *obj, char *name);
 
-struct ias_value *irias_new_string_value( char *string);
-struct ias_value *irias_new_integer_value( int integer);
-struct ias_value *irias_new_octseq_value( __u8 *octseq , int len);
-void irias_delete_value( struct ias_value *value);
+struct ias_value *irias_new_string_value(char *string);
+struct ias_value *irias_new_integer_value(int integer);
+struct ias_value *irias_new_octseq_value(__u8 *octseq , int len);
+struct ias_value *irias_new_missing_value(void);
+void irias_delete_value(struct ias_value *value);
 
 extern struct ias_value missing;
 extern hashbin_t *objects;