diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-04-04 15:00:34 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-04-04 15:00:34 -0700 |
| commit | 2cd336282f7b3411cf6f384d82487a11e1ccfc1e (patch) | |
| tree | 9977477d71edcbde1dd382aaa131c03fafee232a /doc | |
| parent | 0622cf1442f4f04c12ad91e0652b97f2a01c1e93 (diff) | |
| parent | 390a4bf409a4574fe3272adf9f873ef78b78c167 (diff) | |
| download | syslinux.git-2cd336282f7b3411cf6f384d82487a11e1ccfc1e.tar.gz syslinux.git-2cd336282f7b3411cf6f384d82487a11e1ccfc1e.tar.xz syslinux.git-2cd336282f7b3411cf6f384d82487a11e1ccfc1e.zip | |
Merge branch 'master' into new-shuffler
Conflicts:
com32/lib/syslinux/memmap.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/comboot.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/comboot.txt b/doc/comboot.txt index 3ebadf33..cf106dfe 100644 --- a/doc/comboot.txt +++ b/doc/comboot.txt @@ -79,13 +79,14 @@ The following arguments are passed to the program on the stack: Address Size Meaning [ESP] dword Return (termination) address - [ESP+4] dword Number of additional arguments (currently 5) + [ESP+4] dword Number of additional arguments (currently 7) [ESP+8] dword Pointer to the command line arguments (null-terminated string) [ESP+12] dword Pointer to INT call helper function [ESP+16] dword Pointer to low memory bounce buffer [ESP+20] dword Size of low memory bounce buffer [ESP+24] dword Pointer to FAR call helper function (new in 2.05) [ESP+28] dword Pointer to CDECL helper function (new in 3.54) + [ESP+32] dword Amount of memory controlled by the Syslinux core (new in 3.74) This corresponds to the following C prototype, available in the file com32/include/com32.h: |