Subversion Repositories HelenOS

Compare Revisions

Regard whitespace Rev 2100 → Rev 2101

/trunk/kernel/genarch/src/acpi/madt.c
69,7 → 69,7
count_t cpu_count = 0;
 
struct madt_apic_header * * madt_entries_index = NULL;
int madt_entries_index_cnt = 0;
unsigned int madt_entries_index_cnt = 0;
 
char *entry[] = {
"L_APIC",
90,7 → 90,7
static bool madt_cpu_enabled(index_t i);
static bool madt_cpu_bootstrap(index_t i);
static uint8_t madt_cpu_apic_id(index_t i);
static int madt_irq_to_pin(int irq);
static int madt_irq_to_pin(unsigned int irq);
 
struct smp_config_operations madt_config_operations = {
.cpu_count = madt_cpu_count,
124,7 → 124,7
return ((struct madt_l_apic *) madt_entries_index[madt_l_apic_entry_index + i])->apic_id;
}
 
int madt_irq_to_pin(int irq)
int madt_irq_to_pin(unsigned int irq)
{
ASSERT(irq < sizeof(isa_irq_map)/sizeof(int));
return isa_irq_map[irq];
165,6 → 165,7
qsort(madt_entries_index, madt_entries_index_cnt, sizeof(uintptr_t), &madt_cmp);
 
/* Parse MADT entries */
if (madt_entries_index_cnt > 0) {
for (index = 0; index < madt_entries_index_cnt - 1; index++) {
h = madt_entries_index[index];
switch (h->type) {
195,11 → 196,9
}
break;
}
}
}
 
if (cpu_count)
config.cpu_count = cpu_count;
}
/trunk/kernel/arch/ia32xen/src/smp/mps.c
92,7 → 92,7
static bool is_cpu_enabled(index_t i);
static bool is_bsp(index_t i);
static uint8_t get_cpu_apic_id(index_t i);
static int mps_irq_to_pin(int irq);
static int mps_irq_to_pin(unsigned int irq);
 
struct smp_config_operations mps_config_operations = {
.cpu_count = get_cpu_count,
415,7 → 415,7
}
}
 
int mps_irq_to_pin(int irq)
int mps_irq_to_pin(unsigned int irq)
{
int i;
/trunk/kernel/arch/ia32xen/src/smp/smp.c
162,7 → 162,7
}
}
 
int smp_irq_to_pin(int irq)
int smp_irq_to_pin(unsigned int irq)
{
ASSERT(ops != NULL);
return ops->irq_to_pin(irq);
/trunk/kernel/arch/ia32xen/src/smp/apic.c
124,7 → 124,7
void apic_init(void)
{
io_apic_id_t idreg;
int i;
unsigned int i;
 
exc_register(VECTOR_APIC_SPUR, "apic_spurious", (iroutine) apic_spurious);
 
528,7 → 528,8
void io_apic_disable_irqs(uint16_t irqmask)
{
io_redirection_reg_t reg;
int i, pin;
unsigned int i;
int pin;
for (i=0;i<16;i++) {
if (irqmask & (1<<i)) {
553,7 → 554,8
*/
void io_apic_enable_irqs(uint16_t irqmask)
{
int i, pin;
unsigned int i;
int pin;
io_redirection_reg_t reg;
for (i=0;i<16;i++) {
/trunk/kernel/arch/ia32/include/smp/smp.h
43,10 → 43,10
bool (* cpu_enabled)(index_t i); /**< Check whether the processor of index i is enabled. */
bool (*cpu_bootstrap)(index_t i); /**< Check whether the processor of index i is BSP. */
uint8_t (*cpu_apic_id)(index_t i); /**< Return APIC ID of the processor of index i. */
int (*irq_to_pin)(int irq); /**< Return mapping between irq and APIC pin. */
int (*irq_to_pin)(unsigned int irq); /**< Return mapping between irq and APIC pin. */
};
 
extern int smp_irq_to_pin(int irq);
extern int smp_irq_to_pin(unsigned int irq);
 
#endif
 
/trunk/kernel/arch/ia32/src/smp/mps.c
90,7 → 90,7
static bool is_cpu_enabled(index_t i);
static bool is_bsp(index_t i);
static uint8_t get_cpu_apic_id(index_t i);
static int mps_irq_to_pin(int irq);
static int mps_irq_to_pin(unsigned int irq);
 
struct smp_config_operations mps_config_operations = {
.cpu_count = get_cpu_count,
413,7 → 413,7
}
}
 
int mps_irq_to_pin(int irq)
int mps_irq_to_pin(unsigned int irq)
{
unsigned int i;
/trunk/kernel/arch/ia32/src/smp/smp.c
170,7 → 170,7
}
}
 
int smp_irq_to_pin(int irq)
int smp_irq_to_pin(unsigned int irq)
{
ASSERT(ops != NULL);
return ops->irq_to_pin(irq);
/trunk/kernel/arch/ia32/src/smp/apic.c
146,7 → 146,7
void apic_init(void)
{
io_apic_id_t idreg;
int i;
unsigned int i;
 
exc_register(VECTOR_APIC_SPUR, "apic_spurious", (iroutine) apic_spurious);
 
534,7 → 534,8
void io_apic_disable_irqs(uint16_t irqmask)
{
io_redirection_reg_t reg;
int i, pin;
unsigned int i;
int pin;
for (i=0;i<16;i++) {
if (irqmask & (1<<i)) {
559,7 → 560,8
*/
void io_apic_enable_irqs(uint16_t irqmask)
{
int i, pin;
unsigned int i;
int pin;
io_redirection_reg_t reg;
for (i=0;i<16;i++) {