Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/installboot/arch Use designated initializers for st...



details:   https://anonhg.NetBSD.org/src/rev/7c5f9f20621e
branches:  trunk
changeset: 998899:7c5f9f20621e
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue May 07 04:35:31 2019 +0000

description:
Use designated initializers for struct ib_mach.

diffstat:

 usr.sbin/installboot/arch/alpha.c       |  15 +++++++++----
 usr.sbin/installboot/arch/amiga.c       |  14 ++++++++----
 usr.sbin/installboot/arch/emips.c       |  15 ++++++++-----
 usr.sbin/installboot/arch/ews4800mips.c |  10 ++++++--
 usr.sbin/installboot/arch/hp300.c       |  13 ++++++++---
 usr.sbin/installboot/arch/hppa.c        |  12 +++++++---
 usr.sbin/installboot/arch/i386.c        |  36 ++++++++++++++++++++------------
 usr.sbin/installboot/arch/landisk.c     |  14 ++++++++----
 usr.sbin/installboot/arch/macppc.c      |  14 ++++++++----
 usr.sbin/installboot/arch/news.c        |  24 ++++++++++++++-------
 usr.sbin/installboot/arch/next68k.c     |  12 +++++++---
 usr.sbin/installboot/arch/pmax.c        |  14 ++++++++----
 usr.sbin/installboot/arch/sparc.c       |  14 ++++++++----
 usr.sbin/installboot/arch/sparc64.c     |  12 +++++++---
 usr.sbin/installboot/arch/sun68k.c      |  24 ++++++++++++++-------
 usr.sbin/installboot/arch/vax.c         |  14 ++++++++----
 usr.sbin/installboot/arch/x68k.c        |  14 ++++++++----
 17 files changed, 176 insertions(+), 95 deletions(-)

diffs (truncated from 627 to 300 lines):

