style(9) and remove a left over Alpha comment
This commit is contained in:
David E. O'Brien
parent
3caacd361d
commit
5ed2687ff2
@ -1,8 +1,3 @@
|
||||
/*
|
||||
* $FreeBSD$
|
||||
* From $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997
|
||||
* Matthias Drochner. All rights reserved.
|
||||
@ -32,8 +27,14 @@
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] =
|
||||
"$FreeBSD$";
|
||||
#endif /* not lint */
|
||||
|
||||
#include <stand.h>
|
||||
#include <efi.h>
|
||||
@ -52,14 +53,14 @@
|
||||
|
||||
/* Exported for libstand */
|
||||
struct devsw *devsw[] = {
|
||||
/* &efi_disk, */
|
||||
NULL
|
||||
/* &efi_disk, */
|
||||
NULL
|
||||
};
|
||||
|
||||
struct fs_ops *file_system[] = {
|
||||
&ufs_fsops,
|
||||
&zipfs_fsops,
|
||||
NULL
|
||||
&ufs_fsops,
|
||||
&zipfs_fsops,
|
||||
NULL
|
||||
};
|
||||
|
||||
/* Exported for ia64 only */
|
||||
@ -70,8 +71,8 @@ struct fs_ops *file_system[] = {
|
||||
extern struct file_format ia64_elf;
|
||||
|
||||
struct file_format *file_formats[] = {
|
||||
/* &ia64_elf, */
|
||||
NULL
|
||||
/* &ia64_elf, */
|
||||
NULL
|
||||
};
|
||||
|
||||
/*
|
||||
@ -83,6 +84,6 @@ struct file_format *file_formats[] = {
|
||||
extern struct console efi_console;
|
||||
|
||||
struct console *consoles[] = {
|
||||
&efi_console,
|
||||
NULL
|
||||
&efi_console,
|
||||
NULL
|
||||
};
|
||||
|
||||
@ -23,10 +23,13 @@
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] =
|
||||
"$FreeBSD$";
|
||||
#endif /* not lint */
|
||||
|
||||
#include <stand.h>
|
||||
#include <string.h>
|
||||
#include <setjmp.h>
|
||||
@ -50,7 +53,7 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
|
||||
{
|
||||
int i;
|
||||
EFI_PHYSICAL_ADDRESS mem;
|
||||
|
||||
|
||||
efi_init(image_handle, system_table);
|
||||
|
||||
/*
|
||||
@ -73,7 +76,7 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
|
||||
/*
|
||||
* Initialise the block cache
|
||||
*/
|
||||
bcache_init(32, 512); /* 16k XXX tune this */
|
||||
bcache_init(32, 512); /* 16k XXX tune this */
|
||||
|
||||
/*
|
||||
* March through the device switch probing for things.
|
||||
@ -89,7 +92,6 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
|
||||
printf("Memory: %ld k\n", memsize() / 1024);
|
||||
#endif
|
||||
|
||||
/* We're booting from an SRM disk, try to spiff this */
|
||||
/* XXX presumes that biosdisk is first in devsw */
|
||||
currdev.d_dev = devsw[0];
|
||||
currdev.d_type = currdev.d_dev->dv_type;
|
||||
@ -105,13 +107,13 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
|
||||
if (bootfile)
|
||||
setenv("bootfile", bootfile, 1);
|
||||
|
||||
env_setenv("currdev", EV_VOLATILE,
|
||||
arc_fmtdev(&currdev), arc_setcurrdev, env_nounset);
|
||||
env_setenv("loaddev", EV_VOLATILE,
|
||||
arc_fmtdev(&currdev), env_noset, env_nounset);
|
||||
env_setenv("currdev", EV_VOLATILE, arc_fmtdev(&currdev),
|
||||
arc_setcurrdev, env_nounset);
|
||||
env_setenv("loaddev", EV_VOLATILE, arc_fmtdev(&currdev), env_noset,
|
||||
env_nounset);
|
||||
#endif
|
||||
|
||||
setenv("LINES", "24", 1); /* optional */
|
||||
setenv("LINES", "24", 1); /* optional */
|
||||
|
||||
archsw.arch_autoload = efi_autoload;
|
||||
archsw.arch_getdev = efi_getdev;
|
||||
@ -121,7 +123,7 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
|
||||
|
||||
interact(); /* doesn't return */
|
||||
|
||||
return EFI_SUCCESS; /* keep compiler happy */
|
||||
return (EFI_SUCCESS); /* keep compiler happy */
|
||||
}
|
||||
|
||||
COMMAND_SET(quit, "quit", "exit the loader", command_quit);
|
||||
@ -129,6 +131,6 @@ COMMAND_SET(quit, "quit", "exit the loader", command_quit);
|
||||
static int
|
||||
command_quit(int argc, char *argv[])
|
||||
{
|
||||
exit(0);
|
||||
return(CMD_OK);
|
||||
exit(0);
|
||||
return (CMD_OK);
|
||||
}
|
||||
|
||||
@ -1,8 +1,3 @@
|
||||
/*
|
||||
* $FreeBSD$
|
||||
* From $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997
|
||||
* Matthias Drochner. All rights reserved.
|
||||
@ -32,8 +27,14 @@
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] =
|
||||
"$FreeBSD$";
|
||||
#endif /* not lint */
|
||||
|
||||
#include <stand.h>
|
||||
#include <efi.h>
|
||||
@ -52,14 +53,14 @@
|
||||
|
||||
/* Exported for libstand */
|
||||
struct devsw *devsw[] = {
|
||||
/* &efi_disk, */
|
||||
NULL
|
||||
/* &efi_disk, */
|
||||
NULL
|
||||
};
|
||||
|
||||
struct fs_ops *file_system[] = {
|
||||
&ufs_fsops,
|
||||
&zipfs_fsops,
|
||||
NULL
|
||||
&ufs_fsops,
|
||||
&zipfs_fsops,
|
||||
NULL
|
||||
};
|
||||
|
||||
/* Exported for ia64 only */
|
||||
@ -70,8 +71,8 @@ struct fs_ops *file_system[] = {
|
||||
extern struct file_format ia64_elf;
|
||||
|
||||
struct file_format *file_formats[] = {
|
||||
/* &ia64_elf, */
|
||||
NULL
|
||||
/* &ia64_elf, */
|
||||
NULL
|
||||
};
|
||||
|
||||
/*
|
||||
@ -83,6 +84,6 @@ struct file_format *file_formats[] = {
|
||||
extern struct console efi_console;
|
||||
|
||||
struct console *consoles[] = {
|
||||
&efi_console,
|
||||
NULL
|
||||
&efi_console,
|
||||
NULL
|
||||
};
|
||||
|
||||
@ -23,10 +23,13 @@
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] =
|
||||
"$FreeBSD$";
|
||||
#endif /* not lint */
|
||||
|
||||
#include <stand.h>
|
||||
#include <string.h>
|
||||
#include <setjmp.h>
|
||||
@ -50,7 +53,7 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
|
||||
{
|
||||
int i;
|
||||
EFI_PHYSICAL_ADDRESS mem;
|
||||
|
||||
|
||||
efi_init(image_handle, system_table);
|
||||
|
||||
/*
|
||||
@ -73,7 +76,7 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
|
||||
/*
|
||||
* Initialise the block cache
|
||||
*/
|
||||
bcache_init(32, 512); /* 16k XXX tune this */
|
||||
bcache_init(32, 512); /* 16k XXX tune this */
|
||||
|
||||
/*
|
||||
* March through the device switch probing for things.
|
||||
@ -89,7 +92,6 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
|
||||
printf("Memory: %ld k\n", memsize() / 1024);
|
||||
#endif
|
||||
|
||||
/* We're booting from an SRM disk, try to spiff this */
|
||||
/* XXX presumes that biosdisk is first in devsw */
|
||||
currdev.d_dev = devsw[0];
|
||||
currdev.d_type = currdev.d_dev->dv_type;
|
||||
@ -105,13 +107,13 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
|
||||
if (bootfile)
|
||||
setenv("bootfile", bootfile, 1);
|
||||
|
||||
env_setenv("currdev", EV_VOLATILE,
|
||||
arc_fmtdev(&currdev), arc_setcurrdev, env_nounset);
|
||||
env_setenv("loaddev", EV_VOLATILE,
|
||||
arc_fmtdev(&currdev), env_noset, env_nounset);
|
||||
env_setenv("currdev", EV_VOLATILE, arc_fmtdev(&currdev),
|
||||
arc_setcurrdev, env_nounset);
|
||||
env_setenv("loaddev", EV_VOLATILE, arc_fmtdev(&currdev), env_noset,
|
||||
env_nounset);
|
||||
#endif
|
||||
|
||||
setenv("LINES", "24", 1); /* optional */
|
||||
setenv("LINES", "24", 1); /* optional */
|
||||
|
||||
archsw.arch_autoload = efi_autoload;
|
||||
archsw.arch_getdev = efi_getdev;
|
||||
@ -121,7 +123,7 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
|
||||
|
||||
interact(); /* doesn't return */
|
||||
|
||||
return EFI_SUCCESS; /* keep compiler happy */
|
||||
return (EFI_SUCCESS); /* keep compiler happy */
|
||||
}
|
||||
|
||||
COMMAND_SET(quit, "quit", "exit the loader", command_quit);
|
||||
@ -129,6 +131,6 @@ COMMAND_SET(quit, "quit", "exit the loader", command_quit);
|
||||
static int
|
||||
command_quit(int argc, char *argv[])
|
||||
{
|
||||
exit(0);
|
||||
return(CMD_OK);
|
||||
exit(0);
|
||||
return (CMD_OK);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user