[haiku-commits] r35660 - haiku/trunk/src/system/kernel/arch/x86

From: stefano.ceccherini@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sun, 28 Feb 2010 18:17:42 +0100 (CET)
Author: jackburton
Date: 2010-02-28 18:17:42 +0100 (Sun, 28 Feb 2010)
New Revision: 35660
Changeset: http://dev.haiku-os.org/changeset/35660/haiku

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp
Log:
small cleanup: move variables declaration near where they're used.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp 2010-02-28 17:16:29 UTC 
(rev 35659)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp 2010-02-28 17:17:42 UTC 
(rev 35660)
@@ -261,8 +261,6 @@
 static bool
 pic_is_spurious_interrupt(int32 num)
 {
-       int32 isr;
-
        if (num != 7)
                return false;
 
@@ -271,7 +269,7 @@
        // just ignore them
 
        out8(PIC_CONTROL3 | PIC_CONTROL3_READ_ISR, PIC_MASTER_CONTROL);
-       isr = in8(PIC_MASTER_CONTROL);
+       int32 isr = in8(PIC_MASTER_CONTROL);
        out8(PIC_CONTROL3 | PIC_CONTROL3_READ_IRR, PIC_MASTER_CONTROL);
 
        return (isr & 0x80) == 0;
@@ -439,9 +437,8 @@
 static inline uint64
 ioapic_read_64(uint8 registerSelect)
 {
-       uint64 result;
        sIOAPIC->io_register_select = registerSelect + 1;
-       result = sIOAPIC->io_window_register;
+       uint64 result = sIOAPIC->io_window_register;
        result <<= 32;
        sIOAPIC->io_register_select = registerSelect;
        result |= sIOAPIC->io_window_register;
@@ -477,14 +474,13 @@
 static void
 ioapic_enable_io_interrupt(int32 num)
 {
-       uint64 entry;
        int32 pin = sIRQToIOAPICPin[num];
        if (pin < 0 || pin > (int32)sIOAPICMaxRedirectionEntry)
                return;
 
        TRACE(("ioapic_enable_io_interrupt: IRQ %ld -> pin %ld\n", num, pin));
 
-       entry = ioapic_read_64(IO_APIC_REDIRECTION_TABLE + pin * 2);
+       uint64 entry = ioapic_read_64(IO_APIC_REDIRECTION_TABLE + pin * 2);
        entry &= ~(1 << IO_APIC_INTERRUPT_MASK_SHIFT);
        entry |= IO_APIC_INTERRUPT_UNMASKED << IO_APIC_INTERRUPT_MASK_SHIFT;
        ioapic_write_64(IO_APIC_REDIRECTION_TABLE + pin * 2, entry);
@@ -494,14 +490,13 @@
 static void
 ioapic_disable_io_interrupt(int32 num)
 {
-       uint64 entry;
        int32 pin = sIRQToIOAPICPin[num];
        if (pin < 0 || pin > (int32)sIOAPICMaxRedirectionEntry)
                return;
 
        TRACE(("ioapic_disable_io_interrupt: IRQ %ld -> pin %ld\n", num, pin));
 
-       entry = ioapic_read_64(IO_APIC_REDIRECTION_TABLE + pin * 2);
+       uint64 entry = ioapic_read_64(IO_APIC_REDIRECTION_TABLE + pin * 2);
        entry &= ~(1 << IO_APIC_INTERRUPT_MASK_SHIFT);
        entry |= IO_APIC_INTERRUPT_MASKED << IO_APIC_INTERRUPT_MASK_SHIFT;
        ioapic_write_64(IO_APIC_REDIRECTION_TABLE + pin * 2, entry);
@@ -511,7 +506,6 @@
 static void
 ioapic_configure_io_interrupt(int32 num, uint32 config)
 {
-       uint64 entry;
        int32 pin = sIRQToIOAPICPin[num];
        if (pin < 0 || pin > (int32)sIOAPICMaxRedirectionEntry)
                return;
@@ -519,7 +513,7 @@
        TRACE(("ioapic_configure_io_interrupt: IRQ %ld -> pin %ld; config 
0x%08lx\n",
                num, pin, config));
 
-       entry = ioapic_read_64(IO_APIC_REDIRECTION_TABLE + pin * 2);
+       uint64 entry = ioapic_read_64(IO_APIC_REDIRECTION_TABLE + pin * 2);
        entry &= ~((1 << IO_APIC_TRIGGER_MODE_SHIFT)
                | (1 << IO_APIC_PIN_POLARITY_SHIFT)
                | (IO_APIC_INTERRUPT_VECTOR_MASK << 
IO_APIC_INTERRUPT_VECTOR_SHIFT));
[haiku-commits] r35660 - haiku/trunk/src/system/kernel/arch/x86

Other related posts:
