Diff for /src/sys/i386/isa/Attic/intr_machdep.c between versions 1.15 and 1.16

version 1.15, 2003/10/27 16:42:17 version 1.16, 2004/02/11 18:34:40
Line 383  isa_strayintr(void *vcookiep) Line 383  isa_strayintr(void *vcookiep)
   
 #if defined(FAST_HI) && defined(APIC_IO)  #if defined(FAST_HI) && defined(APIC_IO)
   
   /*
    * This occurs if we mis-programmed the APIC and its vector is still
    * pointing to the slow vector even when we thought we reprogrammed it
    * to the high vector.  This can occur when interrupts are improperly
    * routed by the APIC.  The unit data is opaque so we have to try to
    * find it in the unit array.
    */
 static void  static void
 isa_wrongintr(void *vcookiep)  isa_wrongintr(void *vcookiep)
 {  {
         int intr = (void **)vcookiep - &intr_unit[0];          int intr;
   
         if (intrcnt[1 + intr] <= 5)          for (intr = 0; intr < ICU_LEN*2; ++intr) {
                 log(LOG_ERR, "stray irq %d (APIC misprogrammed)\n", intr);                  if (intr_unit[intr] == vcookiep)
         if (intrcnt[1 + intr] == 5)                          break;
           }
           if (intr == ICU_LEN*2) {
                   log(LOG_ERR, "stray unknown irq (APIC misprogrammed)\n");
           } else if (intrcnt[1 + intr] <= 5) {
                   log(LOG_ERR, "stray irq ~%d (APIC misprogrammed)\n", intr);
           } else if (intrcnt[1 + intr] == 6) {
                 log(LOG_CRIT,                  log(LOG_CRIT,
                     "too many stray irq %d's; not logging any more\n", intr);                      "too many stray irq ~%d's; not logging any more\n", intr);
           }
 }  }
   
 #endif  #endif

Removed from v.1.15  
changed lines
  Added in v.1.16