[LV-kern-commit] CVS: kernel-2.4/drivers/char dz.c,1.7,1.8

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv32063/char

Modified Files:
	dz.c 
Log Message:
Slightly better irq handling. is_ka46 now can be used to switch 
on the fly between system dependent behaviour, so we can use the same
kernel config on two machines.


Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dz.c	2001/08/14 21:25:43	1.7
+++ dz.c	2001/09/16 15:13:09	1.8
@@ -1301,7 +1301,7 @@
 
   if ((line == DZ_KEYBOARD) || (line == DZ_MOUSE))
     return -ENODEV;
-  printk("dz opening line %d\n",line);
+//  printk("dz opening line %d\n",line);
   info = lines[line];
   info->count++;
 
@@ -1490,11 +1490,16 @@
     vsbus_disable_int(num);
     irq=autoirq_report(100);     
   }
-#else
+#else    
+if (is_ka46()){
   dz_vsbus_tx_int=4;
   dz_vsbus_rx_int=5;
   irq=149;
-
+} else {
+  dz_vsbus_tx_int=6;
+  dz_vsbus_rx_int=7;
+  irq=177;
+}
 #endif
   printk("dz.c: using irq rx %d, irq tx %d\n", irq-1, irq);