From e7ee2eda4badef6ee361f089768064ae737169ed Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 6 Mar 2017 12:25:20 +0000 Subject: [block] Centralise "san-drive" setting The concept of the SAN drive number is meaningful only in a BIOS environment, where it represents the INT13 drive number (0x80 for the first hard disk). We retain this concept in a UEFI environment to allow for a simple way for iPXE commands to refer to SAN drives. Centralise the concept of the default drive number, since it is shared between all supported environments. Signed-off-by: Michael Brown --- src/arch/x86/interface/pcbios/int13.c | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'src/arch') diff --git a/src/arch/x86/interface/pcbios/int13.c b/src/arch/x86/interface/pcbios/int13.c index 3e03e8c5..283e5be7 100644 --- a/src/arch/x86/interface/pcbios/int13.c +++ b/src/arch/x86/interface/pcbios/int13.c @@ -44,8 +44,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include #include #include -#include -#include #include #include #include @@ -1992,32 +1990,6 @@ static int int13_describe ( unsigned int drive ) { return 0; } -/** The "san-drive" setting */ -const struct setting san_drive_setting __setting ( SETTING_SANBOOT_EXTRA, - san-drive ) = { - .name = "san-drive", - .description = "SAN drive number", - .tag = DHCP_EB_SAN_DRIVE, - .type = &setting_type_uint8, -}; - -/** - * Get default SAN drive number - * - * @ret drive Default drive number - */ -static unsigned int int13_default_drive ( void ) { - unsigned long drive; - - /* Use "san-drive" setting, if specified */ - if ( fetch_uint_setting ( NULL, &san_drive_setting, &drive ) >= 0 ) - return drive; - - /* Otherwise, default to booting from first hard disk */ - return 0x80; -} - -PROVIDE_SANBOOT ( pcbios, san_default_drive, int13_default_drive ); PROVIDE_SANBOOT ( pcbios, san_hook, int13_hook ); PROVIDE_SANBOOT ( pcbios, san_unhook, int13_unhook ); PROVIDE_SANBOOT ( pcbios, san_boot, int13_boot ); -- cgit v1.2.3-55-g7522