[LV-kern-commit] CVS: kernel-2.4/drivers/vsbus vsbus.c,1.1,1.2

[Dave A. <ai...@us...>]

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

Modified Files:
	vsbus.c 
Log Message:
move cpu_ptr into a structure .. write intclr at setup time


Index: vsbus.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/vsbus/vsbus.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vsbus.c	2001/01/26 00:27:00	1.1
+++ vsbus.c	2001/02/22 23:52:21	1.2
@@ -9,32 +9,36 @@
 #include <asm/vsa.h>
 #include <asm/io.h>
 
-struct vs_cpu *vs_cpu_ptr;
+struct vsbus {
+  struct vs_cpu *vs_cpu_ptr;
+  unsigned char vs_mask;
+  unsigned char vs_enabled;
+} sys_vs;
 
-int vsa_setup(void)
+int vsbus_setup(void)
 {
-  vs_cpu_ptr=(void *)ioremap(VSA_BASE_REGS, 128);
+  sys_vs.vs_cpu_ptr=(void *)ioremap(VSA_BASE_REGS, 128);
   
-  vs_cpu_ptr->vc_intreq=0;
+  sys_vs.vs_cpu_ptr->vc_intclr=0xFF;
    
   return 0;
 }
 
-int vsa_enable_int(int bit_nr)
+int vsbus_enable_int(int bit_nr)
 {
-  vs_cpu_ptr->vc_intmsk=1<<bit_nr;
+  sys_vs.vs_cpu_ptr->vc_intmsk=1<<bit_nr;
 
   return 0;
 }
 
-int vsa_clear_int(int bit_nr)
+int vsbus_clear_int(int bit_nr)
 {
-  vs_cpu_ptr->vc_intclr=1<<bit_nr;
+  sys_vs.vs_cpu_ptr->vc_intclr=1<<bit_nr;
 
   return 0;
 }
 
-int vsa_probe_irq(void)
+int vsbus_probe_irq(void)
 {
   return 0;
 }