2009-07-07 Pavel Roskin <proski@gnu.org>

	* include/grub/util/console.h: New file.
	* util/console.c: Use it instead of grub/machine/console.h.
	* util/grub-emu.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index b8145c5a078e08c2f0479bd4f7dfb89035e3dbef..e16ae1cff462ee914f041ff4d66f92ca3931662e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-07-07  Pavel Roskin  <proski@gnu.org>
 
+       * include/grub/util/console.h: New file.
+       * util/console.c: Use it instead of grub/machine/console.h.
+       * util/grub-emu.c: Likewise.
+
        * lib/arg.c (find_long_option): Remove.
        (find_long): Add `len' argument, make `s' const char *.
        (grub_arg_parse): Parse long options in place, not in a

diff --git a/include/grub/util/console.h b/include/grub/util/console.h
new file mode 100644 (file)
index 0000000..1e55682
--- /dev/null
+++ b/include/grub/util/console.h
@@ -0,0 +1,28 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_CONSOLE_UTIL_HEADER
+#define GRUB_CONSOLE_UTIL_HEADER       1
+
+/* Initialize the console system.  */
+void grub_console_init (void);
+
+/* Finish the console system.  */
+void grub_console_fini (void);
+
+#endif /* ! GRUB_CONSOLE_UTIL_HEADER */

diff --git a/util/console.c b/util/console.c
index 04bb56dbbeb4fc96e6f4101f099da1477797a3b8..9d8bb1a634140137fc9796940b4358e268b1b451 100644 (file)
--- a/util/console.c
+++ b/util/console.c
@@ -35,7 +35,7 @@
 # define A_STANDOUT    0
 #endif /* ! A_STANDOUT */
 
-#include <grub/machine/console.h>
+#include <grub/util/console.h>
 #include <grub/term.h>
 #include <grub/types.h>
 

diff --git a/util/grub-emu.c b/util/grub-emu.c
index 31365f3e0ba9007b6538a27b963ca5e422053a75..664a0b197b2f06347eb9e0d5a4881d9c39e211b9 100644 (file)
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -29,7 +29,7 @@
 #include <grub/fs.h>
 #include <grub/util/hostdisk.h>
 #include <grub/dl.h>
-#include <grub/machine/console.h>
+#include <grub/util/console.h>
 #include <grub/util/misc.h>
 #include <grub/kernel.h>
 #include <grub/normal.h>