patch-2.4.19 linux-2.4.19/include/asm-m68k/q40_master.h

• Lines: 72
• Date: Fri Aug 2 17:39:45 2002
• Orig file: linux-2.4.18/include/asm-m68k/q40_master.h
• Orig date: Mon Jun 11 19:15:27 2001

diff -urN linux-2.4.18/include/asm-m68k/q40_master.h linux-2.4.19/include/asm-m68k/q40_master.h
@@ -8,7 +8,6 @@
 
 #include <asm/raw_io.h>
 
-
 #define q40_master_addr 0xff000000
 #define q40_rtc_addr    0xff021ffc
 
@@ -22,48 +21,39 @@
 #define Q40_LED_ON()        master_outb(1,LED_REG)
 #define Q40_LED_OFF()       master_outb(0,LED_REG)
 
-#define INTERRUPT_REG       IIRQ_REG  /* "native" ints */
+#define INTERRUPT_REG       IIRQ_REG  /* "native" irqs */
 #define KEY_IRQ_ENABLE_REG  0x08      /**/
-#define KEYBOARD_UNLOCK_REG 0x20      /* clear kb int */
+#define KEYBOARD_UNLOCK_REG 0x20      /* clear kb irq */
 
-#define SAMPLE_ENABLE_REG   0x14      /* generate SAMPLE ints */
+#define SAMPLE_ENABLE_REG   0x14      /* generate SAMPLE irqs */
 #define SAMPLE_RATE_REG     0x2c
 #define SAMPLE_CLEAR_REG    0x28
 #define SAMPLE_LOW          0x00
 #define SAMPLE_HIGH         0x01
 
-#define FRAME_RATE_REG       0x38      /* generate FRAME ints at 200 HZ rate */
-
-#if 0
-#define SER_ENABLE_REG      0x0c      /* allow serial ints to be generated */
-#endif
-#define EXT_ENABLE_REG      0x10      /* ... rest of the ISA ints ... */
+#define FRAME_RATE_REG       0x38      /* generate FRAME irqs at 200 HZ rate */
 
+#define EXT_ENABLE_REG      0x10      /* ... rest of the ISA irqs ... */
 
 #define master_inb(_reg_)      in_8((unsigned char *)q40_master_addr+_reg_)
 #define master_outb(_b_,_reg_)  out_8((unsigned char *)q40_master_addr+_reg_,_b_)
 
-
-/* define some Q40 specific ints */
-#include "q40ints.h"
-
 /* RTC defines */
 
 #define Q40_RTC_BASE (q40_rtc_addr)
 
-#define RTC_YEAR        (*(unsigned char *)(Q40_RTC_BASE+0))
-#define RTC_MNTH        (*(unsigned char *)(Q40_RTC_BASE-4))
-#define RTC_DATE        (*(unsigned char *)(Q40_RTC_BASE-8))
-#define RTC_DOW         (*(unsigned char *)(Q40_RTC_BASE-12))
-#define RTC_HOUR        (*(unsigned char *)(Q40_RTC_BASE-16))
-#define RTC_MINS        (*(unsigned char *)(Q40_RTC_BASE-20))
-#define RTC_SECS        (*(unsigned char *)(Q40_RTC_BASE-24))
-#define RTC_CTRL        (*(unsigned char *)(Q40_RTC_BASE-28))
-
+#define Q40_RTC_YEAR        (*(volatile unsigned char *)(Q40_RTC_BASE+0))
+#define Q40_RTC_MNTH        (*(volatile unsigned char *)(Q40_RTC_BASE-4))
+#define Q40_RTC_DATE        (*(volatile unsigned char *)(Q40_RTC_BASE-8))
+#define Q40_RTC_DOW         (*(volatile unsigned char *)(Q40_RTC_BASE-12))
+#define Q40_RTC_HOUR        (*(volatile unsigned char *)(Q40_RTC_BASE-16))
+#define Q40_RTC_MINS        (*(volatile unsigned char *)(Q40_RTC_BASE-20))
+#define Q40_RTC_SECS        (*(volatile unsigned char *)(Q40_RTC_BASE-24))
+#define Q40_RTC_CTRL        (*(volatile unsigned char *)(Q40_RTC_BASE-28))
 
 /* some control bits */
-#define RTC_READ   64  /* prepare for reading */
-#define RTC_WRITE  128
+#define Q40_RTC_READ   64  /* prepare for reading */
+#define Q40_RTC_WRITE  128
 
 
 /* misc defs */