commit 94c749c34b8783ddfbd1718c837a627b69ba30ed
author Kevin O'Connor <kevin@koconnor.net> Mon May 28 11:44:02 2012 -0400
committer Kevin O'Connor <kevin@koconnor.net> Mon May 28 23:21:43 2012 -0400
tree d034b658d91ee3b68dd43ff176044c0719c78f34
parent 1e3bd4f26c3c709aaa739539a957b270f3f5aee5

Rename wait_irq to yield_toirq.

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

src/apm.c

diff --git a/src/apm.c b/src/apm.c
index c497dbe..5e45b77 100644
--- 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 @@
 static void
 handle_155305(struct bregs *regs)
 {
-    wait_irq();
+    yield_toirq();
     set_success(regs);
 }
 

src/boot.c

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

src/clock.c

diff --git a/src/clock.c b/src/clock.c
index c66c3f0..97d5301 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -612,7 +612,7 @@
         return;
     }
     while (!statusflag)
-        wait_irq();
+        yield_toirq();
     set_success(regs);
 }
 

src/floppy.c

diff --git a/src/floppy.c b/src/floppy.c
index 383744a..72bc79b 100644
--- 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 @@
         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();
     }

src/kbd.c

diff --git a/src/kbd.c b/src/kbd.c
index 1977c5d..fdb61d4 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -87,7 +87,7 @@
             regs->flags |= F_ZF;
             return;
         }
-        wait_irq();
+        yield_toirq();
     }
 
     u8 ascii_code = GET_FARVAR(SEG_BDA, *(u8*)(buffer_head+0));

src/stacks.c

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

src/util.c

diff --git a/src/util.c b/src/util.c
index 53ef84d..c0c40e3 100644
--- a/src/util.c
+++ b/src/util.c
@@ -335,6 +335,6 @@
             return get_raw_keystroke();
         if (check_timer(end))
             return -1;
-        wait_irq();
+        yield_toirq();
     }
 }

src/util.h

diff --git a/src/util.h b/src/util.h
index c323449..dece637 100644
--- a/src/util.h
+++ b/src/util.h
@@ -236,7 +236,7 @@
 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; };