aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu Aleaxander <Aleaxander@gmail.com>2009-06-23 05:17:15 +0800
committerLiu Aleaxander <Aleaxander@gmail.com>2009-06-23 05:17:15 +0800
commit39f7aaa7b65411159316836e4294592eaf1c4d70 (patch)
tree40da0e2ba5c0d9a5fa64e5e0a91113e045478b58
parent1d0b44adb51e7a1193c5fdf35c324003d2bbaeaa (diff)
downloadsyslinux-isolinux.tar.gz
syslinux-isolinux.tar.xz
syslinux-isolinux.zip
removes the %if IS_ISOLINUX stuff in the layout.incisolinux
removes the %if IS_ISOLINUX stuff in the layout.inc to make the fs.c can find the core_cache_buf symbol from ISOLINUX.
-rw-r--r--core/fs.c4
-rw-r--r--core/layout.inc5
2 files changed, 2 insertions, 7 deletions
diff --git a/core/fs.c b/core/fs.c
index 375beec6..9dac9e93 100644
--- a/core/fs.c
+++ b/core/fs.c
@@ -120,8 +120,8 @@ void device_init(struct device *dev, uint8_t device_num,
static __lowmem char cache_buf[65536];
*/
- //dev->cache_data = core_cache_buf;
- //dev->cache_size = sizeof core_cache_buf;
+ dev->cache_data = core_cache_buf;
+ dev->cache_size = sizeof core_cache_buf;
} else
dev->cache_data = NULL;
}
diff --git a/core/layout.inc b/core/layout.inc
index 3f5a7457..3df07721 100644
--- a/core/layout.inc
+++ b/core/layout.inc
@@ -125,16 +125,11 @@ auxseg resb aux_size
; is somewhat excessive. Sector alignment is obligatory, however.
;
-%if IS_ISOLINUX
-; ISOLINUX doesn't have a block cache yet
-real_mode_seg equ 4000h
-%else
global cache_seg, core_cache_buf
cache_seg equ 4000h ; 64K area for metadata cache
core_cache_buf equ cache_seg << 4
real_mode_seg equ 5000h
pktbuf_seg equ cache_seg ; PXELINUX packet buffers
-%endif
comboot_seg equ real_mode_seg ; COMBOOT image loading zone