diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2013-07-20 18:07:50 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2013-07-21 14:09:29 -0400 |
| commit | 95ee382b65fe18423e48698a242444dc4d0ef0ba (patch) | |
| tree | efee55380327d34dac48748503118c4c91926fad /src/serial.c | |
| parent | 23c14a16392922f0706b97f38f61c5d2e55af81a (diff) | |
| download | seabios-95ee382b65fe18423e48698a242444dc4d0ef0ba.tar.gz | |
Rename check_timer() function (and similar) to irqtimer_check().
Rename functions to be more consistent and so they are not confused
with the normal timer functions.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/serial.c')
| -rw-r--r-- | src/serial.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/serial.c b/src/serial.c index 153f82a6..b4a0a533 100644 --- a/src/serial.c +++ b/src/serial.c @@ -91,7 +91,7 @@ handle_1401(struct bregs *regs) u16 addr = getComAddr(regs); if (!addr) return; - u32 end = calc_future_timer_ticks(GET_BDA(com_timeout[regs->dx])); + u32 end = irqtimer_calc_ticks(GET_BDA(com_timeout[regs->dx])); for (;;) { u8 lsr = inb(addr+SEROFF_LSR); if ((lsr & 0x60) == 0x60) { @@ -101,7 +101,7 @@ handle_1401(struct bregs *regs) regs->ah = lsr; break; } - if (check_timer(end)) { + if (irqtimer_check(end)) { // Timed out - can't write data. regs->ah = lsr | 0x80; break; @@ -118,7 +118,7 @@ handle_1402(struct bregs *regs) u16 addr = getComAddr(regs); if (!addr) return; - u32 end = calc_future_timer_ticks(GET_BDA(com_timeout[regs->dx])); + u32 end = irqtimer_calc_ticks(GET_BDA(com_timeout[regs->dx])); for (;;) { u8 lsr = inb(addr+SEROFF_LSR); if (lsr & 0x01) { @@ -127,7 +127,7 @@ handle_1402(struct bregs *regs) regs->ah = lsr; break; } - if (check_timer(end)) { + if (irqtimer_check(end)) { // Timed out - can't read data. regs->ah = lsr | 0x80; break; @@ -234,7 +234,7 @@ handle_1700(struct bregs *regs) if (!addr) return; - u32 end = calc_future_timer_ticks(GET_BDA(lpt_timeout[regs->dx])); + u32 end = irqtimer_calc_ticks(GET_BDA(lpt_timeout[regs->dx])); outb(regs->al, addr); u8 val8 = inb(addr+2); @@ -249,7 +249,7 @@ handle_1700(struct bregs *regs) regs->ah = v ^ 0x48; break; } - if (check_timer(end)) { + if (irqtimer_check(end)) { // Timeout regs->ah = (v ^ 0x48) | 0x01; break; |