From 04ef198d2fcf864b82a722ee737eac88fc48b1a4 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 17 Mar 2016 14:50:29 +0000 Subject: [efi] Move architecture-independent EFI prefixes to interface/efi Signed-off-by: Michael Brown --- src/arch/x86/prefix/efidrvprefix.c | 81 ----------------------------- src/arch/x86/prefix/efiprefix.c | 101 ------------------------------------- src/interface/efi/efidrvprefix.c | 81 +++++++++++++++++++++++++++++ src/interface/efi/efiprefix.c | 101 +++++++++++++++++++++++++++++++++++++ 4 files changed, 182 insertions(+), 182 deletions(-) delete mode 100644 src/arch/x86/prefix/efidrvprefix.c delete mode 100644 src/arch/x86/prefix/efiprefix.c create mode 100644 src/interface/efi/efidrvprefix.c create mode 100644 src/interface/efi/efiprefix.c (limited to 'src') diff --git a/src/arch/x86/prefix/efidrvprefix.c b/src/arch/x86/prefix/efidrvprefix.c deleted file mode 100644 index 4fbb19ff7..000000000 --- a/src/arch/x86/prefix/efidrvprefix.c +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2009 Michael Brown . - * - * This program 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 2 of the - * License, or any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -FILE_LICENCE ( GPL2_OR_LATER ); - -#include -#include -#include -#include -#include - -/** - * EFI entry point - * - * @v image_handle Image handle - * @v systab System table - * @ret efirc EFI return status code - */ -EFI_STATUS EFIAPI _efidrv_start ( EFI_HANDLE image_handle, - EFI_SYSTEM_TABLE *systab ) { - EFI_STATUS efirc; - - /* Initialise EFI environment */ - if ( ( efirc = efi_init ( image_handle, systab ) ) != 0 ) - return efirc; - - /* Initialise iPXE environment */ - initialise(); - startup(); - - return 0; -} - -/** - * Probe EFI root bus - * - * @v rootdev EFI root device - */ -static int efi_probe ( struct root_device *rootdev __unused ) { - - /* Do nothing */ - return 0; -} - -/** - * Remove EFI root bus - * - * @v rootdev EFI root device - */ -static void efi_remove ( struct root_device *rootdev __unused ) { - - efi_driver_disconnect_all(); -} - -/** EFI root device driver */ -static struct root_driver efi_root_driver = { - .probe = efi_probe, - .remove = efi_remove, -}; - -/** EFI root device */ -struct root_device efi_root_device __root_device = { - .dev = { .name = "EFI" }, - .driver = &efi_root_driver, -}; diff --git a/src/arch/x86/prefix/efiprefix.c b/src/arch/x86/prefix/efiprefix.c deleted file mode 100644 index 18b931e68..000000000 --- a/src/arch/x86/prefix/efiprefix.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2009 Michael Brown . - * - * This program 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 2 of the - * License, or any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -FILE_LICENCE ( GPL2_OR_LATER ); - -#include -#include -#include -#include -#include -#include -#include -#include - -/** - * EFI entry point - * - * @v image_handle Image handle - * @v systab System table - * @ret efirc EFI return status code - */ -EFI_STATUS EFIAPI _efi_start ( EFI_HANDLE image_handle, - EFI_SYSTEM_TABLE *systab ) { - EFI_STATUS efirc; - int rc; - - /* Initialise EFI environment */ - if ( ( efirc = efi_init ( image_handle, systab ) ) != 0 ) - goto err_init; - - /* Record autoboot device (if any) */ - efi_set_autoboot(); - - /* Claim SNP devices for use by iPXE */ - efi_snp_claim(); - - /* Start watchdog holdoff timer */ - efi_watchdog_start(); - - /* Call to main() */ - if ( ( rc = main() ) != 0 ) { - efirc = EFIRC ( rc ); - goto err_main; - } - - err_main: - efi_watchdog_stop(); - efi_snp_release(); - efi_loaded_image->Unload ( image_handle ); - efi_driver_reconnect_all(); - err_init: - return efirc; -} - -/** - * Probe EFI root bus - * - * @v rootdev EFI root device - */ -static int efi_probe ( struct root_device *rootdev __unused ) { - - return efi_driver_connect_all(); -} - -/** - * Remove EFI root bus - * - * @v rootdev EFI root device - */ -static void efi_remove ( struct root_device *rootdev __unused ) { - - efi_driver_disconnect_all(); -} - -/** EFI root device driver */ -static struct root_driver efi_root_driver = { - .probe = efi_probe, - .remove = efi_remove, -}; - -/** EFI root device */ -struct root_device efi_root_device __root_device = { - .dev = { .name = "EFI" }, - .driver = &efi_root_driver, -}; diff --git a/src/interface/efi/efidrvprefix.c b/src/interface/efi/efidrvprefix.c new file mode 100644 index 000000000..4fbb19ff7 --- /dev/null +++ b/src/interface/efi/efidrvprefix.c @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2009 Michael Brown . + * + * This program 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 2 of the + * License, or any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +FILE_LICENCE ( GPL2_OR_LATER ); + +#include +#include +#include +#include +#include + +/** + * EFI entry point + * + * @v image_handle Image handle + * @v systab System table + * @ret efirc EFI return status code + */ +EFI_STATUS EFIAPI _efidrv_start ( EFI_HANDLE image_handle, + EFI_SYSTEM_TABLE *systab ) { + EFI_STATUS efirc; + + /* Initialise EFI environment */ + if ( ( efirc = efi_init ( image_handle, systab ) ) != 0 ) + return efirc; + + /* Initialise iPXE environment */ + initialise(); + startup(); + + return 0; +} + +/** + * Probe EFI root bus + * + * @v rootdev EFI root device + */ +static int efi_probe ( struct root_device *rootdev __unused ) { + + /* Do nothing */ + return 0; +} + +/** + * Remove EFI root bus + * + * @v rootdev EFI root device + */ +static void efi_remove ( struct root_device *rootdev __unused ) { + + efi_driver_disconnect_all(); +} + +/** EFI root device driver */ +static struct root_driver efi_root_driver = { + .probe = efi_probe, + .remove = efi_remove, +}; + +/** EFI root device */ +struct root_device efi_root_device __root_device = { + .dev = { .name = "EFI" }, + .driver = &efi_root_driver, +}; diff --git a/src/interface/efi/efiprefix.c b/src/interface/efi/efiprefix.c new file mode 100644 index 000000000..18b931e68 --- /dev/null +++ b/src/interface/efi/efiprefix.c @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2009 Michael Brown . + * + * This program 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 2 of the + * License, or any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +FILE_LICENCE ( GPL2_OR_LATER ); + +#include +#include +#include +#include +#include +#include +#include +#include + +/** + * EFI entry point + * + * @v image_handle Image handle + * @v systab System table + * @ret efirc EFI return status code + */ +EFI_STATUS EFIAPI _efi_start ( EFI_HANDLE image_handle, + EFI_SYSTEM_TABLE *systab ) { + EFI_STATUS efirc; + int rc; + + /* Initialise EFI environment */ + if ( ( efirc = efi_init ( image_handle, systab ) ) != 0 ) + goto err_init; + + /* Record autoboot device (if any) */ + efi_set_autoboot(); + + /* Claim SNP devices for use by iPXE */ + efi_snp_claim(); + + /* Start watchdog holdoff timer */ + efi_watchdog_start(); + + /* Call to main() */ + if ( ( rc = main() ) != 0 ) { + efirc = EFIRC ( rc ); + goto err_main; + } + + err_main: + efi_watchdog_stop(); + efi_snp_release(); + efi_loaded_image->Unload ( image_handle ); + efi_driver_reconnect_all(); + err_init: + return efirc; +} + +/** + * Probe EFI root bus + * + * @v rootdev EFI root device + */ +static int efi_probe ( struct root_device *rootdev __unused ) { + + return efi_driver_connect_all(); +} + +/** + * Remove EFI root bus + * + * @v rootdev EFI root device + */ +static void efi_remove ( struct root_device *rootdev __unused ) { + + efi_driver_disconnect_all(); +} + +/** EFI root device driver */ +static struct root_driver efi_root_driver = { + .probe = efi_probe, + .remove = efi_remove, +}; + +/** EFI root device */ +struct root_device efi_root_device __root_device = { + .dev = { .name = "EFI" }, + .driver = &efi_root_driver, +}; -- cgit v1.2.3-55-g7522