Merge branch 'linux-2.6'

7 files changed, 442 insertions, 413 deletions

diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c
index a1c7ec706741..673a1085984d 100644
--- a/arch/m68k/mac/baboon.c
+++ b/arch/m68k/mac/baboon.c
@@ -22,7 +22,7 @@
 /* #define DEBUG_BABOON */
 /* #define DEBUG_IRQS */
 
-int baboon_present,baboon_active;
+int baboon_present;
 volatile struct baboon *baboon;
 
 irqreturn_t baboon_irq(int, void *);
@@ -45,7 +45,6 @@ void __init baboon_init(void)
 
         baboon = (struct baboon *) BABOON_BASE;
         baboon_present = 1;
-        baboon_active = 0;
 
         printk("Baboon detected at %p\n", baboon);
 }
@@ -66,26 +65,28 @@ void __init baboon_register_interrupts(void)
 
 irqreturn_t baboon_irq(int irq, void *dev_id)
 {
-        int irq_bit,i;
+        int irq_bit, irq_num;
         unsigned char events;
 
 #ifdef DEBUG_IRQS
-        printk("baboon_irq: mb_control %02X mb_ifr %02X mb_status %02X active %02X\n",
+        printk("baboon_irq: mb_control %02X mb_ifr %02X mb_status %02X\n",
                 (uint) baboon->mb_control, (uint) baboon->mb_ifr,
-                (uint) baboon->mb_status,  baboon_active);
+                (uint) baboon->mb_status);
 #endif
 
         if (!(events = baboon->mb_ifr & 0x07))
                 return IRQ_NONE;
 
-        for (i = 0, irq_bit = 1 ; i < 3 ; i++, irq_bit <<= 1) {
-                if (events & irq_bit/* & baboon_active*/) {
-                        baboon_active &= ~irq_bit;
-                        m68k_handle_int(IRQ_BABOON_0 + i);
-                        baboon_active |= irq_bit;
+        irq_num = IRQ_BABOON_0;
+        irq_bit = 1;
+        do {
+                if (events & irq_bit) {
                         baboon->mb_ifr &= ~irq_bit;
+                        m68k_handle_int(irq_num);
                 }
-        }
+                irq_bit <<= 1;
+                irq_num++;
+        } while(events >= irq_bit);
 #if 0
         if (baboon->mb_ifr & 0x02) macide_ack_intr(NULL);
         /* for now we need to smash all interrupts */
@@ -95,21 +96,18 @@ irqreturn_t baboon_irq(int irq, void *dev_id)
 }
 
 void baboon_irq_enable(int irq) {
-        int irq_idx     = IRQ_IDX(irq);
-
 #ifdef DEBUG_IRQUSE
         printk("baboon_irq_enable(%d)\n", irq);
 #endif
-        baboon_active |= (1 << irq_idx);
+        /* FIXME: figure out how to mask and unmask baboon interrupt sources */
+        enable_irq(IRQ_NUBUS_C);
 }
 
 void baboon_irq_disable(int irq) {
-        int irq_idx     = IRQ_IDX(irq);
-
 #ifdef DEBUG_IRQUSE
         printk("baboon_irq_disable(%d)\n", irq);
 #endif
-        baboon_active &= ~(1 << irq_idx);
+        disable_irq(IRQ_NUBUS_C);
 }
 
 void baboon_irq_clear(int irq) {
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 562b38d00180..5fd413246f89 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -59,15 +59,15 @@ extern struct mem_info m68k_ramdisk;
 
 extern char m68k_command_line[CL_SIZE];
 
-void *mac_env;          /* Loaded by the boot asm */
+void *mac_env;                                  /* Loaded by the boot asm */
 
 /* The phys. video addr. - might be bogus on some machines */
 unsigned long mac_orig_videoaddr;
 
 /* Mac specific timer functions */
-extern unsigned long mac_gettimeoffset (void);
-extern int mac_hwclk (int, struct rtc_time *);
-extern int mac_set_clock_mmss (unsigned long);
+extern unsigned long mac_gettimeoffset(void);
+extern int mac_hwclk(int, struct rtc_time *);
+extern int mac_set_clock_mmss(unsigned long);
 extern int show_mac_interrupts(struct seq_file *, void *);
 extern void iop_preinit(void);
 extern void iop_init(void);
@@ -82,10 +82,6 @@ extern void mac_mksound(unsigned int, unsigned int);
 
 extern void nubus_sweep_video(void);
 
-/* Mac specific debug functions (in debug.c) */
-extern void mac_debug_init(void);
-extern void mac_debugging_long(int, long);
-
 static void mac_get_model(char *str);
 
 static void mac_sched_init(irq_handler_t vector)
@@ -99,51 +95,52 @@ static void mac_sched_init(irq_handler_t vector)
 
 int __init mac_parse_bootinfo(const struct bi_record *record)
 {
-    int unknown = 0;
-    const u_long *data = record->data;
+        int unknown = 0;
+        const u_long *data = record->data;
 
-    switch (record->tag) {
+        switch (record->tag) {
         case BI_MAC_MODEL:
-            mac_bi_data.id = *data;
-            break;
+                mac_bi_data.id = *data;
+                break;
         case BI_MAC_VADDR:
-            mac_bi_data.videoaddr = *data;
-            break;
+                mac_bi_data.videoaddr = *data;
+                break;
         case BI_MAC_VDEPTH:
-            mac_bi_data.videodepth = *data;
-            break;
+                mac_bi_data.videodepth = *data;
+                break;
         case BI_MAC_VROW:
-            mac_bi_data.videorow = *data;
-            break;
+                mac_bi_data.videorow = *data;
+                break;
         case BI_MAC_VDIM:
-            mac_bi_data.dimensions = *data;
-            break;
+                mac_bi_data.dimensions = *data;
+                break;
         case BI_MAC_VLOGICAL:
-            mac_bi_data.videological = VIDEOMEMBASE + (*data & ~VIDEOMEMMASK);
-            mac_orig_videoaddr = *data;
-            break;
+                mac_bi_data.videological = VIDEOMEMBASE + (*data & ~VIDEOMEMMASK);
+                mac_orig_videoaddr = *data;
+                break;
         case BI_MAC_SCCBASE:
-            mac_bi_data.sccbase = *data;
-            break;
+                mac_bi_data.sccbase = *data;
+                break;
         case BI_MAC_BTIME:
-            mac_bi_data.boottime = *data;
-            break;
+                mac_bi_data.boottime = *data;
+                break;
         case BI_MAC_GMTBIAS:
-            mac_bi_data.gmtbias = *data;
-            break;
+                mac_bi_data.gmtbias = *data;
+                break;
         case BI_MAC_MEMSIZE:
-            mac_bi_data.memsize = *data;
-            break;
+                mac_bi_data.memsize = *data;
+                break;
         case BI_MAC_CPUID:
-            mac_bi_data.cpuid = *data;
-            break;
-        case BI_MAC_ROMBASE:
-            mac_bi_data.rombase = *data;
-            break;
+                mac_bi_data.cpuid = *data;
+                break;
+        case BI_MAC_ROMBASE:
+                mac_bi_data.rombase = *data;
+                break;
         default:
-            unknown = 1;
-    }
-    return(unknown);
+                unknown = 1;
+                break;
+        }
+        return unknown;
 }
 
 /*
@@ -155,6 +152,7 @@ int __init mac_parse_bootinfo(const struct bi_record *record)
 static void mac_cache_card_flush(int writeback)
 {
         unsigned long flags;
+
         local_irq_save(flags);
         via_flush_cache();
         local_irq_restore(flags);
@@ -162,28 +160,24 @@ static void mac_cache_card_flush(int writeback)
 
 void __init config_mac(void)
 {
-        if (!MACH_IS_MAC) {
-          printk(KERN_ERR "ERROR: no Mac, but config_mac() called!! \n");
-        }
+        if (!MACH_IS_MAC)
+                printk(KERN_ERR "ERROR: no Mac, but config_mac() called!! \n");
 
-        mach_sched_init      = mac_sched_init;
-        mach_init_IRQ        = mac_init_IRQ;
-        mach_get_model   = mac_get_model;
-        mach_gettimeoffset   = mac_gettimeoffset;
+        mach_sched_init = mac_sched_init;
+        mach_init_IRQ = mac_init_IRQ;
+        mach_get_model = mac_get_model;
+        mach_gettimeoffset = mac_gettimeoffset;
 #warning move to adb/via init
 #if 0
-        mach_hwclk           = mac_hwclk;
+        mach_hwclk = mac_hwclk;
 #endif
-        mach_set_clock_mmss      = mac_set_clock_mmss;
-        mach_reset           = mac_reset;
-        mach_halt            = mac_poweroff;
-        mach_power_off       = mac_poweroff;
+        mach_set_clock_mmss = mac_set_clock_mmss;
+        mach_reset = mac_reset;
+        mach_halt = mac_poweroff;
+        mach_power_off = mac_poweroff;
         mach_max_dma_address = 0xffffffff;
-#if 0
-        mach_debug_init  = mac_debug_init;
-#endif
 #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
-        mach_beep            = mac_mksound;
+        mach_beep = mac_mksound;
 #endif
 #ifdef CONFIG_HEARTBEAT
 #if 0
@@ -199,21 +193,22 @@ void __init config_mac(void)
         mac_identify();
         mac_report_hardware();
 
-        /* AFAIK only the IIci takes a cache card.  The IIfx has onboard
-           cache ... someone needs to figure out how to tell if it's on or
-           not. */
+        /*
+         * AFAIK only the IIci takes a cache card.  The IIfx has onboard
+         * cache ... someone needs to figure out how to tell if it's on or
+         * not.
+         */
 
         if (macintosh_config->ident == MAC_MODEL_IICI
-            || macintosh_config->ident == MAC_MODEL_IIFX) {
+            || macintosh_config->ident == MAC_MODEL_IIFX)
                 mach_l2_flush = mac_cache_card_flush;
-        }
 
         /*
          * Check for machine specific fixups.
          */
 
 #ifdef OLD_NUBUS_CODE
-         nubus_sweep_video();
+        nubus_sweep_video();
 #endif
 }
 
