mirrors/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe.git synced 2026-05-04 20:06:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

[disklog] Generalise CONSOLE_INT13 to CONSOLE_DISKLOG

Browse Source 
The name "int13" is intrinsically specific to a BIOS environment.
Generalise the build configuration option CONSOLE_INT13 to
CONSOLE_DISKLOG, in preparation for adding EFI disk log console
support.

Existing configurations using CONSOLE_INT13 will continue to work.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2026-03-29 13:37:55 +01:00
parent 6d82975059
commit ec38e98d40
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/x86/interface/pcbios/int13con.c
View File

@ -38,7 +38,13 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
*
*/
/* Set default console usage if applicable */
/* Set default console usage if applicable
*
* We accept either CONSOLE_DISKLOG or CONSOLE_INT13.
*/
#if ( defined ( CONSOLE_DISKLOG ) && ! defined ( CONSOLE_INT13 ) )
#define CONSOLE_INT13 CONSOLE_DISKLOG
#endif
#if ! ( defined ( CONSOLE_INT13 ) && CONSOLE_EXPLICIT ( CONSOLE_INT13 ) )
#undef CONSOLE_INT13
#define CONSOLE_INT13 ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_LOG )

5
src/arch/x86/prefix/usbdisk.S
View File

@ -15,6 +15,11 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
#define SECTORS 32
#define CYLADDR(cyl) ((((cyl) * HEADS + (((cyl) == 0) & 1)) * SECTORS) * 512)
/* Accept CONSOLE_DISKLOG as a synonym for CONSOLE_INT13 */
#if ( defined ( CONSOLE_DISKLOG ) && ! defined ( CONSOLE_INT13 ) )
#define CONSOLE_INT13 CONSOLE_DISKLOG
#endif
#ifdef CONSOLE_INT13
#define LOGPART 1
#define LOGSTART 0

2
src/config/cloud/console.h
View File

@ -33,4 +33,4 @@
* the same cloud, allowing the log to be retrieved from the log
* partition.
*/
#define CONSOLE_INT13
#define CONSOLE_DISKLOG

3
src/config/config_pcbios.c
View File

@ -49,6 +49,9 @@ REQUIRE_OBJECT ( vesafb );
#ifdef CONSOLE_INT13
REQUIRE_OBJECT ( int13con );
#endif
#ifdef CONSOLE_DISKLOG
REQUIRE_OBJECT ( int13con );
#endif
/*
* Drag in all requested image types

2
src/config/console.h
View File

@ -25,6 +25,7 @@ FILE_SECBOOT ( PERMITTED );
#define CONSOLE_FRAMEBUFFER /* Graphical framebuffer console */
#define CONSOLE_SYSLOG /* Syslog console */
#define CONSOLE_SYSLOGS /* Encrypted syslog console */
//#define CONSOLE_DISKLOG /* Disk log console */
/* Console types supported only on systems with serial ports */
#if ! defined ( SERIAL_NULL )
@ -33,7 +34,6 @@ FILE_SECBOOT ( PERMITTED );
/* Console types supported only on BIOS platforms */
#if defined ( PLATFORM_pcbios )
//#define CONSOLE_INT13 /* INT13 disk log console */
#define CONSOLE_PCBIOS /* Default BIOS console */
#endif