| /trunk/kernel/arch/ia64/src/drivers/ega.c |
|---|
| 82,7 → 82,6 |
| chardev_initialize("ega_out", &ega_console, &ega_ops); |
| stdout = &ega_console; |
| ega_parea.pbase = VIDEORAM & 0xffffffff; |
| ega_parea.vbase = (uintptr_t) videoram; |
| ega_parea.frames = 1; |
| 89,13 → 88,13 |
| ega_parea.cacheable = false; |
| ddi_parea_register(&ega_parea); |
| sysinfo_set_item_val("fb", NULL, true); |
| sysinfo_set_item_val("fb.kind", NULL, 2); |
| sysinfo_set_item_val("fb.width", NULL, ROW); |
| sysinfo_set_item_val("fb.height", NULL, ROWS); |
| sysinfo_set_item_val("fb.blinking", NULL, true); |
| sysinfo_set_item_val("fb.address.physical", NULL, VIDEORAM & 0xffffffff); |
| sysinfo_set_item_val("fb.address.physical", NULL, |
| VIDEORAM & 0xffffffff); |
| #ifndef CONFIG_FB |
| putchar('\n'); |
| 116,7 → 115,8 |
| if (ega_cursor < SCREEN) |
| return; |
| memmove((void *) videoram, (void *) (videoram + ROW * 2), (SCREEN - ROW) * 2); |
| memmove((void *) videoram, (void *) (videoram + ROW * 2), |
| (SCREEN - ROW) * 2); |
| _memsetw(videoram + (SCREEN - ROW) * 2, ROW, 0x0720); |
| ega_cursor = ega_cursor - ROW; |
| } |
| /trunk/kernel/arch/ia64/src/drivers/it.c |
|---|
| 44,18 → 44,16 |
| #include <ddi/device.h> |
| #include <arch.h> |
| #define IT_SERVICE_CLOCKS 64 |
| #define IT_SERVICE_CLOCKS 64 |
| #define FREQ_NUMERATOR_SHIFT 32 |
| #define FREQ_NUMERATOR_MASK 0xffffffff00000000LL |
| #define FREQ_NUMERATOR_SHIFT 32 |
| #define FREQ_NUMERATOR_MASK 0xffffffff00000000ULL |
| #define FREQ_DENOMINATOR_SHIFT 0 |
| #define FREQ_DENOMINATOR_MASK 0xffffffffLL |
| #define FREQ_DENOMINATOR_SHIFT 0 |
| #define FREQ_DENOMINATOR_MASK 0xffffffffULL |
| uint64_t it_delta; |
| static irq_t it_irq; |
| static irq_ownership_t it_claim(void); |
| 66,8 → 64,7 |
| { |
| cr_itv_t itv; |
| if(config.cpu_active==1) |
| { |
| if (config.cpu_active == 1) { |
| irq_initialize(&it_irq); |
| it_irq.inr = INTERRUPT_TIMER; |
| it_irq.devno = device_assign_devno(); |
| 76,12 → 73,13 |
| irq_register(&it_irq); |
| uint64_t base_freq; |
| base_freq = ((bootinfo->freq_scale) & FREQ_NUMERATOR_MASK) >> FREQ_NUMERATOR_SHIFT; |
| base_freq = ((bootinfo->freq_scale) & FREQ_NUMERATOR_MASK) >> |
| FREQ_NUMERATOR_SHIFT; |
| base_freq *= bootinfo->sys_freq; |
| base_freq /= ((bootinfo->freq_scale) & FREQ_DENOMINATOR_MASK) >> FREQ_DENOMINATOR_SHIFT; |
| base_freq /= ((bootinfo->freq_scale) & FREQ_DENOMINATOR_MASK) >> |
| FREQ_DENOMINATOR_SHIFT; |
| it_delta = base_freq /HZ; |
| it_delta = base_freq / HZ; |
| } |
| /* initialize Interval Timer external interrupt vector */ |