| /shark/trunk/oslib/kl/time.c |
|---|
| 32,6 → 32,7 |
| #include <ll/i386/stdlib.h> |
| #include <ll/i386/error.h> |
| #include <ll/i386/mem.h> |
| #include <ll/i386/advtimer.h> |
| #include <ll/sys/ll/ll-data.h> |
| #include <ll/sys/ll/ll-func.h> |
| #include <ll/sys/ll/time.h> |
| 142,11 → 143,11 |
| #if 1 |
| if (activeEvent) { |
| if (tsres != NULL) { |
| read_timespec(tsres); |
| ll_read_timespec(tsres); |
| } else { |
| struct timespec tmp; |
| read_timespec(&tmp); |
| ll_read_timespec(&tmp); |
| return TIMESPEC2USEC(&tmp); |
| } |
| return TIMESPEC2USEC(tsres); |
| 159,11 → 160,11 |
| } |
| if(tsres != NULL) { |
| read_timespec(tsres); |
| ll_read_timespec(tsres); |
| } else { |
| struct timespec tmp; |
| read_timespec(&tmp); |
| ll_read_timespec(&tmp); |
| return TIMESPEC2USEC(&tmp); |
| } |
| return TIMESPEC2USEC(tsres); |
| 171,12 → 172,12 |
| if (mode == TIME_NEW) { |
| if (tsres != NULL) { |
| read_timespec(tsres); |
| ll_read_timespec(tsres); |
| return TIMESPEC2USEC(tsres); |
| } else { |
| struct timespec tmp; |
| read_timespec(&tmp); |
| ll_read_timespec(&tmp); |
| return TIMESPEC2USEC(&tmp); |
| } |
| } |
| 184,11 → 185,11 |
| if (mode == TIME_EXACT) { |
| if (timermode == LL_PERIODIC) { |
| if (tsres != NULL) { |
| read_timespec(tsres); |
| ll_read_timespec(tsres); |
| } else { |
| struct timespec tmp; |
| read_timespec(&tmp); |
| ll_read_timespec(&tmp); |
| return TIMESPEC2USEC(&tmp); |
| } |
| return TIMESPEC2USEC(tsres); |
| /shark/trunk/oslib/kl/event.c |
|---|
| 34,6 → 34,8 |
| #include <ll/i386/hw-arch.h> |
| #include <ll/i386/pic.h> |
| #include <ll/i386/pit.h> |
| #include <ll/i386/advtimer.h> |
| #include <ll/sys/ll/ll-data.h> |
| #include <ll/sys/ll/ll-instr.h> |
| #include <ll/sys/ll/time.h> |
| 175,7 → 177,7 |
| if (!use_tsc) { |
| ADDNANO2TIMESPEC(nts, &actTime); |
| } else { |
| read_timespec(&actTime); |
| ll_read_timespec(&actTime); |
| } |
| for (p = firstevent; p != NULL; p = pp) { |
| /shark/trunk/oslib/kl/event1.c |
|---|
| 31,6 → 31,8 |
| #include <ll/i386/stdlib.h> |
| #include <ll/i386/mem.h> |
| #include <ll/i386/pit.h> |
| #include <ll/i386/advtimer.h> |
| #include <ll/sys/ll/ll-data.h> |
| #include <ll/sys/ll/time.h> |
| #include <ll/sys/ll/event.h> |
| 131,7 → 133,7 |
| } else { |
| read_timespec(&now); |
| ll_read_timespec(&now); |
| } |
| 172,7 → 174,7 |
| } else { |
| read_timespec(&now); |
| ll_read_timespec(&now); |
| } |
| /shark/trunk/oslib/kl/init.c |
|---|
| 29,6 → 29,7 |
| #include <ll/i386/error.h> |
| #include <ll/i386/pit.h> |
| #include <ll/i386/pic.h> |
| #include <ll/i386/advtimer.h> |
| #include <ll/i386/tss-ctx.h> |
| #include <ll/i386/hw-arch.h> |
| 183,7 → 184,7 |
| void abort_tail(int code) |
| { |
| message("ABORT %d !!!",code); |
| restore_CMOS(); |
| ll_restore_CMOS(); |
| l1_end(); |
| sti(); |
| l1_exit(1); |
| 191,7 → 192,7 |
| void ll_end(void) |
| { |
| restore_CMOS(); |
| ll_restore_CMOS(); |
| l1_end(); |
| } |
| /shark/trunk/oslib/kl/advtimer.c |
|---|
| 184,7 → 184,7 |
| } |
| //Low level time read function |
| void read_timespec(struct timespec *tspec) |
| void ll_read_timespec(struct timespec *tspec) |
| { |
| signed long long actual_tsc; |
| 197,8 → 197,6 |
| rdtscll(actual_tsc); |
| tspec->tsc = actual_tsc; |
| dt = actual_tsc - init_tsc; |
| UNSIGNED_TSC2NSEC(dt,&dn); |
| 223,7 → 221,7 |
| if (use_cmos) { |
| message("CMOS adjustment enabled\n"); |
| message("CMOS adjustement enabled\n"); |
| cli(); |
| 249,7 → 247,7 |
| } |
| void restore_CMOS() |
| void ll_restore_CMOS() |
| { |
| if (use_cmos) { |
| cli(); |