@@ -233,8 +228,7 @@ void __init config_mac(void)
 struct mac_model *macintosh_config;
 EXPORT_SYMBOL(macintosh_config);
 
-static struct mac_model mac_data_table[]=
-{
+static struct mac_model mac_data_table[] = {
         /*
          *      We'll pretend to be a Macintosh II, that's pretty safe.
          */
@@ -784,12 +778,12 @@ void mac_identify(void)
         if (!model) {
                 /* no bootinfo model id -> NetBSD booter was used! */
                 /* XXX FIXME: breaks for model > 31 */
-                model=(mac_bi_data.cpuid>>2)&63;
-                printk (KERN_WARNING "No bootinfo model ID, using cpuid instead (hey, use Penguin!)\n");
+                model = (mac_bi_data.cpuid >> 2) & 63;
+                printk(KERN_WARNING "No bootinfo model ID, using cpuid instead (hey, use Penguin!)\n");
         }
 
         macintosh_config = mac_data_table;
-        for (m = macintosh_config ; m->ident != -1 ; m++) {
+        for (m = macintosh_config; m->ident != -1; m++) {
                 if (m->ident == model) {
                         macintosh_config = m;
                         break;
@@ -801,27 +795,26 @@ void mac_identify(void)
         /* the serial ports set to "Faster" mode in MacOS. */
 
         iop_preinit();
-        mac_debug_init();
 
-        printk (KERN_INFO "Detected Macintosh model: %d \n", model);
+        printk(KERN_INFO "Detected Macintosh model: %d \n", model);
 
         /*
          * Report booter data:
          */
-        printk (KERN_DEBUG " Penguin bootinfo data:\n");
-        printk (KERN_DEBUG " Video: addr 0x%lx row 0x%lx depth %lx dimensions %ld x %ld\n",
+        printk(KERN_DEBUG " Penguin bootinfo data:\n");
+        printk(KERN_DEBUG " Video: addr 0x%lx row 0x%lx depth %lx dimensions %ld x %ld\n",
                 mac_bi_data.videoaddr, mac_bi_data.videorow,
                 mac_bi_data.videodepth, mac_bi_data.dimensions & 0xFFFF,
                 mac_bi_data.dimensions >> 16);
-        printk (KERN_DEBUG " Videological 0x%lx phys. 0x%lx, SCC at 0x%lx \n",
+        printk(KERN_DEBUG " Videological 0x%lx phys. 0x%lx, SCC at 0x%lx \n",
                 mac_bi_data.videological, mac_orig_videoaddr,
                 mac_bi_data.sccbase);
-        printk (KERN_DEBUG " Boottime: 0x%lx GMTBias: 0x%lx \n",
+        printk(KERN_DEBUG " Boottime: 0x%lx GMTBias: 0x%lx \n",
                 mac_bi_data.boottime, mac_bi_data.gmtbias);
-        printk (KERN_DEBUG " Machine ID: %ld CPUid: 0x%lx memory size: 0x%lx \n",
+        printk(KERN_DEBUG " Machine ID: %ld CPUid: 0x%lx memory size: 0x%lx \n",
                 mac_bi_data.id, mac_bi_data.cpuid, mac_bi_data.memsize);
 #if 0
-        printk ("Ramdisk: addr 0x%lx size 0x%lx\n",
+        printk("Ramdisk: addr 0x%lx size 0x%lx\n",
                 m68k_ramdisk.addr, m68k_ramdisk.size);
 #endif
 
@@ -830,22 +823,22 @@ void mac_identify(void)
          */
         switch (macintosh_config->scsi_type) {
         case MAC_SCSI_OLD:
-          MACHW_SET(MAC_SCSI_80);
-          break;
+                MACHW_SET(MAC_SCSI_80);
+                break;
         case MAC_SCSI_QUADRA:
         case MAC_SCSI_QUADRA2:
         case MAC_SCSI_QUADRA3:
-          MACHW_SET(MAC_SCSI_96);
-          if ((macintosh_config->ident == MAC_MODEL_Q900) ||
-              (macintosh_config->ident == MAC_MODEL_Q950))
-            MACHW_SET(MAC_SCSI_96_2);
-          break;
+                MACHW_SET(MAC_SCSI_96);
+                if ((macintosh_config->ident == MAC_MODEL_Q900) ||
+                    (macintosh_config->ident == MAC_MODEL_Q950))
+                        MACHW_SET(MAC_SCSI_96_2);
+                break;
         default:
-          printk(KERN_WARNING "config.c: wtf: unknown scsi, using 53c80\n");
-          MACHW_SET(MAC_SCSI_80);
-          break;
-
+                printk(KERN_WARNING "config.c: wtf: unknown scsi, using 53c80\n");
+                MACHW_SET(MAC_SCSI_80);
+                break;
         }
+
         iop_init();
         via_init();
         oss_init();
@@ -860,6 +853,6 @@ void mac_report_hardware(void)
 
 static void mac_get_model(char *str)
 {
-        strcpy(str,"Macintosh ");
+        strcpy(str, "Macintosh ");
         strcat(str, macintosh_config->name);
 }
diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c
index 4eeb09dc0e8f..7a5bed5bdc57 100644
--- a/arch/m68k/mac/debug.c
+++ b/arch/m68k/mac/debug.c
@@ -27,10 +27,6 @@
 #include <asm/machw.h>
 #include <asm/macints.h>
 
-extern char m68k_debug_device[];
-
-extern struct compat_bootinfo compat_boot_info;
-
 extern unsigned long mac_videobase;
 extern unsigned long mac_videodepth;
 extern unsigned long mac_rowbytes;
@@ -52,7 +48,7 @@ extern void mac_serial_print(const char *);
  */
 
 #ifdef DEBUG_SCREEN
-static int peng=0, line=0;
+static int peng, line;
 #endif
 
 void mac_debugging_short(int pos, short num)
@@ -74,15 +70,14 @@ void mac_debugging_short(int pos, short num)
         }
 
         /* calculate current offset */
-        pengoffset=(unsigned char *)(mac_videobase+(150+line*2)*mac_rowbytes)
-                    +80*peng;
+        pengoffset = (unsigned char *)mac_videobase +
+                (150+line*2) * mac_rowbytes) + 80 * peng;
 
-        pptr=pengoffset;
+        pptr = pengoffset;
 
-        for(i=0;i<8*sizeof(short);i++) /* # of bits */
-        {
+        for (i = 0; i < 8 * sizeof(short); i++) { /* # of bits */
                 /*        value        mask for bit i, reverse order */
-                *pptr++ = (num & ( 1 << (8*sizeof(short)-i-1) ) ? 0xFF : 0x00);
+                *pptr++ = (num & (1 << (8*sizeof(short)-i-1)) ? 0xFF : 0x00);
         }
 
         peng++;
@@ -115,11 +110,10 @@ void mac_debugging_long(int pos, long addr)
         pengoffset=(unsigned char *)(mac_videobase+(150+line*2)*mac_rowbytes)
                     +80*peng;
 
-        pptr=pengoffset;
+        pptr = pengoffset;
 
-        for(i=0;i<8*sizeof(long);i++) /* # of bits */
-        {
-                *pptr++ = (addr & ( 1 << (8*sizeof(long)-i-1) ) ? 0xFF : 0x00);
+        for (i = 0; i < 8 * sizeof(long); i++) { /* # of bits */
+                *pptr++ = (addr & (1 << (8*sizeof(long)-i-1)) ? 0xFF : 0x00);
         }
 
         peng++;
@@ -136,16 +130,15 @@ void mac_debugging_long(int pos, long addr)
  * TODO: serial debug code
  */
 
-struct mac_SCC
- {
-  u_char cha_b_ctrl;
-  u_char char_dummy1;
-  u_char cha_a_ctrl;
-  u_char char_dummy2;
-  u_char cha_b_data;
-  u_char char_dummy3;
-  u_char cha_a_data;
- };
+struct mac_SCC {
+        u_char cha_b_ctrl;
+        u_char char_dummy1;
+        u_char cha_a_ctrl;
+        u_char char_dummy2;
+        u_char cha_b_data;
+        u_char char_dummy3;
+        u_char cha_a_data;
+};
 
 # define scc (*((volatile struct mac_SCC*)mac_bi_data.sccbase))
 
@@ -158,9 +151,9 @@ int mac_SCC_reset_done;
 static int scc_port = -1;
 
 static struct console mac_console_driver = {
-        .name =         "debug",
-        .flags =        CON_PRINTBUFFER,
-        .index =        -1,
+        .name   = "debug",
+        .flags  = CON_PRINTBUFFER,
+        .index  = -1,
 };
 
 /*
@@ -178,8 +171,8 @@ static struct console mac_console_driver = {
  * this driver if Mac.
  */
 
-void mac_debug_console_write (struct console *co, const char *str,
-                              unsigned int count)
+void mac_debug_console_write(struct console *co, const char *str,
+                             unsigned int count)
 {
         mac_serial_print(str);
 }
@@ -190,48 +183,50 @@ void mac_debug_console_write (struct console *co, const char *str,
 
 #define uSEC 1
 
-static inline void mac_sccb_out (char c)
+static inline void mac_sccb_out(char c)
 {
-    int i;
-    do {
-        for( i = uSEC; i > 0; --i )
+        int i;
+
+        do {
+                for (i = uSEC; i > 0; --i)
+                        barrier();
+        } while (!(scc.cha_b_ctrl & 0x04)); /* wait for tx buf empty */
+        for (i = uSEC; i > 0; --i)
                 barrier();
-    } while (!(scc.cha_b_ctrl & 0x04)); /* wait for tx buf empty */
-    for( i = uSEC; i > 0; --i )
-        barrier();
-    scc.cha_b_data = c;
+        scc.cha_b_data = c;
 }
 
-static inline void mac_scca_out (char c)
+static inline void mac_scca_out(char c)
 {
-    int i;
-    do {
-        for( i = uSEC; i > 0; --i )
+        int i;
+
+        do {
+                for (i = uSEC; i > 0; --i)
+                        barrier();
+        } while (!(scc.cha_a_ctrl & 0x04)); /* wait for tx buf empty */
+        for (i = uSEC; i > 0; --i)
                 barrier();
-    } while (!(scc.cha_a_ctrl & 0x04)); /* wait for tx buf empty */
-    for( i = uSEC; i > 0; --i )
-        barrier();
-    scc.cha_a_data = c;
+        scc.cha_a_data = c;
 }
 
-void mac_sccb_console_write (struct console *co, const char *str,
-                              unsigned int count)
+void mac_sccb_console_write(struct console *co, const char *str,
+                            unsigned int count)
 {
-    while (count--) {
-        if (*str == '\n')
-            mac_sccb_out( '\r' );
-        mac_sccb_out( *str++ );
-    }
+        while (count--) {
+                if (*str == '\n')
+                        mac_sccb_out('\r');
+                mac_sccb_out(*str++);
+        }
 }
 
-void mac_scca_console_write (struct console *co, const char *str,
-                              unsigned int count)
+void mac_scca_console_write(struct console *co, const char *str,
+                            unsigned int count)
 {
-    while (count--) {
-        if (*str == '\n')
-            mac_scca_out( '\r' );
-        mac_scca_out( *str++ );
-    }
+        while (count--) {
+                if (*str == '\n')
+                        mac_scca_out('\r');
+                mac_scca_out(*str++);
+        }
 }
 
 
@@ -239,41 +234,41 @@ void mac_scca_console_write (struct console *co, const char *str,
  * SCC serial ports. They're used by the debugging interface, kgdb, and the
  * serial console code. */
 #define SCCB_WRITE(reg,val)                             \
-    do {                                                \
-        int i;                                          \
-        scc.cha_b_ctrl = (reg);                         \
-        for( i = uSEC; i > 0; --i )                     \
-                barrier();                              \
-        scc.cha_b_ctrl = (val);                         \
-        for( i = uSEC; i > 0; --i )                     \
-                barrier();                              \
-    } while(0)
+        do {                                            \
+                int i;                                  \
+                scc.cha_b_ctrl = (reg);                 \
+                for (i = uSEC; i > 0; --i)              \
+                        barrier();                      \
+                scc.cha_b_ctrl = (val);                 \
+                for (i = uSEC; i > 0; --i)              \
+                        barrier();                      \
+        } while(0)
 
 #define SCCA_WRITE(reg,val)                             \
-    do {                                                \
-        int i;                                          \
-        scc.cha_a_ctrl = (reg);                         \
-        for( i = uSEC; i > 0; --i )                     \
-                barrier();                              \
-        scc.cha_a_ctrl = (val);                         \
-        for( i = uSEC; i > 0; --i )                     \
-                barrier();                              \
-    } while(0)
+        do {                                            \
+                int i;                                  \
+                scc.cha_a_ctrl = (reg);                 \
+                for (i = uSEC; i > 0; --i)              \
+                        barrier();                      \
+                scc.cha_a_ctrl = (val);                 \
+                for (i = uSEC; i > 0; --i)              \
+                        barrier();                      \
+        } while(0)
 
 /* loops_per_jiffy isn't initialized yet, so we can't use udelay(). This does a
  * delay of ~ 60us. */
 /* Mac: loops_per_jiffy min. 19000 ^= .5 us; MFPDELAY was 0.6 us*/
-#define LONG_DELAY()                            \
-    do {                                        \
-        int i;                                  \
-        for( i = 60*uSEC; i > 0; --i )          \
-            barrier();                          \
-    } while(0)
+#define LONG_DELAY()                                    \
+        do {                                            \
+                int i;                                  \
+                for (i = 60*uSEC; i > 0; --i)           \
+                    barrier();                          \
+        } while(0)
 
 #ifndef CONFIG_SERIAL_CONSOLE
-static void __init mac_init_scc_port( int cflag, int port )
+static void __init mac_init_scc_port(int cflag, int port)
 #else
-void mac_init_scc_port( int cflag, int port )
+void mac_init_scc_port(int cflag, int port)
 #endif
 {
         extern int mac_SCC_reset_done;
@@ -292,106 +287,102 @@ void mac_init_scc_port( int cflag, int port )
                 /* reg12 (BRG low) */
                 { 94, 62, 46, 22, 10, 4, 1, 0, 0 };
 
-    int baud = cflag & CBAUD;
-    int clksrc, clkmode, div, reg3, reg5;
-
-    if (cflag & CBAUDEX)
-        baud += B38400;
-    if (baud < B1200 || baud > B38400+2)
-        baud = B9600; /* use default 9600bps for non-implemented rates */
-    baud -= B1200; /* tables starts at 1200bps */
-
-    clksrc  = clksrc_table[baud];
-    clkmode = clkmode_table[baud];
-    div     = div_table[baud];
-
-    reg3 = (((cflag & CSIZE) == CS8) ? 0xc0 : 0x40);
-    reg5 = (((cflag & CSIZE) == CS8) ? 0x60 : 0x20) | 0x82 /* assert DTR/RTS */;
-
-    if (port == 1) {
-            (void)scc.cha_b_ctrl;       /* reset reg pointer */
-            SCCB_WRITE( 9, 0xc0 );      /* reset */
-            LONG_DELAY();               /* extra delay after WR9 access */
-            SCCB_WRITE( 4, (cflag & PARENB) ? ((cflag & PARODD) ? 0x01 : 0x03) : 0 |
+        int baud = cflag & CBAUD;
+        int clksrc, clkmode, div, reg3, reg5;
+
+        if (cflag & CBAUDEX)
+                baud += B38400;
+        if (baud < B1200 || baud > B38400+2)
+                baud = B9600; /* use default 9600bps for non-implemented rates */
+        baud -= B1200; /* tables starts at 1200bps */
+
+        clksrc  = clksrc_table[baud];
+        clkmode = clkmode_table[baud];
+        div     = div_table[baud];
+
+        reg3 = (((cflag & CSIZE) == CS8) ? 0xc0 : 0x40);
+        reg5 = (((cflag & CSIZE) == CS8) ? 0x60 : 0x20) | 0x82 /* assert DTR/RTS */;
+
+        if (port == 1) {
+                (void)scc.cha_b_ctrl;   /* reset reg pointer */
+                SCCB_WRITE(9, 0xc0);    /* reset */
+                LONG_DELAY();           /* extra delay after WR9 access */
+                SCCB_WRITE(4, (cflag & PARENB) ? ((cflag & PARODD) ? 0x01 : 0x03) : 0 |
+                           0x04 /* 1 stopbit */ |
+                           clkmode);
+                SCCB_WRITE(3, reg3);
+                SCCB_WRITE(5, reg5);
+                SCCB_WRITE(9, 0);       /* no interrupts */
+                LONG_DELAY();           /* extra delay after WR9 access */
+                SCCB_WRITE(10, 0);      /* NRZ mode */
+                SCCB_WRITE(11, clksrc); /* main clock source */
+                SCCB_WRITE(12, div);    /* BRG value */
+                SCCB_WRITE(13, 0);      /* BRG high byte */
+                SCCB_WRITE(14, 1);
+                SCCB_WRITE(3, reg3 | 1);
+                SCCB_WRITE(5, reg5 | 8);
+        } else if (port == 0) {
+                (void)scc.cha_a_ctrl;   /* reset reg pointer */
+                SCCA_WRITE(9, 0xc0);    /* reset */
+                LONG_DELAY();           /* extra delay after WR9 access */
+                SCCA_WRITE(4, (cflag & PARENB) ? ((cflag & PARODD) ? 0x01 : 0x03) : 0 |
                           0x04 /* 1 stopbit */ |
-                          clkmode );
-            SCCB_WRITE( 3, reg3 );
-            SCCB_WRITE( 5, reg5 );
-            SCCB_WRITE( 9, 0 );         /* no interrupts */
-            LONG_DELAY();               /* extra delay after WR9 access */
-            SCCB_WRITE( 10, 0 );        /* NRZ mode */
-            SCCB_WRITE( 11, clksrc );   /* main clock source */
-            SCCB_WRITE( 12, div );      /* BRG value */
-            SCCB_WRITE( 13, 0 );                /* BRG high byte */
-            SCCB_WRITE( 14, 1 );
-            SCCB_WRITE( 3, reg3 | 1 );
-            SCCB_WRITE( 5, reg5 | 8 );
-    } else if (port == 0) {
-            (void)scc.cha_a_ctrl;       /* reset reg pointer */
-            SCCA_WRITE( 9, 0xc0 );      /* reset */
-            LONG_DELAY();               /* extra delay after WR9 access */
-            SCCA_WRITE( 4, (cflag & PARENB) ? ((cflag & PARODD) ? 0x01 : 0x03) : 0 |
-                          0x04 /* 1 stopbit */ |
-                          clkmode );
-            SCCA_WRITE( 3, reg3 );
-            SCCA_WRITE( 5, reg5 );
-            SCCA_WRITE( 9, 0 );         /* no interrupts */
-            LONG_DELAY();               /* extra delay after WR9 access */
-            SCCA_WRITE( 10, 0 );        /* NRZ mode */
-            SCCA_WRITE( 11, clksrc );   /* main clock source */
-            SCCA_WRITE( 12, div );      /* BRG value */
-            SCCA_WRITE( 13, 0 );                /* BRG high byte */
-            SCCA_WRITE( 14, 1 );
-            SCCA_WRITE( 3, reg3 | 1 );
-            SCCA_WRITE( 5, reg5 | 8 );
-    }
-
-    mac_SCC_reset_done = 1;
-    mac_SCC_init_done = 1;
+                          clkmode);
+                SCCA_WRITE(3, reg3);
+                SCCA_WRITE(5, reg5);
+                SCCA_WRITE(9, 0);       /* no interrupts */
+                LONG_DELAY();           /* extra delay after WR9 access */
+                SCCA_WRITE(10, 0);      /* NRZ mode */
+                SCCA_WRITE(11, clksrc); /* main clock source */
+                SCCA_WRITE(12, div);    /* BRG value */
+                SCCA_WRITE(13, 0);      /* BRG high byte */
+                SCCA_WRITE(14, 1);
+                SCCA_WRITE(3, reg3 | 1);
+                SCCA_WRITE(5, reg5 | 8);
+        }
+
+        mac_SCC_reset_done = 1;
+        mac_SCC_init_done = 1;
 }
 #endif /* DEBUG_SERIAL */
 
-void mac_init_scca_port( int cflag )
+void mac_init_scca_port(int cflag)
 {
         mac_init_scc_port(cflag, 0);
 }
 
-void mac_init_sccb_port( int cflag )
+void mac_init_sccb_port(int cflag)
 {
         mac_init_scc_port(cflag, 1);
 }
 
-void __init mac_debug_init(void)
+static int __init mac_debug_setup(char *arg)
 {
+        if (!MACH_IS_MAC)
+                return 0;
+
 #ifdef DEBUG_SERIAL
-    if (   !strcmp( m68k_debug_device, "ser"  )
-        || !strcmp( m68k_debug_device, "ser1" )) {
-        /* Mac modem port */
-        mac_init_scc_port( B9600|CS8, 0 );
-        mac_console_driver.write = mac_scca_console_write;
-        scc_port = 0;
-    }
-    else if (!strcmp( m68k_debug_device, "ser2" )) {
-        /* Mac printer port */
-        mac_init_scc_port( B9600|CS8, 1 );
-        mac_console_driver.write = mac_sccb_console_write;
-        scc_port = 1;
-    }
+        if (!strcmp(arg, "ser") || !strcmp(arg, "ser1")) {
+                /* Mac modem port */
+                mac_init_scc_port(B9600|CS8, 0);
+                mac_console_driver.write = mac_scca_console_write;
+                scc_port = 0;
+        } else if (!strcmp(arg, "ser2")) {
+                /* Mac printer port */
+                mac_init_scc_port(B9600|CS8, 1);
+                mac_console_driver.write = mac_sccb_console_write;
+                scc_port = 1;
+        }
 #endif
 #ifdef DEBUG_HEADS
-    if (   !strcmp( m68k_debug_device, "scn"  )
-        || !strcmp( m68k_debug_device, "con" )) {
-        /* display, using head.S console routines */
-        mac_console_driver.write = mac_debug_console_write;
-    }
+        if (!strcmp(arg, "scn") || !strcmp(arg, "con")) {
+                /* display, using head.S console routines */
+                mac_console_driver.write = mac_debug_console_write;
+        }
 #endif
-    if (mac_console_driver.write)
-        register_console(&mac_console_driver);
+        if (mac_console_driver.write)
+                register_console(&mac_console_driver);
+        return 0;
 }
 
-/*
- * Local variables:
- *  c-indent-level: 4
- *  tab-width: 8
- * End:
- */
+early_param("debug", mac_debug_setup);
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index f6fcd754d8f6..0fc72d8f786e 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -219,7 +219,7 @@ static void mac_disable_irq(unsigned int irq);
 
 static struct irq_controller mac_irq_controller = {
         .name           = "mac",
-        .lock           = SPIN_LOCK_UNLOCKED,
+        .lock           = __SPIN_LOCK_UNLOCKED(mac_irq_controller.lock),
         .enable         = mac_enable_irq,
         .disable        = mac_disable_irq,
 };
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 63690819565a..d7be16917efd 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -109,13 +109,11 @@ irqreturn_t oss_irq(int irq, void *dev_id)
         /* FIXME: how do you clear a pending IRQ?    */
 
         if (events & OSS_IP_SOUND) {
-                /* FIXME: call sound handler */
                 oss->irq_pending &= ~OSS_IP_SOUND;
+                /* FIXME: call sound handler */
         } else if (events & OSS_IP_SCSI) {
-                oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED;
-                m68k_handle_int(IRQ_MAC_SCSI);
                 oss->irq_pending &= ~OSS_IP_SCSI;
-                oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI;
+                m68k_handle_int(IRQ_MAC_SCSI);
         } else {
                 /* FIXME: error check here? */
         }
@@ -143,14 +141,16 @@ irqreturn_t oss_nubus_irq(int irq, void *dev_id)
 #endif
         /* There are only six slots on the OSS, not seven */
 
-        for (i = 0, irq_bit = 1 ; i < 6 ; i++, irq_bit <<= 1) {
+        i = 6;
+        irq_bit = 0x40;
+        do {
+                --i;
+                irq_bit >>= 1;
                 if (events & irq_bit) {
-                        oss->irq_level[i] = OSS_IRQLEV_DISABLED;
-                        m68k_handle_int(NUBUS_SOURCE_BASE + i);
                         oss->irq_pending &= ~irq_bit;
-                        oss->irq_level[i] = OSS_IRQLEV_NUBUS;
+                        m68k_handle_int(NUBUS_SOURCE_BASE + i);
                 }
-        }
+        } while(events & (irq_bit - 1));
         return IRQ_HANDLED;
 }
 
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c
index 15378a5878c9..d66f723b17c3 100644
--- a/arch/m68k/mac/psc.c
+++ b/arch/m68k/mac/psc.c
@@ -131,11 +131,8 @@ irqreturn_t psc_irq(int irq, void *dev_id)
 {
         int pIFR        = pIFRbase + ((int) dev_id);
         int pIER        = pIERbase + ((int) dev_id);
-        int base_irq;
-        int irq_bit,i;
-        unsigned char events;
-
-        base_irq = irq << 3;
+        int irq_num;
+        unsigned char irq_bit, events;
 
 #ifdef DEBUG_IRQS
         printk("psc_irq: irq %d pIFR = 0x%02X pIER = 0x%02X\n",
@@ -146,14 +143,16 @@ irqreturn_t psc_irq(int irq, void *dev_id)
         if (!events)
                 return IRQ_NONE;
 
-        for (i = 0, irq_bit = 1 ; i < 4 ; i++, irq_bit <<= 1) {
-                if (events & irq_bit) {
-                        psc_write_byte(pIER, irq_bit);
-                        m68k_handle_int(base_irq + i);
+        irq_num = irq << 3;
+        irq_bit = 1;
+        do {
+                if (events & irq_bit) {
                         psc_write_byte(pIFR, irq_bit);
-                        psc_write_byte(pIER, irq_bit | 0x80);
+                        m68k_handle_int(irq_num);
                 }
-        }
+                irq_num++;
+                irq_bit <<= 1;
+        } while (events >= irq_bit);
         return IRQ_HANDLED;
 }
 
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index e27735be2924..d5cac72eb3db 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -13,6 +13,10 @@
  * for info.  A full-text web search on 6522 AND VIA will probably also
  * net some usefulness. <cananian@alumni.princeton.edu> 20apr1999
  *
+ * Additional data is here (the SY6522 was used in the Mac II etc):
+ *     http://www.6502.org/documents/datasheets/synertek/synertek_sy6522.pdf
+ *     http://www.6502.org/documents/datasheets/synertek/synertek_sy6522_programming_reference.pdf
+ *
  * PRAM/RTC access algorithms are from the NetBSD RTC toolkit version 1.08b
  * by Erik Vogan and adapted to Linux by Joshua M. Thompson (funaho@jurai.org)
  *
@@ -37,7 +41,7 @@ volatile __u8 *via1, *via2;
 /* See note in mac_via.h about how this is possibly not useful */
 volatile long *via_memory_bogon=(long *)&via_memory_bogon;
 #endif
-int  rbv_present,via_alt_mapping;
+int rbv_present, via_alt_mapping;
 __u8 rbv_clear;
 
 /*
@@ -60,7 +64,19 @@ static int gIER,gIFR,gBufA,gBufB;
 #define MAC_CLOCK_LOW           (MAC_CLOCK_TICK&0xFF)
 #define MAC_CLOCK_HIGH          (MAC_CLOCK_TICK>>8)
 
-static int  nubus_active;
+/* To disable a NuBus slot on Quadras we make the slot IRQ lines outputs, set
+ * high. On RBV we just use the slot interrupt enable register. On Macs with
+ * genuine VIA chips we must use nubus_disabled to keep track of disabled slot
+ * interrupts. When any slot IRQ is disabled we mask the (edge triggered) CA1
+ * or "SLOTS" interrupt. When no slot is disabled, we unmask the CA1 interrupt.
+ * So, on genuine VIAs, having more than one NuBus IRQ can mean trouble,
+ * because closing one of those drivers can mask all of the NuBus interrupts.
+ * Also, since we can't mask the unregistered slot IRQs on genuine VIAs, it's
+ * possible to get interrupts from cards that MacOS or the ROM has configured
+ * but we have not. FWIW, "Designing Cards and Drivers for Macintosh II and
+ * Macintosh SE", page 9-8, says, a slot IRQ with no driver would crash MacOS.
+ */
+static u8 nubus_disabled;
 
 void via_debug_dump(void);
 irqreturn_t via1_irq(int, void *);
@@ -138,11 +154,11 @@ void __init via_init(void)
 
         printk(KERN_INFO "VIA2 at %p is ", via2);
         if (rbv_present) {
-                printk(KERN_INFO "an RBV\n");
+                printk("an RBV\n");
         } else if (oss_present) {
-                printk(KERN_INFO "an OSS\n");
+                printk("an OSS\n");
         } else {
-                printk(KERN_INFO "a 6522 or clone\n");
+                printk("a 6522 or clone\n");
         }
 
 #ifdef DEBUG_VIA
@@ -163,6 +179,7 @@ void __init via_init(void)
         via1[vT2CL] = 0;
         via1[vT2CH] = 0;
         via1[vACR] &= 0x3F;
+        via1[vACR] &= ~0x03; /* disable port A & B latches */
 
         /*
          * SE/30: disable video IRQ
@@ -193,8 +210,14 @@ void __init via_init(void)
         /* that the IIfx emulates this alternate mapping using the OSS. */
 
         switch(macintosh_config->ident) {
+                case MAC_MODEL_P475:
+                case MAC_MODEL_P475F:
+                case MAC_MODEL_P575:
+                case MAC_MODEL_Q605:
+                case MAC_MODEL_Q605_ACC:
                 case MAC_MODEL_C610:
                 case MAC_MODEL_Q610:
+                case MAC_MODEL_Q630:
                 case MAC_MODEL_C650:
                 case MAC_MODEL_Q650:
                 case MAC_MODEL_Q700:
@@ -228,6 +251,22 @@ void __init via_init(void)
                 via2[vT2CL] = 0;
                 via2[vT2CH] = 0;
                 via2[vACR] &= 0x3F;
+                via2[vACR] &= ~0x03; /* disable port A & B latches */
+        }
+
+        /*
+         * Set vPCR for SCSI interrupts (but not on RBV)
+         */
+        if (!rbv_present) {
+                if (macintosh_config->scsi_type == MAC_SCSI_OLD) {
+                        /* CB2 (IRQ) indep. input, positive edge */
+                        /* CA2 (DRQ) indep. input, positive edge */
+                        via2[vPCR] = 0x66;
+                } else {
+                        /* CB2 (IRQ) indep. input, negative edge */
+                        /* CA2 (DRQ) indep. input, negative edge */
+                        via2[vPCR] = 0x22;
+                }
         }
 }
 
@@ -356,78 +395,75 @@ int via_get_cache_disable(void)
 
 void __init via_nubus_init(void)
 {
-        /* don't set nubus_active = 0 here, it kills the Baboon */
-        /* interrupt that we've already registered.             */
-
         /* unlock nubus transactions */
 
-        if (!rbv_present) {
+        if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
+            (macintosh_config->adb_type != MAC_ADB_PB2)) {
                 /* set the line to be an output on non-RBV machines */
-                if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
-                   (macintosh_config->adb_type != MAC_ADB_PB2)) {
+                if (!rbv_present)
                         via2[vDirB] |= 0x02;
-                }
-        }
 
-        /* this seems to be an ADB bit on PMU machines */
-        /* according to MkLinux.  -- jmt               */
-
-        if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
-            (macintosh_config->adb_type != MAC_ADB_PB2)) {
+                /* this seems to be an ADB bit on PMU machines */
+                /* according to MkLinux.  -- jmt               */
                 via2[gBufB] |= 0x02;
         }
 
-        /* disable nubus slot interrupts. */
-        if (rbv_present) {
+        /* Disable all the slot interrupts (where possible). */
+
+        switch (macintosh_config->via_type) {
+        case MAC_VIA_II:
+                /* Just make the port A lines inputs. */
+                switch(macintosh_config->ident) {
+                case MAC_MODEL_II:
+                case MAC_MODEL_IIX:
+                case MAC_MODEL_IICX:
+                case MAC_MODEL_SE30:
+                        /* The top two bits are RAM size outputs. */
+                        via2[vDirA] &= 0xC0;
+                        break;
+                default:
+                        via2[vDirA] &= 0x80;
+                }
+                break;
+        case MAC_VIA_IIci:
+                /* RBV. Disable all the slot interrupts. SIER works like IER. */
                 via2[rSIER] = 0x7F;
-                via2[rSIER] = nubus_active | 0x80;
-        } else {
-                /* These are ADB bits on PMU */
+                break;
+        case MAC_VIA_QUADRA:
+                /* Disable the inactive slot interrupts by making those lines outputs. */
                 if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
-                   (macintosh_config->adb_type != MAC_ADB_PB2)) {
-                        switch(macintosh_config->ident)
-                        {
-                                case MAC_MODEL_II:
-                                case MAC_MODEL_IIX:
-                                case MAC_MODEL_IICX:
-                                case MAC_MODEL_SE30:
-                                        via2[vBufA] |= 0x3F;
-                                        via2[vDirA] = ~nubus_active | 0xc0;
-                                        break;
-                                default:
-                                        via2[vBufA] = 0xFF;
-                                        via2[vDirA] = ~nubus_active;
-                        }
+                    (macintosh_config->adb_type != MAC_ADB_PB2)) {
+                        via2[vBufA] |= 0x7F;
+                        via2[vDirA] |= 0x7F;
                 }
+                break;
         }
 }
 
 /*
  * The generic VIA interrupt routines (shamelessly stolen from Alan Cox's
  * via6522.c :-), disable/pending masks added.
- *
- * The new interrupt architecture in macints.c takes care of a lot of the
- * gruntwork for us, including tallying the interrupts and calling the
- * handlers on the linked list. All we need to do here is basically generate
- * the machspec interrupt number after clearing the interrupt.
  */
 
 irqreturn_t via1_irq(int irq, void *dev_id)
 {
-        int irq_bit, i;
-        unsigned char events, mask;
+        int irq_num;
+        unsigned char irq_bit, events;
 
-        mask = via1[vIER] & 0x7F;
-        if (!(events = via1[vIFR] & mask))
+        events = via1[vIFR] & via1[vIER] & 0x7F;
+        if (!events)
                 return IRQ_NONE;
 
-        for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1)
+        irq_num = VIA1_SOURCE_BASE;
+        irq_bit = 1;
+        do {
                 if (events & irq_bit) {
-                        via1[vIER] = irq_bit;
-                        m68k_handle_int(VIA1_SOURCE_BASE + i);
                         via1[vIFR] = irq_bit;
-                        via1[vIER] = irq_bit | 0x80;
+                        m68k_handle_int(irq_num);
                 }
+                ++irq_num;
+                irq_bit <<= 1;
+        } while (events >= irq_bit);
 
 #if 0 /* freakin' pmu is doing weird stuff */
         if (!oss_present) {
@@ -448,20 +484,23 @@ irqreturn_t via1_irq(int irq, void *dev_id)
 
 irqreturn_t via2_irq(int irq, void *dev_id)
 {
-        int irq_bit, i;
-        unsigned char events, mask;
+        int irq_num;
+        unsigned char irq_bit, events;
 
-        mask = via2[gIER] & 0x7F;
-        if (!(events = via2[gIFR] & mask))
+        events = via2[gIFR] & via2[gIER] & 0x7F;
+        if (!events)
                 return IRQ_NONE;
 
-        for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1)
+        irq_num = VIA2_SOURCE_BASE;
+        irq_bit = 1;
+        do {
                 if (events & irq_bit) {
-                        via2[gIER] = irq_bit;
                         via2[gIFR] = irq_bit | rbv_clear;
-                        m68k_handle_int(VIA2_SOURCE_BASE + i);
-                        via2[gIER] = irq_bit | 0x80;
+                        m68k_handle_int(irq_num);
                 }
+                ++irq_num;
+                irq_bit <<= 1;
+        } while (events >= irq_bit);
         return IRQ_HANDLED;
 }
 
@@ -472,71 +511,75 @@ irqreturn_t via2_irq(int irq, void *dev_id)
 
 irqreturn_t via_nubus_irq(int irq, void *dev_id)
 {
-        int irq_bit, i;
-        unsigned char events;
-
-        if (!(events = ~via2[gBufA] & nubus_active))
+        int slot_irq;
+        unsigned char slot_bit, events;
+
+        events = ~via2[gBufA] & 0x7F;
+        if (rbv_present)
+                events &= via2[rSIER];
+        else
+                events &= ~via2[vDirA];
+        if (!events)
                 return IRQ_NONE;
 
-        for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1) {
-                if (events & irq_bit) {
-                        via_irq_disable(NUBUS_SOURCE_BASE + i);
-                        m68k_handle_int(NUBUS_SOURCE_BASE + i);
-                        via_irq_enable(NUBUS_SOURCE_BASE + i);
-                }
-        }
+        do {
+                slot_irq = IRQ_NUBUS_F;
+                slot_bit = 0x40;
+                do {
+                        if (events & slot_bit) {
+                                events &= ~slot_bit;
+                                m68k_handle_int(slot_irq);
+                        }
+                        --slot_irq;
+                        slot_bit >>= 1;
+                } while (events);
+
+                /* clear the CA1 interrupt and make certain there's no more. */
+                via2[gIFR] = 0x02 | rbv_clear;
+                events = ~via2[gBufA] & 0x7F;
+                if (rbv_present)
+                        events &= via2[rSIER];
+                else
+                        events &= ~via2[vDirA];
+        } while (events);
         return IRQ_HANDLED;
 }
 
 void via_irq_enable(int irq) {
         int irq_src     = IRQ_SRC(irq);
         int irq_idx     = IRQ_IDX(irq);
-        int irq_bit     = 1 << irq_idx;
 
 #ifdef DEBUG_IRQUSE
         printk(KERN_DEBUG "via_irq_enable(%d)\n", irq);
 #endif
 
         if (irq_src == 1) {
-                via1[vIER] = irq_bit | 0x80;
+                via1[vIER] = IER_SET_BIT(irq_idx);
         } else if (irq_src == 2) {
-                /*
-                 * Set vPCR for SCSI interrupts (but not on RBV)
-                 */
-                if ((irq_idx == 0) && !rbv_present) {
-                        if (macintosh_config->scsi_type == MAC_SCSI_OLD) {
-                                /* CB2 (IRQ) indep. input, positive edge */
-                                /* CA2 (DRQ) indep. input, positive edge */
-                                via2[vPCR] = 0x66;
-                        } else {
-                                /* CB2 (IRQ) indep. input, negative edge */
-                                /* CA2 (DRQ) indep. input, negative edge */
-                                via2[vPCR] = 0x22;
-                        }
-                }
-                via2[gIER] = irq_bit | 0x80;
+                if (irq != IRQ_MAC_NUBUS || nubus_disabled == 0)
+                        via2[gIER] = IER_SET_BIT(irq_idx);
         } else if (irq_src == 7) {
-                nubus_active |= irq_bit;
-                if (rbv_present) {
-                        /* enable the slot interrupt. SIER works like IER. */
+                switch (macintosh_config->via_type) {
+                case MAC_VIA_II:
+                        nubus_disabled &= ~(1 << irq_idx);
+                        /* Enable the CA1 interrupt when no slot is disabled. */
+                        if (!nubus_disabled)
+                                via2[gIER] = IER_SET_BIT(1);
+                        break;
+                case MAC_VIA_IIci:
+                        /* On RBV, enable the slot interrupt.
+                         * SIER works like IER.
+                         */
                         via2[rSIER] = IER_SET_BIT(irq_idx);
-                } else {
-                        /* Make sure the bit is an input, to enable the irq */
-                        /* But not on PowerBooks, that's ADB... */
+                        break;
+                case MAC_VIA_QUADRA:
+                        /* Make the port A line an input to enable the slot irq.
+                         * But not on PowerBooks, that's ADB.
+                         */
                         if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
-                           (macintosh_config->adb_type != MAC_ADB_PB2)) {
-                                switch(macintosh_config->ident)
-                                {
-                                        case MAC_MODEL_II:
-                                        case MAC_MODEL_IIX:
-                                        case MAC_MODEL_IICX:
-                                        case MAC_MODEL_SE30:
-                                                via2[vDirA] &= (~irq_bit | 0xc0);
-                                                break;
-                                        default:
-                                                via2[vDirA] &= ~irq_bit;
-                                }
-                        }
+                            (macintosh_config->adb_type != MAC_ADB_PB2))
+                                via2[vDirA] &= ~(1 << irq_idx);
+                        break;
                 }
         }
 }
@@ -544,29 +587,31 @@ void via_irq_enable(int irq) {
 void via_irq_disable(int irq) {
         int irq_src     = IRQ_SRC(irq);
         int irq_idx     = IRQ_IDX(irq);
-        int irq_bit     = 1 << irq_idx;
 
 #ifdef DEBUG_IRQUSE
         printk(KERN_DEBUG "via_irq_disable(%d)\n", irq);
 #endif
 
         if (irq_src == 1) {
-                via1[vIER] = irq_bit;
+                via1[vIER] = IER_CLR_BIT(irq_idx);
         } else if (irq_src == 2) {
-                via2[gIER] = irq_bit;
+                via2[gIER] = IER_CLR_BIT(irq_idx);
         } else if (irq_src == 7) {
-                if (rbv_present) {
-                        /* disable the slot interrupt.  SIER works like IER. */
+                switch (macintosh_config->via_type) {
+                case MAC_VIA_II:
+                        nubus_disabled |= 1 << irq_idx;
+                        if (nubus_disabled)
+                                via2[gIER] = IER_CLR_BIT(1);
+                        break;
+                case MAC_VIA_IIci:
                         via2[rSIER] = IER_CLR_BIT(irq_idx);
-                } else {
-                        /* disable the nubus irq by changing dir to output */
-                        /* except on PMU */
+                        break;
+                case MAC_VIA_QUADRA:
                         if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
-                           (macintosh_config->adb_type != MAC_ADB_PB2)) {
-                                via2[vDirA] |= irq_bit;
-                        }
+                            (macintosh_config->adb_type != MAC_ADB_PB2))
+                                via2[vDirA] |= 1 << irq_idx;
+                        break;
                 }
-                nubus_active &= ~irq_bit;
         }
 }
 
@@ -580,7 +625,9 @@ void via_irq_clear(int irq) {
         } else if (irq_src == 2) {
                 via2[gIFR] = irq_bit | rbv_clear;
         } else if (irq_src == 7) {
-                /* FIXME: hmm.. */
+                /* FIXME: There is no way to clear an individual nubus slot
+                 * IRQ flag, other than getting the device to do it.
+                 */
         }
 }
 
@@ -600,6 +647,7 @@ int via_irq_pending(int irq)
         } else if (irq_src == 2) {
                 return via2[gIFR] & irq_bit;
         } else if (irq_src == 7) {
+                /* Always 0 for MAC_VIA_QUADRA if the slot irq is disabled. */
                 return ~via2[gBufA] & irq_bit;
         }
         return 0;