patch-2.1.126 linux/arch/mips/jazz/hw-access.c

• Lines: 190
• Date: Tue Oct 20 13:52:54 1998
• Orig file: v2.1.125/linux/arch/mips/jazz/hw-access.c
• Orig date: Thu Aug 6 14:06:28 1998

diff -u --recursive --new-file v2.1.125/linux/arch/mips/jazz/hw-access.c linux/arch/mips/jazz/hw-access.c
@@ -1,11 +1,12 @@
-/* $Id: hw-access.c,v 1.5 1998/05/07 00:39:27 ralf Exp $
+/* $Id: hw-access.c,v 1.11 1998/09/16 22:50:39 ralf Exp $
+ *
  * Low-level hardware access stuff for Jazz family machines.
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1995, 1996, 1997 by Ralf Baechle
+ * Copyright (C) 1995, 1996, 1997, 1998 by Ralf Baechle
  */
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -13,141 +14,10 @@
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <asm/addrspace.h>
-#include <asm/vector.h>
 #include <asm/jazz.h>
 #include <asm/jazzdma.h>
 #include <asm/keyboard.h>
 #include <asm/pgtable.h>
-#include <asm/mc146818rtc.h>
-
-static unsigned char
-fd_inb(unsigned int port)
-{
-	unsigned char c;
-
-	c = *(volatile unsigned char *) port;
-	udelay(1);
-
-	return c;
-}
-
-static void
-fd_outb(unsigned char value, unsigned int port)
-{
-	*(volatile unsigned char *) port = value;
-}
-
-/*
- * How to access the floppy DMA functions.
- */
-static void
-fd_enable_dma(int channel)
-{
-	vdma_enable(JAZZ_FLOPPY_DMA);
-}
-
-static void
-fd_disable_dma(int channel)
-{
-	vdma_disable(JAZZ_FLOPPY_DMA);
-}
-
-static int
-fd_request_dma(int channel)
-{
-	return 0;
-}
-
-static void
-fd_free_dma(int channel)
-{
-}
-
-static void
-fd_clear_dma_ff(int channel)
-{
-}
-
-static void
-fd_set_dma_mode(int channel, char mode)
-{
-	vdma_set_mode(JAZZ_FLOPPY_DMA, mode);
-}
-
-static void
-fd_set_dma_addr(int channel, unsigned int a)
-{
-	vdma_set_addr(JAZZ_FLOPPY_DMA, vdma_phys2log(PHYSADDR(a)));
-}
-
-static void
-fd_set_dma_count(int channel, unsigned int count)
-{
-	vdma_set_count(JAZZ_FLOPPY_DMA, count);
-}
-
-static int
-fd_get_dma_residue(int channel)
-{
-	return vdma_get_residue(JAZZ_FLOPPY_DMA);
-}
-
-static void
-fd_enable_irq(int irq)
-{
-}
-
-static void
-fd_disable_irq(int irq)
-{
-}
-
-void
-jazz_fd_cacheflush(const void *addr, size_t size)
-{
-	flush_cache_all();
-}
-
-static unsigned char
-rtc_read_data(unsigned long addr)
-{
-	outb_p(addr, RTC_PORT(0));
-	return *(char *)JAZZ_RTC_BASE;
-}
-
-static void
-rtc_write_data(unsigned char data, unsigned long addr)
-{
-	outb_p(addr, RTC_PORT(0));
-	*(char *)JAZZ_RTC_BASE = data;
-}
-
-struct feature jazz_feature = {
-	/*
-	 * How to access the floppy controller's ports
-	 */
-	fd_inb,
-	fd_outb,
-	/*
-	 * How to access the floppy DMA functions.
-	 */
-	fd_enable_dma,
-	fd_disable_dma,
-	fd_request_dma,
-	fd_free_dma,
-	fd_clear_dma_ff,
-	fd_set_dma_mode,
-	fd_set_dma_addr,
-	fd_set_dma_count,
-	fd_get_dma_residue,
-	fd_enable_irq,
-	fd_disable_irq,
-	/*
-	 * How to access the RTC functions.
-	 */
-	rtc_read_data,
-	rtc_write_data
-};
 
 static volatile keyboard_hardware *jazz_kh = 
 	(keyboard_hardware *) JAZZ_KEYBOARD_ADDRESS;
@@ -190,6 +60,31 @@
 	kbd_write_output = jazz_write_output;
 	kbd_write_command = jazz_write_command;
 	kbd_read_status = jazz_read_status;
+	request_irq(JAZZ_KEYBOARD_IRQ, keyboard_interrupt,
+	            0, "keyboard", NULL);
 	request_region(0x60, 16, "keyboard");
-	r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, r4030_read_reg16(JAZZ_IO_IRQ_ENABLE) | JAZZ_IE_KEYBOARD);
+	r4030_write_reg16(JAZZ_IO_IRQ_ENABLE,
+	                  r4030_read_reg16(JAZZ_IO_IRQ_ENABLE)
+	                  | JAZZ_IE_KEYBOARD);
+}
+
+int jazz_ps2_request_irq(void)
+{
+    extern void aux_interrupt(int, void *, struct pt_regs *);
+    int ret;
+    
+    ret = request_irq(JAZZ_MOUSE_IRQ, aux_interrupt, 0, "PS/2 Mouse", NULL);
+    if (!ret)
+	r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, 
+			  r4030_read_reg16(JAZZ_IO_IRQ_ENABLE) | 
+			  JAZZ_IE_MOUSE);
+    return ret;
+}
+
+void jazz_ps2_free_irq(void)
+{
+    r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, 
+		      r4030_read_reg16(JAZZ_IO_IRQ_ENABLE) | 
+		      JAZZ_IE_MOUSE);
+    free_irq(JAZZ_MOUSE_IRQ, NULL);
 }