Date: Thu, 30 Oct 2003 16:07:27 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 40906 for review Message-ID: <200310310007.h9V07Rw4088912@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=40906 Change 40906 by peter@peter_daintree on 2003/10/30 16:07:12 AUTO_EOI? whats that? Affected files ... .. //depot/projects/hammer/sys/amd64/isa/atpic.c#8 edit .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#8 (text+ko) ==== @@ -161,11 +161,9 @@ KASSERT(isrc->is_pic == &atpics[MASTER].at_pic, ("%s: mismatched pic", __func__)); -#ifndef AUTO_EOI_1 mtx_lock_spin(&icu_lock); outb(atpics[MASTER].at_ioaddr, ICU_EOI); mtx_unlock_spin(&icu_lock); -#endif } static void @@ -174,14 +172,10 @@ KASSERT(isrc->is_pic == &atpics[SLAVE].at_pic, ("%s: mismatched pic", __func__)); -#ifndef AUTO_EOI_2 mtx_lock_spin(&icu_lock); outb(atpics[SLAVE].at_ioaddr, ICU_EOI); -#ifndef AUTO_EOI_1 outb(atpics[MASTER].at_ioaddr, ICU_EOI); -#endif mtx_unlock_spin(&icu_lock); -#endif } static void @@ -250,19 +244,10 @@ outb(imr_addr, IRQ_SLAVE); /* slave on line 7 */ /* Set mode. */ - if (slave) { -#ifdef AUTO_EOI_2 - outb(imr_addr, ICW4_AEOI | ICW4_8086); -#else + if (slave) outb(imr_addr, ICW4_8086); -#endif - } else { -#ifdef AUTO_EOI_1 - outb(imr_addr, ICW4_AEOI | ICW4_8086); -#else + else outb(imr_addr, ICW4_8086); -#endif - } /* Set interrupt enable mask. */ outb(imr_addr, *pic->at_imen); ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#6 (text+ko) ==== @@ -56,7 +56,7 @@ #define ENABLE_ICU1_AND_2 \ movb $ICU_EOI,%al ; /* as above */ \ outb %al,$IO_ICU2 ; /* but do second icu first ... */ \ - outb %al,$IO_ICU1 /* ... then first icu (if !AUTO_EOI_1) */ + outb %al,$IO_ICU1 /* ... then first icu */ #define PUSH_FRAME \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310310007.h9V07Rw4088912>