Author: royger
Date: Tue Mar 11 10:13:06 2014
New Revision: 263005
URL: http://svnweb.freebsd.org/changeset/base/263005
Log:
howto_names: unify declaration
Approved by: gibbs
Sponsored by: Citrix Systems R&D
boot/i386/efi/bootinfo.c:
boot/i386/libi386/bootinfo.c:
boot/ia64/common/bootinfo.c:
boot/powerpc/ofw/metadata.c:
boot/powerpc/ps3/metadata.c:
boot/sparc64/loader/metadata.c:
boot/uboot/common/metadata.c:
boot/userboot/userboot/bootinfo.c:
i386/xen/xen_machdep.c:
- Include sys/boot.h
- Remove custom definition of howto_names.
sys/boot.h:
- Define howto_names.
x86/xen/pv.c:
- Include sys/boot.h
Added:
head/sys/sys/boot.h (contents, props changed)
Modified:
head/sys/boot/i386/efi/bootinfo.c
head/sys/boot/i386/libi386/bootinfo.c
head/sys/boot/ia64/common/bootinfo.c
head/sys/boot/powerpc/ofw/metadata.c
head/sys/boot/powerpc/ps3/metadata.c
head/sys/boot/sparc64/loader/metadata.c
head/sys/boot/uboot/common/metadata.c
head/sys/boot/userboot/userboot/bootinfo.c
head/sys/i386/xen/xen_machdep.c
head/sys/x86/xen/pv.c
Modified: head/sys/boot/i386/efi/bootinfo.c
==============================================================================
--- head/sys/boot/i386/efi/bootinfo.c Tue Mar 11 10:09:23 2014
(r263004)
+++ head/sys/boot/i386/efi/bootinfo.c Tue Mar 11 10:13:06 2014
(r263005)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/linker.h>
+#include <sys/boot.h>
#include <efi.h>
#include <efilib.h>
@@ -41,29 +42,6 @@ __FBSDID("$FreeBSD$");
#include "libi386.h"
#include <machine/bootinfo.h>
-/*
- * Return a 'boothowto' value corresponding to the kernel arguments in
- * (kargs) and any relevant environment variables.
- */
-static struct
-{
- const char *ev;
- int mask;
-} howto_names[] = {
- { "boot_askname", RB_ASKNAME},
- { "boot_cdrom", RB_CDROM},
- { "boot_ddb", RB_KDB},
- { "boot_dfltroot", RB_DFLTROOT},
- { "boot_gdb", RB_GDB},
- { "boot_multicons", RB_MULTIPLE},
- { "boot_mute", RB_MUTE},
- { "boot_pause", RB_PAUSE},
- { "boot_serial", RB_SERIAL},
- { "boot_single", RB_SINGLE},
- { "boot_verbose", RB_VERBOSE},
- { NULL, 0}
-};
-
static const char howto_switches[] = "aCdrgDmphsv";
static int howto_masks[] = {
RB_ASKNAME, RB_CDROM, RB_KDB, RB_DFLTROOT, RB_GDB, RB_MULTIPLE,
Modified: head/sys/boot/i386/libi386/bootinfo.c
==============================================================================
--- head/sys/boot/i386/libi386/bootinfo.c Tue Mar 11 10:09:23 2014
(r263004)
+++ head/sys/boot/i386/libi386/bootinfo.c Tue Mar 11 10:13:06 2014
(r263005)
@@ -31,33 +31,11 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/linker.h>
+#include <sys/boot.h>
#include "bootstrap.h"
#include "libi386.h"
#include "btxv86.h"
-/*
- * Return a 'boothowto' value corresponding to the kernel arguments in
- * (kargs) and any relevant environment variables.
- */
-static struct
-{
- const char *ev;
- int mask;
-} howto_names[] = {
- {"boot_askname", RB_ASKNAME},
- {"boot_cdrom", RB_CDROM},
- {"boot_ddb", RB_KDB},
- {"boot_dfltroot", RB_DFLTROOT},
- {"boot_gdb", RB_GDB},
- {"boot_multicons", RB_MULTIPLE},
- {"boot_mute", RB_MUTE},
- {"boot_pause", RB_PAUSE},
- {"boot_serial", RB_SERIAL},
- {"boot_single", RB_SINGLE},
- {"boot_verbose", RB_VERBOSE},
- {NULL, 0}
-};
-
int
bi_getboothowto(char *kargs)
{
Modified: head/sys/boot/ia64/common/bootinfo.c
==============================================================================
--- head/sys/boot/ia64/common/bootinfo.c Tue Mar 11 10:09:23 2014
(r263004)
+++ head/sys/boot/ia64/common/bootinfo.c Tue Mar 11 10:13:06 2014
(r263005)
@@ -33,35 +33,13 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/linker.h>
+#include <sys/boot.h>
#include <efi.h>
#include <efilib.h>
#include "libia64.h"
-/*
- * Return a 'boothowto' value corresponding to the kernel arguments in
- * (kargs) and any relevant environment variables.
- */
-static struct
-{
- const char *ev;
- int mask;
-} howto_names[] = {
- { "boot_askname", RB_ASKNAME},
- { "boot_cdrom", RB_CDROM},
- { "boot_ddb", RB_KDB},
- { "boot_dfltroot", RB_DFLTROOT},
- { "boot_gdb", RB_GDB},
- { "boot_multicons", RB_MULTIPLE},
- { "boot_mute", RB_MUTE},
- { "boot_pause", RB_PAUSE},
- { "boot_serial", RB_SERIAL},
- { "boot_single", RB_SINGLE},
- { "boot_verbose", RB_VERBOSE},
- { NULL, 0}
-};
-
static const char howto_switches[] = "aCdrgDmphsv";
static int howto_masks[] = {
RB_ASKNAME, RB_CDROM, RB_KDB, RB_DFLTROOT, RB_GDB, RB_MULTIPLE,
Modified: head/sys/boot/powerpc/ofw/metadata.c
==============================================================================
--- head/sys/boot/powerpc/ofw/metadata.c Tue Mar 11 10:09:23 2014
(r263004)
+++ head/sys/boot/powerpc/ofw/metadata.c Tue Mar 11 10:13:06 2014
(r263005)
@@ -33,35 +33,13 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/linker.h>
+#include <sys/boot.h>
#include <machine/metadata.h>
#include "bootstrap.h"
#include "libofw.h"
-/*
- * Return a 'boothowto' value corresponding to the kernel arguments in
- * (kargs) and any relevant environment variables.
- */
-static struct
-{
- const char *ev;
- int mask;
-} howto_names[] = {
- {"boot_askname", RB_ASKNAME},
- {"boot_cdrom", RB_CDROM},
- {"boot_ddb", RB_KDB},
- {"boot_dfltroot", RB_DFLTROOT},
- {"boot_gdb", RB_GDB},
- {"boot_multicons", RB_MULTIPLE},
- {"boot_mute", RB_MUTE},
- {"boot_pause", RB_PAUSE},
- {"boot_serial", RB_SERIAL},
- {"boot_single", RB_SINGLE},
- {"boot_verbose", RB_VERBOSE},
- {NULL, 0}
-};
-
int
md_getboothowto(char *kargs)
{
Modified: head/sys/boot/powerpc/ps3/metadata.c
==============================================================================
--- head/sys/boot/powerpc/ps3/metadata.c Tue Mar 11 10:09:23 2014
(r263004)
+++ head/sys/boot/powerpc/ps3/metadata.c Tue Mar 11 10:13:06 2014
(r263005)
@@ -33,34 +33,12 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/linker.h>
+#include <sys/boot.h>
#include <machine/metadata.h>
#include "bootstrap.h"
-/*
- * Return a 'boothowto' value corresponding to the kernel arguments in
- * (kargs) and any relevant environment variables.
- */
-static struct
-{
- const char *ev;
- int mask;
-} howto_names[] = {
- {"boot_askname", RB_ASKNAME},
- {"boot_cdrom", RB_CDROM},
- {"boot_ddb", RB_KDB},
- {"boot_dfltroot", RB_DFLTROOT},
- {"boot_gdb", RB_GDB},
- {"boot_multicons", RB_MULTIPLE},
- {"boot_mute", RB_MUTE},
- {"boot_pause", RB_PAUSE},
- {"boot_serial", RB_SERIAL},
- {"boot_single", RB_SINGLE},
- {"boot_verbose", RB_VERBOSE},
- {NULL, 0}
-};
-
int
md_getboothowto(char *kargs)
{
Modified: head/sys/boot/sparc64/loader/metadata.c
==============================================================================
--- head/sys/boot/sparc64/loader/metadata.c Tue Mar 11 10:09:23 2014
(r263004)
+++ head/sys/boot/sparc64/loader/metadata.c Tue Mar 11 10:13:06 2014
(r263005)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/linker.h>
+#include <sys/boot.h>
#include <machine/metadata.h>
@@ -47,29 +48,6 @@ extern int itlb_slot;
static int md_bootserial(void);
-/*
- * Return a 'boothowto' value corresponding to the kernel arguments in
- * (kargs) and any relevant environment variables.
- */
-static struct
-{
- const char *ev;
- int mask;
-} howto_names[] = {
- {"boot_askname", RB_ASKNAME},
- {"boot_cdrom", RB_CDROM},
- {"boot_ddb", RB_KDB},
- {"boot_dfltroot", RB_DFLTROOT},
- {"boot_gdb", RB_GDB},
- {"boot_multicons", RB_MULTIPLE},
- {"boot_mute", RB_MUTE},
- {"boot_pause", RB_PAUSE},
- {"boot_serial", RB_SERIAL},
- {"boot_single", RB_SINGLE},
- {"boot_verbose", RB_VERBOSE},
- {NULL, 0}
-};
-
int
md_getboothowto(char *kargs)
{
Modified: head/sys/boot/uboot/common/metadata.c
==============================================================================
--- head/sys/boot/uboot/common/metadata.c Tue Mar 11 10:09:23 2014
(r263004)
+++ head/sys/boot/uboot/common/metadata.c Tue Mar 11 10:13:06 2014
(r263005)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/linker.h>
+#include <sys/boot.h>
#include <machine/elf.h>
#include <machine/metadata.h>
@@ -45,29 +46,6 @@ __FBSDID("$FreeBSD$");
#include "libuboot.h"
#endif
-/*
- * Return a 'boothowto' value corresponding to the kernel arguments in
- * (kargs) and any relevant environment variables.
- */
-static struct
-{
- const char *ev;
- int mask;
-} howto_names[] = {
- {"boot_askname", RB_ASKNAME},
- {"boot_cdrom", RB_CDROM},
- {"boot_ddb", RB_KDB},
- {"boot_dfltroot", RB_DFLTROOT},
- {"boot_gdb", RB_GDB},
- {"boot_multicons", RB_MULTIPLE},
- {"boot_mute", RB_MUTE},
- {"boot_pause", RB_PAUSE},
- {"boot_serial", RB_SERIAL},
- {"boot_single", RB_SINGLE},
- {"boot_verbose", RB_VERBOSE},
- {NULL, 0}
-};
-
static int
md_getboothowto(char *kargs)
{
Modified: head/sys/boot/userboot/userboot/bootinfo.c
==============================================================================
--- head/sys/boot/userboot/userboot/bootinfo.c Tue Mar 11 10:09:23 2014
(r263004)
+++ head/sys/boot/userboot/userboot/bootinfo.c Tue Mar 11 10:13:06 2014
(r263005)
@@ -31,33 +31,11 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/linker.h>
+#include <sys/boot.h>
#include "bootstrap.h"
#include "libuserboot.h"
-/*
- * Return a 'boothowto' value corresponding to the kernel arguments in
- * (kargs) and any relevant environment variables.
- */
-static struct
-{
- const char *ev;
- int mask;
-} howto_names[] = {
- {"boot_askname", RB_ASKNAME},
- {"boot_cdrom", RB_CDROM},
- {"boot_ddb", RB_KDB},
- {"boot_dfltroot", RB_DFLTROOT},
- {"boot_gdb", RB_GDB},
- {"boot_multicons", RB_MULTIPLE},
- {"boot_mute", RB_MUTE},
- {"boot_pause", RB_PAUSE},
- {"boot_serial", RB_SERIAL},
- {"boot_single", RB_SINGLE},
- {"boot_verbose", RB_VERBOSE},
- {NULL, 0}
-};
-
int
bi_getboothowto(char *kargs)
{
Modified: head/sys/i386/xen/xen_machdep.c
==============================================================================
--- head/sys/i386/xen/xen_machdep.c Tue Mar 11 10:09:23 2014
(r263004)
+++ head/sys/i386/xen/xen_machdep.c Tue Mar 11 10:13:06 2014
(r263005)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/reboot.h>
#include <sys/rwlock.h>
#include <sys/sysproto.h>
+#include <sys/boot.h>
#include <xen/xen-os.h>
@@ -156,24 +157,6 @@ xen_setbootenv(char *cmd_line)
return cmd_line;
}
-static struct
-{
- const char *ev;
- int mask;
-} howto_names[] = {
- {"boot_askname", RB_ASKNAME},
- {"boot_single", RB_SINGLE},
- {"boot_nosync", RB_NOSYNC},
- {"boot_halt", RB_ASKNAME},
- {"boot_serial", RB_SERIAL},
- {"boot_cdrom", RB_CDROM},
- {"boot_gdb", RB_GDB},
- {"boot_gdb_pause", RB_RESERVED1},
- {"boot_verbose", RB_VERBOSE},
- {"boot_multicons", RB_MULTIPLE},
- {NULL, 0}
-};
-
int
xen_boothowto(char *envp)
{
Added: head/sys/sys/boot.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/sys/boot.h Tue Mar 11 10:13:06 2014 (r263005)
@@ -0,0 +1,55 @@
+/*-
+ * Copyright (c) 2014 Roger Pau Monné <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _SYS_BOOT_H_
+#define _SYS_BOOT_H_
+
+/*
+ * Return a 'boothowto' value corresponding to the kernel arguments in
+ * (kargs) and any relevant environment variables.
+ */
+static struct
+{
+ const char *ev;
+ int mask;
+} howto_names[] = {
+ { "boot_askname", RB_ASKNAME},
+ { "boot_cdrom", RB_CDROM},
+ { "boot_ddb", RB_KDB},
+ { "boot_dfltroot", RB_DFLTROOT},
+ { "boot_gdb", RB_GDB},
+ { "boot_multicons", RB_MULTIPLE},
+ { "boot_mute", RB_MUTE},
+ { "boot_pause", RB_PAUSE},
+ { "boot_serial", RB_SERIAL},
+ { "boot_single", RB_SINGLE},
+ { "boot_verbose", RB_VERBOSE},
+ { NULL, 0}
+};
+
+#endif /* !_SYS_BOOT_H_ */
Modified: head/sys/x86/xen/pv.c
==============================================================================
--- head/sys/x86/xen/pv.c Tue Mar 11 10:09:23 2014 (r263004)
+++ head/sys/x86/xen/pv.c Tue Mar 11 10:13:06 2014 (r263005)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/lock.h>
#include <sys/rwlock.h>
+#include <sys/boot.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
