patch-2.4.0-test3 linux/drivers/cdrom/mcd.h

• Lines: 19
• Date: Wed Jul 5 11:24:41 2000
• Orig file: v2.4.0-test2/linux/drivers/cdrom/mcd.h
• Orig date: Mon Apr 12 16:18:28 1999

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/cdrom/mcd.h linux/drivers/cdrom/mcd.h
@@ -73,12 +73,13 @@
 #define READ_DATA(port, buf, nr) \
 insb(port, buf, nr)
 
-#define SET_TIMER(func, jifs) \
-	((timer_table[MCD_TIMER].expires = jiffies + jifs), \
-	(timer_table[MCD_TIMER].fn = func), \
-	(timer_active |= 1<<MCD_TIMER))
+#define SET_TIMER(func, jifs) 				\
+	do {						\
+		mcd_timer.function = func;		\
+		mod_timer(&mcd_timer, jiffies + jifs);	\
+	} while (0)
 
-#define CLEAR_TIMER		timer_active &= ~(1<<MCD_TIMER)
+#define CLEAR_TIMER		del_timer_async(&mcd_timer);
 
 #define MAX_TRACKS		104