Add PC speaker driver and connect it to '\a' in the VGA console.

[pintos-anon] / src / devices / vga.c

diff --git a/src/devices/vga.c b/src/devices/vga.c
index fcdc689e9a1dc6dd8e0dab5d11394a8596f58b78..f421b617bd3706858d2536eb21866531b1fd9b85 100644 (file)
--- a/src/devices/vga.c
+++ b/src/devices/vga.c
@@ -1,9 +1,12 @@
-#include "vga.h"
+#include "devices/vga.h"
+#include <round.h>
 #include <stdint.h>
 #include <stddef.h>
-#include "lib/lib.h"
+#include <string.h>
+#include "devices/speaker.h"
 #include "threads/io.h"
-#include "threads/mmu.h"
+#include "threads/interrupt.h"
+#include "threads/vaddr.h"
 
 /* VGA text screen support.  See [FREEVGA] for more information. */
 
@@ -27,20 +30,33 @@ static void clear_row (size_t y);
 static void cls (void);
 static void newline (void);
 static void move_cursor (void);
+static void find_cursor (size_t *x, size_t *y);
 
-/* Initializes the VGA text display and clears the screen. */
-void
-vga_init (void)
+/* Initializes the VGA text display. */
+static void
+init (void)
 {
-  fb = ptov (0xb8000);
-  cls ();
+  /* Already initialized? */
+  static bool inited;
+  if (!inited)
+    {
+      fb = ptov (0xb8000);
+      find_cursor (&cx, &cy);
+      inited = true; 
+    }
 }
 
 /* Writes C to the VGA text display, interpreting control
-   characters in the conventional ways. */
+   characters in the conventional ways.  */
 void
 vga_putc (int c)
 {
+  /* Disable interrupts to lock out interrupt handlers
+     that might write to the console. */
+  enum intr_level old_level = intr_disable ();
+
+  init ();
+  
   switch (c) 
     {
     case '\n':
@@ -65,6 +81,12 @@ vga_putc (int c)
       if (cx >= COL_CNT)
         newline ();
       break;
+
+    case '\a':
+      intr_set_level (old_level);
+      speaker_beep ();
+      intr_disable ();
+      break;
       
     default:
       fb[cy][cx][0] = c;
@@ -76,6 +98,8 @@ vga_putc (int c)
 
   /* Update cursor position. */
   move_cursor ();
+
+  intr_set_level (old_level);
 }
 \f
 /* Clears the screen and moves the cursor to the upper left. */
@@ -130,3 +154,19 @@ move_cursor (void)
   outw (0x3d4, 0x0f | (cp << 8));
 }
 
+/* Reads the current hardware cursor position into (*X,*Y). */
+static void
+find_cursor (size_t *x, size_t *y) 
+{
+  /* See [FREEVGA] under "Manipulating the Text-mode Cursor". */
+  uint16_t cp;
+
+  outb (0x3d4, 0x0e);
+  cp = inb (0x3d5) << 8;
+
+  outb (0x3d4, 0x0f);
+  cp |= inb (0x3d5);
+
+  *x = cp % COL_CNT;
+  *y = cp / COL_CNT;
+}