diff -r 185ef61ab988 -r 7c5f9f20621e usr.sbin/installboot/arch/alpha.c
--- a/usr.sbin/installboot/arch/alpha.c Tue May 07 04:29:45 2019 +0000
+++ b/usr.sbin/installboot/arch/alpha.c Tue May 07 04:35:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: alpha.c,v 1.21 2011/08/14 17:50:17 christos Exp $      */
+/*     $NetBSD: alpha.c,v 1.22 2019/05/07 04:35:31 thorpej Exp $       */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: alpha.c,v 1.21 2011/08/14 17:50:17 christos Exp $");
+__RCSID("$NetBSD: alpha.c,v 1.22 2019/05/07 04:35:31 thorpej Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -121,9 +121,14 @@
 static int alpha_clearboot(ib_params *);
 static int alpha_setboot(ib_params *);
 
-struct ib_mach ib_mach_alpha =
-       { "alpha", alpha_setboot, alpha_clearboot, no_editboot,
-               IB_STAGE1START | IB_ALPHASUM | IB_APPEND | IB_SUNSUM };
+struct ib_mach ib_mach_alpha = {
+       .name           =       "alpha",
+       .setboot        =       alpha_setboot,
+       .clearboot      =       alpha_clearboot,
+       .editboot       =       no_editboot,
+       .valid_flags    =       IB_STAGE1START | IB_ALPHASUM | IB_APPEND |
+                                   IB_SUNSUM,
+};
 
 static int
 alpha_clearboot(ib_params *params)
diff -r 185ef61ab988 -r 7c5f9f20621e usr.sbin/installboot/arch/amiga.c
--- a/usr.sbin/installboot/arch/amiga.c Tue May 07 04:29:45 2019 +0000
+++ b/usr.sbin/installboot/arch/amiga.c Tue May 07 04:35:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amiga.c,v 1.9 2015/06/05 05:02:48 mlelstv Exp $        */
+/*     $NetBSD: amiga.c,v 1.10 2019/05/07 04:35:31 thorpej Exp $       */
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: amiga.c,v 1.9 2015/06/05 05:02:48 mlelstv Exp $");
+__RCSID("$NetBSD: amiga.c,v 1.10 2019/05/07 04:35:31 thorpej Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -64,9 +64,13 @@
 
 static int amiga_setboot(ib_params *);
 
-struct ib_mach ib_mach_amiga =
-       { "amiga", amiga_setboot, no_clearboot, no_editboot,
-               IB_STAGE1START | IB_STAGE2START | IB_COMMAND };
+struct ib_mach ib_mach_amiga = {
+       .name           =       "amiga",
+       .setboot        =       amiga_setboot,
+       .clearboot      =       no_clearboot,
+       .editboot       =       no_editboot,
+       .valid_flags    =       IB_STAGE1START | IB_STAGE2START | IB_COMMAND,
+};
 
 static int
 amiga_setboot(ib_params *params)
diff -r 185ef61ab988 -r 7c5f9f20621e usr.sbin/installboot/arch/emips.c
--- a/usr.sbin/installboot/arch/emips.c Tue May 07 04:29:45 2019 +0000
+++ b/usr.sbin/installboot/arch/emips.c Tue May 07 04:35:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emips.c,v 1.1 2011/01/26 01:18:55 pooka Exp $  */
+/*     $NetBSD: emips.c,v 1.2 2019/05/07 04:35:31 thorpej Exp $        */
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: emips.c,v 1.1 2011/01/26 01:18:55 pooka Exp $");
+__RCSID("$NetBSD: emips.c,v 1.2 2019/05/07 04:35:31 thorpej Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -125,10 +125,13 @@
 static int emips_clearboot(ib_params *);
 static int emips_setboot(ib_params *);
 
-struct ib_mach ib_mach_emips =
-       { "emips", emips_setboot, emips_clearboot, no_editboot,
-               IB_STAGE1START | IB_APPEND | IB_SUNSUM };
-
+struct ib_mach ib_mach_emips = {
+       .name           =       "emips",
+       .setboot        =       emips_setboot,
+       .clearboot      =       emips_clearboot,
+       .editboot       =       no_editboot,
+       .valid_flags    =       IB_STAGE1START | IB_APPEND | IB_SUNSUM,
+};
 
 static int
 emips_clearboot(ib_params *params)
diff -r 185ef61ab988 -r 7c5f9f20621e usr.sbin/installboot/arch/ews4800mips.c
--- a/usr.sbin/installboot/arch/ews4800mips.c   Tue May 07 04:29:45 2019 +0000
+++ b/usr.sbin/installboot/arch/ews4800mips.c   Tue May 07 04:35:31 2019 +0000
@@ -5,7 +5,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: ews4800mips.c,v 1.2 2006/02/18 10:08:07 dsl Exp $");
+__RCSID("$NetBSD: ews4800mips.c,v 1.3 2019/05/07 04:35:31 thorpej Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -16,8 +16,12 @@
 
 static int ews4800mips_setboot(ib_params *);
 
-struct ib_mach ib_mach_ews4800mips =
-       { "ews4800mips", ews4800mips_setboot, no_clearboot, no_editboot, 0};
+struct ib_mach ib_mach_ews4800mips = {
+       .name           =       "ews4800mips",
+       .setboot        =       ews4800mips_setboot,
+       .clearboot      =       no_clearboot,
+       .editboot       =       no_editboot,
+};
 
 struct bbinfo_params ews4800mips_bbparams = {
        EWS4800MIPS_BBINFO_MAGIC,
diff -r 185ef61ab988 -r 7c5f9f20621e usr.sbin/installboot/arch/hp300.c
--- a/usr.sbin/installboot/arch/hp300.c Tue May 07 04:29:45 2019 +0000
+++ b/usr.sbin/installboot/arch/hp300.c Tue May 07 04:35:31 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hp300.c,v 1.15 2013/06/14 03:54:43 msaitoh Exp $ */
+/* $NetBSD: hp300.c,v 1.16 2019/05/07 04:35:31 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: hp300.c,v 1.15 2013/06/14 03:54:43 msaitoh Exp $");
+__RCSID("$NetBSD: hp300.c,v 1.16 2019/05/07 04:35:31 thorpej Exp $");
 #endif /* !__lint */
 
 /* We need the target disklabel.h, not the hosts one..... */
@@ -64,8 +64,13 @@
 
 static int hp300_setboot(ib_params *);
 
-struct ib_mach ib_mach_hp300 =
-       { "hp300", hp300_setboot, no_clearboot, no_editboot, IB_APPEND };
+struct ib_mach ib_mach_hp300 = {
+       .name           =       "hp300",
+       .setboot        =       hp300_setboot,
+       .clearboot      =       no_clearboot,
+       .editboot       =       no_editboot,
+       .valid_flags    =       IB_APPEND,
+};
 
 static int
 hp300_setboot(ib_params *params)
diff -r 185ef61ab988 -r 7c5f9f20621e usr.sbin/installboot/arch/hppa.c
--- a/usr.sbin/installboot/arch/hppa.c  Tue May 07 04:29:45 2019 +0000
+++ b/usr.sbin/installboot/arch/hppa.c  Tue May 07 04:35:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hppa.c,v 1.1 2014/02/24 07:23:44 skrll Exp $   */
+/*     $NetBSD: hppa.c,v 1.2 2019/05/07 04:35:31 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: hppa.c,v 1.1 2014/02/24 07:23:44 skrll Exp $");
+__RCSID("$NetBSD: hppa.c,v 1.2 2019/05/07 04:35:31 thorpej Exp $");
 #endif /* !__lint */
 
 /* We need the target disklabel.h, not the hosts one..... */
@@ -65,8 +65,12 @@
 static int hppa_clearboot(ib_params *);
 static int hppa_setboot(ib_params *);
 
-struct ib_mach ib_mach_hppa =
-       { "hppa", hppa_setboot, hppa_clearboot, no_editboot, 0};
+struct ib_mach ib_mach_hppa = {
+       .name           =       "hppa",
+       .setboot        =       hppa_setboot,
+       .clearboot      =       hppa_clearboot,
+       .editboot       =       no_editboot,
+};
 
 static int
 hppa_clearboot(ib_params *params)
diff -r 185ef61ab988 -r 7c5f9f20621e usr.sbin/installboot/arch/i386.c
--- a/usr.sbin/installboot/arch/i386.c  Tue May 07 04:29:45 2019 +0000
+++ b/usr.sbin/installboot/arch/i386.c  Tue May 07 04:35:31 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.41 2018/06/23 14:15:57 kamil Exp $ */
+/* $NetBSD: i386.c,v 1.42 2019/05/07 04:35:31 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: i386.c,v 1.41 2018/06/23 14:15:57 kamil Exp $");
+__RCSID("$NetBSD: i386.c,v 1.42 2019/05/07 04:35:31 thorpej Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -75,19 +75,27 @@
 static int i386_setboot(ib_params *);
 static int i386_editboot(ib_params *);
 
-struct ib_mach ib_mach_i386 =
-       { "i386", i386_setboot, no_clearboot, i386_editboot,
-               IB_RESETVIDEO | IB_CONSOLE | IB_CONSPEED | IB_CONSADDR |
-               IB_KEYMAP | IB_PASSWORD | IB_TIMEOUT |
-               IB_MODULES | IB_BOOTCONF |
-               IB_STAGE1START };
+struct ib_mach ib_mach_i386 = {
+       .name           =       "i386",
+       .setboot        =       i386_setboot,
+       .clearboot      =       no_clearboot,
+       .editboot       =       i386_editboot,
+       .valid_flags    =       IB_RESETVIDEO | IB_CONSOLE | IB_CONSPEED |
+                                   IB_CONSADDR | IB_KEYMAP | IB_PASSWORD |
+                                   IB_TIMEOUT | IB_MODULES | IB_BOOTCONF |
+                                   IB_STAGE1START
+};
 
-struct ib_mach ib_mach_amd64 =
-       { "amd64", i386_setboot, no_clearboot, i386_editboot,
-               IB_RESETVIDEO | IB_CONSOLE | IB_CONSPEED | IB_CONSADDR |
-               IB_KEYMAP | IB_PASSWORD | IB_TIMEOUT |
-               IB_MODULES | IB_BOOTCONF |
-               IB_STAGE1START };
+struct ib_mach ib_mach_amd64 = {
+       .name           =       "amd64",
+       .setboot        =       i386_setboot,
+       .clearboot      =       no_clearboot,
+       .editboot       =       i386_editboot,
+       .valid_flags    =       IB_RESETVIDEO | IB_CONSOLE | IB_CONSPEED |
+                                   IB_CONSADDR | IB_KEYMAP | IB_PASSWORD |
+                                   IB_TIMEOUT | IB_MODULES | IB_BOOTCONF |
+                                   IB_STAGE1START
+};
 
 /*
  * Attempting to write the 'labelsector' (or a sector near it - within 8k?)
diff -r 185ef61ab988 -r 7c5f9f20621e usr.sbin/installboot/arch/landisk.c
--- a/usr.sbin/installboot/arch/landisk.c       Tue May 07 04:29:45 2019 +0000
+++ b/usr.sbin/installboot/arch/landisk.c       Tue May 07 04:35:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: landisk.c,v 1.7 2017/07/17 18:43:45 christos Exp $     */
+/*     $NetBSD: landisk.c,v 1.8 2019/05/07 04:35:31 thorpej Exp $      */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: landisk.c,v 1.7 2017/07/17 18:43:45 christos Exp $");
+__RCSID("$NetBSD: landisk.c,v 1.8 2019/05/07 04:35:31 thorpej Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -53,9 +53,13 @@
 
 static int landisk_setboot(ib_params *);
 
-struct ib_mach ib_mach_landisk =
-       { "landisk", landisk_setboot, no_clearboot, no_editboot,
-         IB_TIMEOUT };
+struct ib_mach ib_mach_landisk = {
+       .name           =       "landisk",
+       .setboot        =       landisk_setboot,
+       .clearboot      =       no_clearboot,
+       .editboot       =       no_editboot,
+       .valid_flags    =       IB_TIMEOUT,
+};
 
 static int
 landisk_setboot(ib_params *params)
diff -r 185ef61ab988 -r 7c5f9f20621e usr.sbin/installboot/arch/macppc.c
--- a/usr.sbin/installboot/arch/macppc.c        Tue May 07 04:29:45 2019 +0000
+++ b/usr.sbin/installboot/arch/macppc.c        Tue May 07 04:35:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: macppc.c,v 1.11 2008/05/24 19:15:21 tsutsui Exp $ */
+/*     $NetBSD: macppc.c,v 1.12 2019/05/07 04:35:31 thorpej Exp $ */



Home | Main Index | Thread Index | Old Index