patch-2.3.6 linux/include/linux/parport.h

• Lines: 61
• Date: Tue Jun 8 23:04:38 1999
• Orig file: v2.3.5/linux/include/linux/parport.h
• Orig date: Mon May 31 22:28:06 1999

diff -u --recursive --new-file v2.3.5/linux/include/linux/parport.h linux/include/linux/parport.h
@@ -103,9 +103,6 @@
 
 	void (*change_mode)(struct parport *, int);
 
-	void (*release_resources)(struct parport *);
-	int (*claim_resources)(struct parport *);
-
 	void (*epp_write_data)(struct parport *, unsigned char);
 	unsigned char (*epp_read_data)(struct parport *);
 	void (*epp_write_addr)(struct parport *, unsigned char);
@@ -169,6 +166,7 @@
 	unsigned int waiting;
 	struct pardevice *waitprev;
 	struct pardevice *waitnext;
+        void * sysctl_table;
 };
 
 /* Directory information for the /proc interface */
@@ -210,6 +208,7 @@
 	spinlock_t pardevice_lock;
 	spinlock_t waitlist_lock;
 	rwlock_t cad_lock;
+        void * sysctl_table;
 };
 
 struct parport_driver {
@@ -240,10 +239,6 @@
 /* parport_in_use returns nonzero if there are devices attached to a port. */
 #define parport_in_use(x)  ((x)->devices != NULL)
 
-/* Put a parallel port to sleep; release its hardware resources.  Only possible
- * if no devices are registered.  */
-extern void parport_quiesce(struct parport *);
-
 /* parport_enumerate returns a pointer to the linked list of all the ports
  * in this machine.
  */
@@ -339,7 +334,7 @@
 #define PARPORT_DEV_LURK		(1<<0)	/* WARNING !! DEPRECATED !! */
 #define PARPORT_DEV_EXCL		(1<<1)	/* Need exclusive access. */
 
-#define PARPORT_FLAG_COMA		(1<<0)
+#define PARPORT_FLAG_COMA_		(1<<0)  /* No longer used. */
 #define PARPORT_FLAG_EXCL		(1<<1)	/* EXCL driver registered. */
 
 extern int parport_parse_irqs(int, const char *[], int irqval[]);
@@ -349,10 +344,12 @@
 				   char);
 
 /* Prototypes from parport_procfs */
-extern int parport_proc_init(void);
-extern void parport_proc_cleanup(void);
 extern int parport_proc_register(struct parport *pp);
 extern int parport_proc_unregister(struct parport *pp);
+extern int parport_device_proc_register(struct pardevice *device);
+extern int parport_device_proc_unregister(struct pardevice *device);
+extern int parport_default_proc_register(void);
+extern int parport_default_proc_unregister(void);
 
 extern void dec_parport_count(void);
 extern void inc_parport_count(void);