patch-2.2.16 linux/drivers/block/ide.h

• Lines: 30
• Date: Wed Jun 7 14:26:42 2000
• Orig file: v2.2.15/linux/drivers/block/ide.h
• Orig date: Tue Jan 4 10:12:14 2000

diff -urN v2.2.15/linux/drivers/block/ide.h linux/drivers/block/ide.h
@@ -365,6 +365,12 @@
  */
 typedef ide_startstop_t (ide_handler_t)(ide_drive_t *);
 
+/*
+ * when ide_timer_expiry fires, invoke a handler of this type
+ * to decide what to do.
+ */
+typedef int (ide_expiry_t)(ide_drive_t *);
+
 typedef struct hwgroup_s {
 	ide_handler_t		*handler;/* irq handler, if active */
 	volatile int		busy;	/* BOOL: protects all fields below */
@@ -375,6 +381,7 @@
 	struct timer_list	timer;	/* failsafe timer */
 	struct request		wrq;	/* local copy of current write rq */
 	unsigned long		poll_timeout;	/* timeout value during long polls */
+	ide_expiry_t		*expiry; /* queried upon timeouts */
 	} ide_hwgroup_t;
 
 /*
@@ -545,7 +552,7 @@
  * This is used on exit from the driver, to designate the next irq handler
  * and also to start the safety timer.
  */
-void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigned int timeout);
+void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry);
 
 /*
  * Error reporting, in human readable form (luxurious, but a memory hog).