diff options
author | Shao Miller <shao.miller@yrdsb.edu.on.ca> | 2010-06-28 01:36:35 -0400 |
---|---|---|
committer | Shao Miller <shao.miller@yrdsb.edu.on.ca> | 2010-07-10 01:03:04 -0400 |
commit | 4d26d561031e306b0d9e6e14a2a0fe55446f218d (patch) | |
tree | dff1a4a4b616b02c64a71b794fddb72bcec8ee32 /com32 | |
parent | 14e2dc6336a763930043baf654b3ff0f38f932fa (diff) | |
download | syslinux-4d26d561031e306b0d9e6e14a2a0fe55446f218d.tar.gz |
chain.c32, libcom32: Move struct ebios_dapa as disk_ebios_dapa
Moving portions of chain.c32 into libcom32.
Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
Diffstat (limited to 'com32')
-rw-r--r-- | com32/include/syslinux/disk.h | 8 | ||||
-rw-r--r-- | com32/modules/chain.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/com32/include/syslinux/disk.h b/com32/include/syslinux/disk.h index f880a894..51af728e 100644 --- a/com32/include/syslinux/disk.h +++ b/com32/include/syslinux/disk.h @@ -48,6 +48,14 @@ struct disk_info { int sect; }; +struct disk_ebios_dapa { + uint16_t len; + uint16_t count; + uint16_t off; + uint16_t seg; + uint64_t lba; +}; + extern int disk_int13_retry(const com32sys_t * inreg, com32sys_t * outreg); extern int disk_get_params(int disk, struct disk_info *diskinfo); diff --git a/com32/modules/chain.c b/com32/modules/chain.c index 738d8c71..ea04b8b9 100644 --- a/com32/modules/chain.c +++ b/com32/modules/chain.c @@ -151,19 +151,11 @@ static struct disk_info diskinfo; * Get a disk block and return a malloc'd buffer. * Uses the disk number and information from diskinfo. */ -struct ebios_dapa { - uint16_t len; - uint16_t count; - uint16_t off; - uint16_t seg; - uint64_t lba; -}; - /* Read count sectors from drive, starting at lba. Return a new buffer */ static void *read_sectors(uint64_t lba, uint8_t count) { com32sys_t inreg; - struct ebios_dapa *dapa = __com32.cs_bounce; + struct disk_ebios_dapa *dapa = __com32.cs_bounce; void *buf = (char *)__com32.cs_bounce + SECTOR; void *data; @@ -228,7 +220,7 @@ static void *read_sectors(uint64_t lba, uint8_t count) static int write_sector(unsigned int lba, const void *data) { com32sys_t inreg; - struct ebios_dapa *dapa = __com32.cs_bounce; + struct disk_ebios_dapa *dapa = __com32.cs_bounce; void *buf = (char *)__com32.cs_bounce + SECTOR; memcpy(buf, data, SECTOR); |