d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanup of APIC_IO code.

Browse Source 
Submitted by:	Stefan Esser <se@freebsd.org>
This commit is contained in:
Steve Passe 1997-05-27 19:24:36 +00:00
parent e81ebf9281
commit 6ef807e505
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/pci/pci.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pci.c,v 1.72 1997/05/26 15:08:34 se Exp $
* $Id: pci.c,v 1.73 1997/05/27 04:09:01 fsmp Exp $
*
*/
@ -332,18 +332,15 @@ pci_readcfg(pcicfgregs *probe)
cfg->intline = pci_cfgread(cfg, PCIR_INTLINE, 1);
#ifdef APIC_IO
if (cfg->intline && (cfg->intline != 0xff)) {
u_char airq = 0xff;
u_char rirq = 0xff;
if (cfg->intpin != 0) {
int airq;
airq = get_pci_apic_irq(cfg->bus,
cfg->slot, cfg->intpin);
if (airq != 0xff) { /* APIC IRQ exists */
rirq = cfg->intline; /* 're-directed' IRQ */
cfg->intline = airq; /* use APIC IRQ */
pci_cfgwrite(cfg, PCIR_INTLINE, airq, 1);
undirect_pci_irq(rirq);
if ((airq >= 0) && (airq != cfg->intline)) {
undirect_pci_irq(cfg->intline);
cfg->intline = airq;
}
}
#endif /* APIC_IO */

15
sys/pci/pci.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pci.c,v 1.72 1997/05/26 15:08:34 se Exp $
* $Id: pci.c,v 1.73 1997/05/27 04:09:01 fsmp Exp $
*
*/
@ -332,18 +332,15 @@ pci_readcfg(pcicfgregs *probe)
cfg->intline = pci_cfgread(cfg, PCIR_INTLINE, 1);
#ifdef APIC_IO
if (cfg->intline && (cfg->intline != 0xff)) {
u_char airq = 0xff;
u_char rirq = 0xff;
if (cfg->intpin != 0) {
int airq;
airq = get_pci_apic_irq(cfg->bus,
cfg->slot, cfg->intpin);
if (airq != 0xff) { /* APIC IRQ exists */
rirq = cfg->intline; /* 're-directed' IRQ */
cfg->intline = airq; /* use APIC IRQ */
pci_cfgwrite(cfg, PCIR_INTLINE, airq, 1);
undirect_pci_irq(rirq);
if ((airq >= 0) && (airq != cfg->intline)) {
undirect_pci_irq(cfg->intline);
cfg->intline = airq;
}
}
#endif /* APIC_IO */