summaryrefslogtreecommitdiff
path: root/core/timer.inc
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-07-05 14:23:50 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-07-05 14:23:50 -0700
commit7072cf57e5f43449223c1fe75aebcbf82659e515 (patch)
treeddb56c4504a5f5f0c38e9dc71e9a707932d21d85 /core/timer.inc
parent9a332c5f03c9f9cc81f6c247c6d248a715f6eabb (diff)
parent6841745fa86a45405de9bdd0e453f4abb26398b7 (diff)
downloadsyslinux-7072cf57e5f43449223c1fe75aebcbf82659e515.tar.gz
Merge remote branch 'marcel/luaext'
Merge Marcel Ritter's work on the lua branch: The last time he wrote about the state of his lua branch: http://syslinux.zytor.com/archives/2009-October/013383.html The current state is: - VESA: - switching to vesa mode works - loading/displaying images works - display text works (s. com32/lua/test/vesa.lua) - PCI: - list PC devices + ID - get human-readable device name for device (s. com32/lua/test/pci.lua) - DMI: - get DMI info (BIOS, Hardware, etc). (s. com32/lua/test/dmi.lua) - syslinux: - loading files, kernel, initrd - start kernel, initrd, local boot ... just working on this, so no example lua file right now Most of the actual merging work was done by Gert Hulselmans <gerth@zytor.com>. Resolved Conflicts: com32/lib/sys/vesa/initvesa.c com32/lua/src/Makefile Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/timer.inc')
0 files changed, 0 insertions, 0 deletions