patch-2.3.9 linux/arch/mips/sni/setup.c

• Lines: 78
• Date: Fri Jun 25 17:40:13 1999
• Orig file: v2.3.8/linux/arch/mips/sni/setup.c
• Orig date: Tue Oct 20 13:52:55 1998

diff -u --recursive --new-file v2.3.8/linux/arch/mips/sni/setup.c linux/arch/mips/sni/setup.c
@@ -1,4 +1,4 @@
-/* $Id: setup.c,v 1.13 1998/08/17 13:57:45 ralf Exp $
+/* $Id: setup.c,v 1.10 1999/01/04 16:03:59 ralf Exp $
  *
  * Setup pointers to hardware-dependent routines.
  *
@@ -17,6 +17,11 @@
 #include <linux/interrupt.h>
 #include <linux/timex.h>
 #include <linux/pci.h>
+#include <linux/mc146818rtc.h>
+#include <linux/console.h>
+#include <linux/fb.h>
+#include <linux/pc_keyb.h>
+
 #include <asm/bcache.h>
 #include <asm/bootinfo.h>
 #include <asm/keyboard.h>
@@ -39,7 +44,6 @@
 static struct irqaction irq2  = { no_action, 0, 0, "cascade", NULL, NULL};
 
 extern asmlinkage void sni_rm200_pci_handle_int(void);
-extern void sni_rm200_keyboard_setup(void);
 
 extern void sni_machine_restart(char *command);
 extern void sni_machine_halt(void);
@@ -47,19 +51,20 @@
 
 extern struct ide_ops std_ide_ops;
 extern struct rtc_ops std_rtc_ops;
+extern struct kbd_ops std_kbd_ops;
 
 __initfunc(static void sni_irq_setup(void))
 {
 	set_except_vector(0, sni_rm200_pci_handle_int);
 	request_region(0x20,0x20, "pic1");
 	request_region(0xa0,0x20, "pic2");	
-	setup_x86_irq(2, &irq2);
+	i8259_setup_irq(2, &irq2);
 	/*
 	 * IRQ0 seems to be the irq for PC style stuff.
 	 * I don't know how to handle the debug button interrupt, so
 	 * don't use this button yet or bad things happen ...
 	 */
-	set_cp0_status(ST0_IM, IE_IRQ1 | IE_IRQ4);
+	set_cp0_status(ST0_IM, IE_IRQ1 | IE_IRQ3 | IE_IRQ4);
 }
 
 void (*board_time_init)(struct irqaction *irq);
@@ -70,7 +75,7 @@
 	outb_p(0x34,0x43);		/* binary, mode 2, LSB/MSB, ch 0 */
 	outb_p(LATCH & 0xff , 0x40);	/* LSB */
 	outb(LATCH >> 8 , 0x40);	/* MSB */
-	setup_x86_irq(0, irq);
+	i8259_setup_irq(0, irq);
 }
 
 unsigned char aux_device_present;
@@ -132,7 +137,6 @@
 
 	irq_setup = sni_irq_setup;
 	mips_io_port_base = SNI_PORT_BASE;
-	keyboard_setup = sni_rm200_keyboard_setup;
 
 	/*
 	 * Setup (E)ISA I/O memory access stuff
@@ -165,6 +169,10 @@
 #ifdef CONFIG_BLK_DEV_IDE
 	ide_ops = &std_ide_ops;
 #endif
-
+	conswitchp = &vga_con;
 	rtc_ops = &std_rtc_ops;
+	kbd_ops = &std_kbd_ops;
+#ifdef CONFIG_PSMOUSE
+	aux_device_present = 0xaa;
+#endif
 }