diff options
| author | hpa <hpa> | 2002-04-16 23:51:21 +0000 |
|---|---|---|
| committer | hpa <hpa> | 2002-04-16 23:51:21 +0000 |
| commit | c7641125412ebed8d919df7d83ffec00ca49d09b (patch) | |
| tree | 2384ccca5c3549b83486ec16da08bc2cec042bfa | |
| parent | 4bf7873b3b5e7cce19fe3aa52ad7476658efa885 (diff) | |
| download | syslinux-1.6x-1.tar.gz | |
Relax the conventional memory limits somewhat.syslinux-1.6x-1
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | isolinux.asm | 6 | ||||
| -rw-r--r-- | ldlinux.asm | 6 | ||||
| -rw-r--r-- | pxe.inc | 6 | ||||
| -rw-r--r-- | pxelinux.asm | 4 |
5 files changed, 17 insertions, 8 deletions
@@ -1,6 +1,9 @@ Starting with 1.47, changes marked with SYSLINUX/PXELINUX/ISOLINUX apply to that specific program only; other changes apply to both. +Changes in 1.68: + * Relax the conventional memory limits somewhat. + Changes in 1.67: * Handle bug in the location of initrd. diff --git a/isolinux.asm b/isolinux.asm index 0d624f3d..da6d427e 100644 --- a/isolinux.asm +++ b/isolinux.asm @@ -972,10 +972,10 @@ not_386: is_386: ; Now we know it's a 386 or higher ; -; Now check that there is at least 384K of low (DOS) memory +; Now check that there is sufficient low (DOS) memory ; int 12h - cmp ax,384 + cmp ax,(real_mode_seg+0xa00) >> 6 jae enough_ram mov si,err_noram call writestr @@ -4449,7 +4449,7 @@ err_not386 db 'It appears your computer uses a 286 or lower CPU.' db 'down the Ctrl key while booting, and I will take your' db CR, LF db 'word for it.', CR, LF, 0 -err_noram db 'It appears your computer has less than 384K of low ("DOS")' +err_noram db 'It appears your computer has less than 360K of low ("DOS")' db 0Dh, 0Ah db 'RAM. Linux needs at least this amount to boot. If you get' db 0Dh, 0Ah diff --git a/ldlinux.asm b/ldlinux.asm index f120d889..e576ecc5 100644 --- a/ldlinux.asm +++ b/ldlinux.asm @@ -1118,10 +1118,10 @@ not_386: is_386: ; Now we know it's a 386 or higher ; -; Now check that there is at least 512K of low (DOS) memory +; Now check that there is sufficient low (DOS) memory ; int 12h - cmp ax,512 + cmp ax,(real_mode_seg+0xa00) >> 6 jae enough_ram mov si,err_noram call writestr @@ -4271,7 +4271,7 @@ err_not386 db 'It appears your computer uses a 286 or lower CPU.' db 'down the Ctrl key while booting, and I will take your' db CR, LF db 'word for it.', CR, LF, 0 -err_noram db 'It appears your computer has less than 512K of low ("DOS")' +err_noram db 'It appears your computer has less than 488K of low ("DOS")' db CR, LF db 'RAM. Linux needs at least this amount to boot. If you get' db CR, LF @@ -32,6 +32,7 @@ %define PXENV_UDP_READ 0032h %define PXENV_UDP_WRITE 0033h +%define PXENV_START_UNDI 0000h %define PXENV_UNDI_STARTUP 0001h %define PXENV_UNDI_CLEANUP 0002h %define PXENV_UNDI_INITIALIZE 0003h @@ -49,6 +50,11 @@ %define PXENV_UNDI_INITIATE_DIAGS 000Fh %define PXENV_UNDI_FORCE_INTERRUPT 0010h %define PXENV_UNDI_GET_MCAST_ADDR 0011h +%define PXENV_UNDI_GET_NIC_TYPE 0012h +%define PXENV_UNDI_GET_IFACE_INFO 0013h +%define PXENV_UNDI_ISR 0014h +%define PXENV_STOP_UNDI 0015h ; HUH???? +%define PXENV_UNDI_GET_STATE 0016h %define PXENV_UNLOAD_STACK 0070h %define PXENV_GET_CACHED_INFO 0071h diff --git a/pxelinux.asm b/pxelinux.asm index 077e618b..8631caab 100644 --- a/pxelinux.asm +++ b/pxelinux.asm @@ -790,10 +790,10 @@ not_386: is_386: ; Now we know it's a 386 or higher ; -; Now check that there is at least 384K of low (DOS) memory +; Now check that there is sufficient low (DOS) memory ; int 12h - cmp ax,384 + cmp ax,(real_mode_seg+0xa00) >> 6 jae enough_ram mov si,err_noram call writestr |