diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2013-07-20 18:22:57 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2013-07-21 14:10:15 -0400 |
| commit | 018bdd77cecd7d40d6685a0ec02ef3600214695d (patch) | |
| tree | 203fcc2a01c8383532236bfd48e903f927eec79b /src/floppy.c | |
| parent | 95ee382b65fe18423e48698a242444dc4d0ef0ba (diff) | |
| download | seabios-hppa-018bdd77cecd7d40d6685a0ec02ef3600214695d.zip seabios-hppa-018bdd77cecd7d40d6685a0ec02ef3600214695d.tar.gz seabios-hppa-018bdd77cecd7d40d6685a0ec02ef3600214695d.tar.bz2 | |
Rename check_tsc() (and similar) to timer_check() and use u32.
Rename the check_tsc() function to timer_check(). The CPU TSC is
often not the basis of the timer, so use a more appropriate name.
Convert all callers that were using u64 for the timers to use u32.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/floppy.c')
| -rw-r--r-- | src/floppy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/floppy.c b/src/floppy.c index 83dfaf8..37b7092 100644 --- a/src/floppy.c +++ b/src/floppy.c @@ -211,12 +211,12 @@ static int floppy_pio(struct floppy_pio_s *pio) { // Send command to controller. - u64 end = calc_future_tsc(FLOPPY_PIO_TIMEOUT); + u32 end = timer_calc(FLOPPY_PIO_TIMEOUT); int i = 0; for (;;) { u8 sts = inb(PORT_FD_STATUS); if (!(sts & 0x80)) { - if (check_tsc(end)) { + if (timer_check(end)) { floppy_disable_controller(); return DISK_RET_ETIMEOUT; } @@ -239,12 +239,12 @@ floppy_pio(struct floppy_pio_s *pio) } // Read response from controller. - end = calc_future_tsc(FLOPPY_PIO_TIMEOUT); + end = timer_calc(FLOPPY_PIO_TIMEOUT); i = 0; for (;;) { u8 sts = inb(PORT_FD_STATUS); if (!(sts & 0x80)) { - if (check_tsc(end)) { + if (timer_check(end)) { floppy_disable_controller(); return DISK_RET_ETIMEOUT; } |