Parcourir la source

[config] Split console configuration out to config/console.h

tags/v0.9.6
Michael Brown il y a 16 ans
Parent
révision
8c7deba349
4 fichiers modifiés avec 26 ajouts et 26 suppressions
  1. 21
    0
      src/config/console.h
  2. 2
    0
      src/config/defaults/pcbios.h
  3. 0
    14
      src/config/general.h
  4. 3
    12
      src/core/config.c

+ 21
- 0
src/config/console.h Voir le fichier

@@ -0,0 +1,21 @@
1
+#ifndef CONFIG_CONSOLE_H
2
+#define CONFIG_CONSOLE_H
3
+
4
+/** @file
5
+ *
6
+ * Console configuration
7
+ *
8
+ * These options specify the console types that Etherboot will use for
9
+ * interaction with the user.
10
+ *
11
+ */
12
+
13
+#include <config/defaults.h>
14
+
15
+//#define	CONSOLE_PCBIOS		/* Default BIOS console */
16
+//#define	CONSOLE_SERIAL		/* Serial port */
17
+//#define	CONSOLE_DIRECT_VGA	/* Direct access to VGA card */
18
+//#define	CONSOLE_BTEXT		/* Who knows what this does? */
19
+//#define	CONSOLE_PC_KBD		/* Direct access to PC keyboard */
20
+
21
+#endif /* CONFIG_CONSOLE_H */

+ 2
- 0
src/config/defaults/pcbios.h Voir le fichier

@@ -9,4 +9,6 @@
9 9
 
10 10
 #define IOAPI_X86
11 11
 
12
+#define CONSOLE_PCBIOS
13
+
12 14
 #endif /* CONFIG_DEFAULTS_PCBIOS_H */

+ 0
- 14
src/config/general.h Voir le fichier

@@ -7,20 +7,6 @@
7 7
  *
8 8
  */
9 9
 
10
-/*
11
- * Console configuration
12
- *
13
- * These options specify the console types that Etherboot will use for
14
- * interaction with the user.
15
- *
16
- */
17
-
18
-#define	CONSOLE_FIRMWARE	/* Default BIOS console */
19
-#undef	CONSOLE_SERIAL		/* Serial port */
20
-#undef	CONSOLE_DIRECT_VGA	/* Direct access to VGA card */
21
-#undef	CONSOLE_BTEXT		/* Who knows what this does? */
22
-#undef	CONSOLE_PC_KBD		/* Direct access to PC keyboard */
23
-
24 10
 /*
25 11
  * Timer configuration
26 12
  *

+ 3
- 12
src/core/config.c Voir le fichier

@@ -5,7 +5,8 @@
5 5
  * your option) any later version.
6 6
  */
7 7
 
8
-#include "config/general.h"
8
+#include <config/general.h>
9
+#include <config/console.h>
9 10
 
10 11
 /*
11 12
  * Build ID string calculations
@@ -38,19 +39,9 @@
38 39
 /*
39 40
  * Drag in all requested console types
40 41
  *
41
- * CONSOLE_DUAL sets both CONSOLE_FIRMWARE and CONSOLE_SERIAL for
42
- * legacy compatibility.
43
- *
44 42
  */
45 43
 
46
-#ifdef	CONSOLE_DUAL
47
-#undef	CONSOLE_FIRMWARE
48
-#define	CONSOLE_FIRMWARE	1
49
-#undef	CONSOLE_SERIAL
50
-#define	CONSOLE_SERIAL		1
51
-#endif
52
-
53
-#ifdef CONSOLE_FIRMWARE
44
+#ifdef CONSOLE_PCBIOS
54 45
 REQUIRE_OBJECT ( bios_console );
55 46
 #endif
56 47
 #ifdef CONSOLE_SERIAL

Chargement…
Annuler
Enregistrer