Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed some unused variables and functions.

Browse Source
This commit is contained in:
Kees van Reeuwijk
2010-06-02 19:41:38 +00:00
parent fc29251444
commit ed0b81c25c
10 changed files with 11 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
kernel/arch/i386/apic.c
View File

@@ -45,14 +45,11 @@
#define VERBOSE_APIC(x) x
PRIVATE int reboot_type;
PRIVATE int ioapic_enabled;
PRIVATE u32_t ioapic_id_mask[8];
PRIVATE u32_t lapic_id_mask[8];
PUBLIC u32_t lapic_addr_vaddr;
PUBLIC vir_bytes lapic_addr;
PUBLIC vir_bytes lapic_eoi_addr;
PRIVATE u32_t lapic_taskpri_addr;
PRIVATE volatile int probe_ticks;
PRIVATE u64_t tsc0, tsc1;
@@ -62,8 +59,6 @@ PRIVATE u32_t lapic_tctr0, lapic_tctr1;
PUBLIC u8_t apicid2cpuid[MAX_NR_APICIDS+1]; /* Accessed from asm */
PRIVATE unsigned apic_imcrp;
PRIVATE unsigned nioapics;
PRIVATE unsigned nbuses;
PRIVATE unsigned nintrs;
PRIVATE const unsigned nlints = 0;
@@ -77,7 +72,6 @@ PRIVATE u32_t lapic_bus_freq[CONFIG_MAX_CPUS];
#define PROBE_TICKS (system_hz / 10)
PRIVATE u32_t pci_config_intr_data;
PRIVATE u32_t ioapic_extint_assigned = 0;
PRIVATE int lapic_extint_assigned = 0;
PRIVATE int calib_clk_handler(irq_hook_t * UNUSED(hook))
@@ -225,35 +219,6 @@ PRIVATE u32_t lapic_errstatus(void)
return lapic_read(LAPIC_ESR);
}
PRIVATE void lapic_disable(void)
{
/* Disable current APIC and close interrupts from PIC */
u32_t val;
if (!lapic_addr)
return;
{
/* leave it enabled if imcr is not set */
val = lapic_read(LAPIC_LINT0);
val &= ~(APIC_ICR_DM_MASK|APIC_ICR_INT_MASK);
val |= APIC_ICR_DM_EXTINT; /* ExtINT at LINT0 */
lapic_write (LAPIC_LINT0, val);
return;
}
val = lapic_read(LAPIC_LINT0) & 0xFFFE58FF;
val |= APIC_ICR_INT_MASK;
lapic_write (LAPIC_LINT0, val);
val = lapic_read(LAPIC_LINT1) & 0xFFFE58FF;
val |= APIC_ICR_INT_MASK;
lapic_write (LAPIC_LINT1, val);
val = lapic_read(LAPIC_SIVR) & 0xFFFFFF00;
val &= ~APIC_ENABLE;
lapic_write(LAPIC_SIVR, val);
}
PRIVATE void lapic_enable_no_lints(void)
{
u32_t val;

20
kernel/arch/i386/arch_clock.c
View File

@@ -63,26 +63,6 @@ PUBLIC void stop_8253A_timer(void)
outb(TIMER0, 0);
}
/*===========================================================================*
* read_8235A_timer *
*===========================================================================*/
PRIVATE clock_t read_8253A_timer(void)
{
/* Read the counter of channel 0 of the 8253A timer. This counter
* counts down at a rate of TIMER_FREQ and restarts at
* TIMER_COUNT-1 when it reaches zero. A hardware interrupt
* (clock tick) occurs when the counter gets to zero and restarts
* its cycle.
*/
u32_t count;
outb(TIMER_MODE, LATCH_COUNT);
count = inb(TIMER0);
count |= (inb(TIMER0) << 8);
return count;
}
PRIVATE int calib_cpu_handler(irq_hook_t * UNUSED(hook))
{
u64_t tsc;