diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2013-10-26 11:48:06 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2013-10-26 11:48:06 -0400 |
| commit | 1902c94de0c5621726c0b05b55a2bb33e76268d6 (patch) | |
| tree | f1cd02a0706a61550a7ab22018666c4bced1d136 /src/block.h | |
| parent | f08e84793c51ef64dc1d08e3a9bee3f47581e8de (diff) | |
| download | seabios-1902c94de0c5621726c0b05b55a2bb33e76268d6.tar.gz | |
Convert op->drive_g from a 16bit pointer to a 32 bit "GLOBALFLAT" pointer.
The "drive" structure is always malloc'ed and therefore always starts
off described as a 32-bit "flat" pointer. Instead of switching
to/from 16bit pointers, make all the code use the 32bit pointer. This
eliminates the confusing 16/32 bit pointer switches.
This patch also removes the "_g" suffixes on local variables in
functions that are always called in 32bit mode.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/block.h')
| -rw-r--r-- | src/block.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/block.h b/src/block.h index 9bffa09f..9cb25d02 100644 --- a/src/block.h +++ b/src/block.h @@ -11,7 +11,7 @@ struct disk_op_s { u64 lba; void *buf_fl; - struct drive_s *drive_g; + struct drive_s *drive_gf; u16 count; u8 command; }; @@ -109,10 +109,10 @@ extern struct dpte_s DefaultDPTE; extern u8 FloppyCount, CDCount; extern u8 *bounce_buf_fl; struct drive_s *getDrive(u8 exttype, u8 extdriveoffset); -int getDriveId(u8 exttype, struct drive_s *drive_g); -void map_floppy_drive(struct drive_s *drive_g); -void map_hd_drive(struct drive_s *drive_g); -void map_cd_drive(struct drive_s *drive_g); +int getDriveId(u8 exttype, struct drive_s *drive); +void map_floppy_drive(struct drive_s *drive); +void map_hd_drive(struct drive_s *drive); +void map_cd_drive(struct drive_s *drive); struct bregs; void __disk_ret(struct bregs *regs, u32 linecode, const char *fname); void __disk_ret_unimplemented(struct bregs *regs, u32 linecode |