diff options
| author | Flavio Cruz <flaviocruz@gmail.com> | 2022-12-16 17:47:36 -0500 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-12-17 02:36:25 +0100 |
| commit | c00d8d62878434e82b04d5ad5901f938d120debf (patch) | |
| tree | 2a53359eea9b5ff0b53faccc6fbc99ee0e8fb863 | |
| parent | cef6d34aa02698ec2a173bdc6f42ae979ac08cd9 (diff) | |
| download | gnumach-c00d8d62878434e82b04d5ad5901f938d120debf.tar.gz gnumach-c00d8d62878434e82b04d5ad5901f938d120debf.tar.bz2 gnumach-c00d8d62878434e82b04d5ad5901f938d120debf.zip | |
Fix compiler warnings due to use of inline for mask_irq/unmask_irq
Message-Id: <Y5z01C/L+pnSVNIP@mars>
| -rw-r--r-- | i386/i386/apic.h | 14 | ||||
| -rw-r--r-- | i386/i386/pic.c | 4 | ||||
| -rw-r--r-- | i386/i386/pic.h | 4 | ||||
| -rw-r--r-- | i386/i386at/ioapic.c | 12 |
4 files changed, 16 insertions, 18 deletions
diff --git a/i386/i386/apic.h b/i386/i386/apic.h index add1b8cf..10c83c01 100644 --- a/i386/i386/apic.h +++ b/i386/i386/apic.h @@ -158,8 +158,6 @@ void ioapic_configure(void); extern int timer_pin; extern void intnull(int unit); extern volatile ApicLocalUnit* lapic; -extern inline void mask_irq (unsigned int irq_nr); -extern inline void unmask_irq (unsigned int irq_nr); #endif @@ -207,5 +205,17 @@ extern inline void unmask_irq (unsigned int irq_nr); #define APIC_CLEAR_MASK_BIT(reg, bit) \ ((reg)[(bit) >> 5].r &= ~(1 << ((bit) & 0x1f))) +#ifndef __ASSEMBLER__ + +static inline void mask_irq (unsigned int irq_nr) { + ioapic_toggle(irq_nr, IOAPIC_MASK_DISABLED); +} + +static inline void unmask_irq (unsigned int irq_nr) { + ioapic_toggle(irq_nr, IOAPIC_MASK_ENABLED); +} + +#endif /* !__ASSEMBLER__ */ + #endif /*_IMPS_APIC_*/ diff --git a/i386/i386/pic.c b/i386/i386/pic.c index 62ed9ed1..4d51a535 100644 --- a/i386/i386/pic.c +++ b/i386/i386/pic.c @@ -207,7 +207,7 @@ intnull(int unit_dev) /* * Mask a PIC IRQ. */ -inline void +void mask_irq (unsigned int irq_nr) { int new_pic_mask = curr_pic_mask | 1 << irq_nr; @@ -229,7 +229,7 @@ mask_irq (unsigned int irq_nr) /* * Unmask a PIC IRQ. */ -inline void +void unmask_irq (unsigned int irq_nr) { int mask; diff --git a/i386/i386/pic.h b/i386/i386/pic.h index 3ded9aba..aec0ef6b 100644 --- a/i386/i386/pic.h +++ b/i386/i386/pic.h @@ -184,8 +184,8 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. extern void picinit (void); extern int curr_pic_mask; extern void intnull(int unit); -extern inline void mask_irq (unsigned int irq_nr); -extern inline void unmask_irq (unsigned int irq_nr); +extern void mask_irq (unsigned int irq_nr); +extern void unmask_irq (unsigned int irq_nr); #endif /* __ASSEMBLER__ */ #endif /* _I386_PIC_H_ */ diff --git a/i386/i386at/ioapic.c b/i386/i386at/ioapic.c index 18a9bec6..e5523488 100644 --- a/i386/i386at/ioapic.c +++ b/i386/i386at/ioapic.c @@ -267,18 +267,6 @@ ioapic_irq_eoi(int pin) lapic_eoi (); } -void -unmask_irq(unsigned int irq) -{ - ioapic_toggle(irq, IOAPIC_MASK_ENABLED); -} - -void -mask_irq(unsigned int irq) -{ - ioapic_toggle(irq, IOAPIC_MASK_DISABLED); -} - static unsigned int override_irq(IrqOverrideData *override, union ioapic_route_entry_union *entry) { |