| 36,7 → 36,6 |
|---|
| #include <ll/i386/pit.h> |
| #include <ll/i386/apic.h> |
| #include <ll/i386/advtimer.h> |
| #include <ll/i386/64bit.h> |
| |
| #include <ll/sys/ll/ll-data.h> |
| #include <ll/sys/ll/ll-instr.h> |
| 73,7 → 72,9 |
|---|
| extern void (*evt_prol) (void); |
| extern void (*evt_epil) (void); |
| |
| extern unsigned int apic_clk_per_msec; |
| extern unsigned char use_tsc; |
| extern unsigned char use_apic; |
| extern signed long long apic_clk_per_msec; |
| |
| void event_setlasthandler(void *p) |
| { |
| 166,15 → 167,13 |
|---|
| void periodic_wake_up(void) |
| { /* CHANGE the NAME, please... */ |
| struct event *p, *pp; |
| #ifndef __TSC__ |
| WORD tmp; |
| #endif |
| WORD tmp; |
| |
| #ifndef __TSC__ |
| if(!use_tsc) { |
| tmp = pit_read(frc); |
| ADDPITSPEC((WORD) (lastTime - tmp), &globalCounter); |
| lastTime = tmp; |
| #endif |
| } |
| |
| activeInt++; |
| if (activeInt == 1 && evt_prol != NULL) { |
| 181,11 → 180,11 |
|---|
| evt_prol(); |
| } |
| |
| #ifndef __TSC__ |
| if (!use_tsc) { |
| ADDNANO2TIMESPEC(nts, &actTime); |
| #else |
| } else { |
| ll_read_timespec(&actTime); |
| #endif |
| } |
| |
| for (p = firstevent; p != NULL; p = pp) { |
| /* |
| 218,30 → 217,25 |
|---|
| int i; |
| BYTE mask; |
| TIME t; |
| #ifdef __APIC__ |
| DWORD apic_clk; |
| #endif |
| DWORD apic_clk; |
| |
| #ifdef __TSC__ |
| ll_init_advtimer(); |
| #endif |
| if (use_tsc) ll_init_advtimer(); |
| |
| #ifndef __APIC__ |
| if (!use_apic) |
| IDT_place(0x40,ll_timer); |
| #else |
| else |
| IDT_place(0x39,ll_apic_timer); |
| #endif |
| |
| if (l->mode != LL_PERIODIC) { |
| message("One-shot mode\n"); |
| t = 0; |
| #ifndef __APIC__ |
| if (!use_apic) { |
| /* Mode: Binary/Mode 4/16 bit Time_const/Counter 0 */ |
| pit_init(0, TMR_MD4, 0xFFFF); /* Timer 0, Mode 4, constant 0xFFFF */ |
| #else |
| } else { |
| set_APIC_timer(0xFFFFFFFF); |
| enable_APIC_timer(); |
| #endif |
| } |
| } else { |
| t = l->tick; |
| |
| 254,10 → 248,10 |
|---|
| /* If T-C == 0 -> T-C = 65536 (Max available) */ |
| ticksize = t; |
| |
| #ifndef __APIC__ |
| if (!use_apic) { |
| |
| t = (signed long long)(t) * 1193182 / 1000000; |
| |
| mul32div32to32(t,1197,1000,t); |
| |
| /* Only for security! This should cause timer overrun */ |
| /* While 0 would set maximum period on timer */ |
| if (t == 0) |
| 266,17 → 260,17 |
|---|
| /* Mode: Binary/Mode 2/16 bit Time_const/Counter 0 */ |
| pit_init(0, TMR_MD2, t); /* Timer 0, Mode 2, Time constant t */ |
| |
| #else |
| } else { |
| |
| mul32div32to32(t,apic_clk_per_msec,1000,apic_clk); |
| apic_clk = (signed long long)(t) * apic_clk_per_msec / 1000; |
| set_APIC_timer(apic_clk); |
| enable_APIC_timer(); |
| |
| #endif |
| } |
| } |
| timermode = l->mode; |
| |
| #ifndef __APIC__ |
| if (!use_apic) { |
| if (ll_arch.x86.cpu > 4) { |
| /* Timer1: mode 0, time const 0... */ |
| pit_init(1, TMR_MD0, 0); |
| 286,7 → 280,7 |
|---|
| pit_init(2, TMR_MD0, 0); |
| outp(0x61, 3); |
| } |
| #endif |
| } |
| |
| mask = ll_in(0x21); |
| mask &= 0xFE; /* 0xFE = ~0x01 */ |
| 322,8 → 316,6 |
|---|
| } |
| |
| /* Last but not least... */ |
| #ifndef __APIC__ |
| irq_unmask(0); |
| #endif |
| if (!use_apic) irq_unmask(0); |
| |
| } |