diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
| commit | 10f6cf6eef0a7da7dad1933efdbfb101155792d0 (patch) | |
| tree | d8ee3bfc6e55e739e0f135cd6d945955c670dd46 /core/timer.inc | |
| parent | 35928ee37da523e5f992cc462a4a4193d0bfaa4c (diff) | |
| parent | ddb10ce99c327888ade4d2ba3e4c50ad12aaa059 (diff) | |
| download | syslinux-6.00-pre3.tar.gz | |
Merge tag 'syslinux-5.00' into firmwaresyslinux-6.00-pre3
Conflicts:
Makefile
com32/elflink/ldlinux/Makefile
com32/lib/sys/module/elf_module.c
core/cleanup.c
core/comboot.inc
core/conio.c
core/fs/fs.c
core/init.c
core/mem/free.c
core/mem/malloc.c
core/timer.inc
diag/geodsp/Makefile
extlinux/main.c
mk/embedded.mk
modules/Makefile
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'core/timer.inc')
| -rw-r--r-- | core/timer.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/timer.inc b/core/timer.inc index 9f42fdf2..80647983 100644 --- a/core/timer.inc +++ b/core/timer.inc @@ -32,7 +32,7 @@ timer_init: mov dword [BIOS_timer_hook],timer_irq ret - global bios_timer_cleanup + global bios_timer_cleanup:function hidden bios_timer_cleanup: ; Unhook INT 1Ch mov eax,[BIOS_timer_next] @@ -43,18 +43,18 @@ bios_timer_cleanup: ; The specified frequency is 14.31818 MHz/12/65536; this turns out ; to be a period of 54.92542 ms, or 0x36.ece8(187c) hexadecimal. ; - global timer_irq + global timer_irq:function hidden timer_irq: inc dword [cs:__jiffies] add word [cs:__ms_timer_adj],0xece8 adc dword [cs:__ms_timer],0x36 jmp 0:0 - global BIOS_timer_next + global BIOS_timer_next:data hidden BIOS_timer_next equ $-4 section .data16 alignz 4 - global __jiffies, __ms_timer + global __jiffies:data hidden, __ms_timer __jiffies dd 0 ; Clock tick timer __ms_timer dd 0 ; Millisecond timer __ms_timer_adj dw 0 ; Millisecond timer correction factor |