Rename wait_irq to yield_toirq.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/apm.c b/src/apm.c
index c497dbecd8306b514d1d07e9baf2dac889b1f50b..5e45b77cfa3a5ca9eceebc517ef65d8a7ef9713e 100644 (file)
--- a/src/apm.c
+++ b/src/apm.c
@@ -9,7 +9,7 @@
 #include "farptr.h" // GET_VAR
 #include "bregs.h" // struct bregs
 #include "ioport.h" // outb
-#include "util.h" // wait_irq
+#include "util.h" // dprintf
 #include "config.h" // CONFIG_*
 #include "biosvar.h" // GET_GLOBAL
 
@@ -94,7 +94,7 @@ handle_155304(struct bregs *regs)
 static void
 handle_155305(struct bregs *regs)
 {
-    wait_irq();
+    yield_toirq();
     set_success(regs);
 }
 

diff --git a/src/boot.c b/src/boot.c
index 7676eb780d22e42a78d73a33cf7fb4cbad6ce248..91663a28c5020eba7f3cb16eb17a0d2bc138db1a 100644 (file)
--- a/src/boot.c
+++ b/src/boot.c
@@ -627,7 +627,7 @@ boot_fail(void)
     for (;;) {
         if (retrytime != (u32)-1 && check_timer(end))
             break;
-        wait_irq();
+        yield_toirq();
     }
     printf("Rebooting.\n");
     struct bregs br;

diff --git a/src/clock.c b/src/clock.c
index c66c3f0f9a40c71ef9ee3952bc1179e0b02bd8b2..97d530115963cf4849e39b39cd4833bcfb87c3e9 100644 (file)
--- a/src/clock.c
+++ b/src/clock.c
@@ -612,7 +612,7 @@ handle_1586(struct bregs *regs)
         return;
     }
     while (!statusflag)
-        wait_irq();
+        yield_toirq();
     set_success(regs);
 }
 

diff --git a/src/floppy.c b/src/floppy.c
index 383744a22d9d8fa5debc025053d4d2af2463de5c..72bc79b8f4984638e0d63e04f9acbf4c407d3328 100644 (file)
--- a/src/floppy.c
+++ b/src/floppy.c
@@ -9,7 +9,7 @@
 #include "disk.h" // DISK_RET_SUCCESS
 #include "config.h" // CONFIG_FLOPPY
 #include "biosvar.h" // SET_BDA
-#include "util.h" // wait_irq
+#include "util.h" // dprintf
 #include "cmos.h" // inb_cmos
 #include "pic.h" // eoi_pic1
 #include "bregs.h" // struct bregs
@@ -192,7 +192,7 @@ wait_floppy_irq(void)
         v = GET_BDA(floppy_recalibration_status);
         if (v & FRS_TIMEOUT)
             break;
-        // Could use wait_irq() here, but that causes issues on
+        // Could use yield_toirq() here, but that causes issues on
         // bochs, so use yield() instead.
         yield();
     }

diff --git a/src/kbd.c b/src/kbd.c
index 1977c5d018c72ff87da3a8e90882090d97a3b356..fdb61d4729a05e3bec286600ced18e245e055519 100644 (file)
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -87,7 +87,7 @@ dequeue_key(struct bregs *regs, int incr, int extended)
             regs->flags |= F_ZF;
             return;
         }
-        wait_irq();
+        yield_toirq();
     }
 
     u8 ascii_code = GET_FARVAR(SEG_BDA, *(u8*)(buffer_head+0));

diff --git a/src/stacks.c b/src/stacks.c
index 0371330adc8443ec2c80d0df233051c9b339299a..7b29b8edf1b50958f77cd3048681a4ba40838e1e 100644 (file)
--- a/src/stacks.c
+++ b/src/stacks.c
@@ -128,7 +128,7 @@ ASM16(
 
 // Wait for next irq to occur.
 void
-wait_irq(void)
+yield_toirq(void)
 {
     if (MODESEGMENT) {
         asm volatile("sti ; hlt ; cli ; cld": : :"memory");

diff --git a/src/util.c b/src/util.c
index 53ef84ded96dfb230c3162b4bafded88fa3394cf..c0c40e34da99c07a9b7f3a637cd32f43f58082f1 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -335,6 +335,6 @@ get_keystroke(int msec)
             return get_raw_keystroke();
         if (check_timer(end))
             return -1;
-        wait_irq();
+        yield_toirq();
     }
 }

diff --git a/src/util.h b/src/util.h
index c3234494241a3ec3c542cd6ad759d55a62d3a4c2..dece637d6b886a57bb15322ddade42d0580652c6 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -236,7 +236,7 @@ extern struct thread_info MainThread;
 extern int CanPreempt;
 struct thread_info *getCurThread(void);
 void yield(void);
-void wait_irq(void);
+void yield_toirq(void);
 void run_thread(void (*func)(void*), void *data);
 void wait_threads(void);
 struct mutex_s { u32 isLocked; };