Update of /cvsroot/linux-vax/kernel-2.4/drivers/vsbus
In directory usw-pr-cvs1:/tmp/cvs-serv13138/drivers/vsbus
Modified Files:
vsbus.c
Log Message:
Added code to use new KA55 define for base registers
Index: vsbus.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/vsbus/vsbus.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vsbus.c 2001/11/12 23:54:44 1.7
+++ vsbus.c 2002/02/04 22:56:50 1.8
@@ -15,6 +15,7 @@
#include <asm/mv.h>
#include <asm/ka43.h>
extern struct vax_mv mv_ka46;
+extern struct vax_mv mv_ka55;
struct vsbus {
struct vs_cpu *vs_cpu_ptr;
@@ -26,21 +27,21 @@
{
unsigned long irqs;
- sys_vs.vs_cpu_ptr=(void *)ioremap(VSA_BASE_REGS, 128);
+ if (!is_ka55())
+ sys_vs.vs_cpu_ptr=(void *)ioremap(VSA_BASE_REGS, 128);
+ else
+ sys_vs.vs_cpu_ptr=(void *)ioremap(VSA_KA55_BASE_REGS,128);
sys_vs.vs_mask=sys_vs.vs_cpu_ptr->vc_intreq;
- printk("vsbus: interrupt mask %x\n", sys_vs.vs_mask);
irqs=probe_irq_on();
-
+
sys_vs.vs_cpu_ptr->vc_intmsk=0;
sys_vs.vs_cpu_ptr->vc_intclr=0xFF;
- // printk("vsbus: Getting Interrupt Mask\n");
mdelay(1000);
sys_vs.vs_mask=sys_vs.vs_cpu_ptr->vc_intreq;
-
+
/* switch off all interrupts for now */
sys_vs.vs_cpu_ptr->vc_intmsk=0; /*~sys_vs.vs_mask;*/
probe_irq_off(irqs);
- printk("vsbus: interrupt mask %x\n", sys_vs.vs_mask);
return 0;
}
@@ -85,3 +86,6 @@
}
int is_ka46(void) { return (mv==&mv_ka46); }
+
+int is_ka55(void) { return (mv==&mv_ka55); }
+
|
