From 0376c8d3b618c53914c44dd0c90b03e1f66c4bdc Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Wed, 28 Mar 2012 13:57:54 +0100 Subject: firmware, diskio: Create struct disk_private We need a way of passing firmware-specific information to the disk I/O subsystem. Split the BIOS code into diskio_bios.c so that we don't include any disk BIOS symbols in the EFI executable. This way, the code in core/fs/diskio.c is firmware independent. Signed-off-by: Matt Fleming --- core/fs/fs.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'core/fs/fs.c') diff --git a/core/fs/fs.c b/core/fs/fs.c index c2d17dc2..e6f35370 100644 --- a/core/fs/fs.c +++ b/core/fs/fs.c @@ -433,7 +433,7 @@ void pm_close_file(com32sys_t *regs) */ __bss16 uint16_t SectorSize, SectorShift; -void fs_init(const struct fs_ops **ops, void *args) +void fs_init(const struct fs_ops **ops, struct disk_private *priv) { static struct fs_info fs; /* The actual filesystem buffer */ int blk_shift = -1; @@ -457,7 +457,7 @@ void fs_init(const struct fs_ops **ops, void *args) fs.fs_dev = NULL; } else { if (!dev) - dev = device_init(args); + dev = device_init(priv); fs.fs_dev = dev; } /* invoke the fs-specific init code */ @@ -489,8 +489,3 @@ void fs_init(const struct fs_ops **ops, void *args) SectorShift = fs.sector_shift; SectorSize = fs.sector_size; } - -void pm_fs_init(com32sys_t *regs) -{ - fs_init(regs->eax.l, regs); -} -- cgit v1.2.1