[src/trunk]: src/sys/sys - remove dup

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8434e8f71c49
branches:  trunk
changeset: 804969:8434e8f71c49
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Dec 08 20:44:59 2014 +0000

description:
- remove dup
- sort numerically as the comment requests
- use the same number base for all values
- correct the namespace protection tag

diffstat:

 sys/sys/aout_mids.h |  85 ++++++++++++++++++++++++++++------------------------
 1 files changed, 45 insertions(+), 40 deletions(-)

diffs (102 lines):

diff -r e154cd48f4c5 -r 8434e8f71c49 sys/sys/aout_mids.h
--- a/sys/sys/aout_mids.h       Mon Dec 08 17:45:12 2014 +0000
+++ b/sys/sys/aout_mids.h       Mon Dec 08 20:44:59 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aout_mids.h,v 1.4 2014/09/03 19:26:31 matt Exp $ */
+/* $NetBSD: aout_mids.h,v 1.5 2014/12/08 20:44:59 christos Exp $ */
 
 /*
  * Copyright (c) 2009, The NetBSD Foundation, Inc.
@@ -25,48 +25,53 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SYS_MACHINE_IDS_H_
-#define _SYS_MACHINE_IDS_H_
-
+#ifndef _SYS_AOUT_MIDS_H_
+#define _SYS_AOUT_MIDS_H_
 
 /*
  * a_mid - keep sorted in numerical order for sanity's sake
  * ensure that: 0 < mid < 0x3ff
+ *
+ * NB: These are still being used in kernel core files.
  */
-#define        MID_ZERO        0       /* unknown - implementation dependent */
-#define        MID_SUN010      1       /* sun 68010/68020 binary */
-#define        MID_SUN020      2       /* sun 68020-only binary */
-#define        MID_PC386       100     /* 386 PC binary. (so quoth BFD) */
-#define        MID_HP200       200     /* hp200 (68010) BSD binary */
-#define        MID_I386        134     /* i386 BSD binary */
-#define        MID_M68K        135     /* m68k BSD binary with 8K page sizes */
-#define        MID_M68K4K      136     /* m68k BSD binary with 4K page sizes */
-#define        MID_NS32532     137     /* ns32532 */
-#define        MID_SPARC       138     /* sparc */
-#define        MID_PMAX        139     /* pmax */
-#define        MID_VAX1K       140     /* VAX 1K page size binaries */
-#define        MID_ALPHA       141     /* Alpha BSD binary */
-#define        MID_MIPS        142     /* big-endian MIPS */
-#define        MID_ARM6        143     /* ARM6 */
-#define        MID_M680002K    144     /* m68000 with 2K page sizes */
-#define        MID_SH3         145     /* SH3 */
-#define        MID_POWERPC     149     /* big-endian PowerPC */
-#define        MID_VAX         150     /* VAX */
-                               /* 151 - MIPS1 */
-                               /* 152 - MIPS2 */
-#define        MID_M88K        153     /* m88k BSD */
-#define        MID_HPPA        154     /* HP PARISC */
-#define        MID_SH5_64      155     /* LP64 SH5 */
-#define        MID_SPARC64     156     /* LP64 sparc */
-#define        MID_X86_64      157     /* AMD x86-64 */
-#define        MID_SH5_32      158     /* ILP32 SH5 */
-#define        MID_IA64        159     /* Itanium */
-#define        MID_AARCH64     183     /* ARM AARCH64 */
-#define        MID_OR1K        184     /* OpenRISC 1000 */
-#define        MID_RISCV       185     /* Risc-V */
-#define        MID_HP200       200     /* hp200 (68010) BSD binary */
-#define        MID_HP300       300     /* hp300 (68020+68881) BSD binary */
-#define        MID_HPUX        0x20C   /* hp200/300 HP-UX binary */
-#define        MID_HPUX800     0x20B   /* hp800 HP-UX binary */
+#define        MID_ZERO        0x000   /* unknown - implementation dependent */
+#define        MID_SUN010      0x001   /* sun 68010/68020 binary */
+#define        MID_SUN020      0x002   /* sun 68020-only binary */
+
+#define        MID_PC386       0x064   /* 386 PC binary. (so quoth BFD) */
 
-#endif /* _SYS_MACHINE_IDS_H_ */
+#define        MID_I386        0x086   /* i386 BSD binary */
+#define        MID_M68K        0x087   /* m68k BSD binary with 8K page sizes */
+#define        MID_M68K4K      0x088   /* m68k BSD binary with 4K page sizes */
+#define        MID_NS32532     0x089   /* ns32532 */
+#define        MID_SPARC       0x08a   /* sparc */
+#define        MID_PMAX        0x08b   /* pmax */
+#define        MID_VAX1K       0x08c   /* VAX 1K page size binaries */
+#define        MID_ALPHA       0x08d   /* Alpha BSD binary */
+#define        MID_MIPS        0x08e   /* big-endian MIPS */
+#define        MID_ARM6        0x08f   /* ARM6 */
+#define        MID_M680002K    0x090   /* m68000 with 2K page sizes */
+#define        MID_SH3         0x091   /* SH3 */
+#define        MID_POWERPC     0x092   /* big-endian PowerPC */
+#define        MID_VAX         0x093   /* VAX */
+#define        MID_MIPS1       0x094   /* MIPS1 */
+#define        MID_MIPS2       0x095   /* MIPS2 */
+#define        MID_M88K        0x096   /* m88k BSD */
+#define        MID_HPPA        0x097   /* HP PARISC */
+#define        MID_SH5_64      0x098   /* LP64 SH5 */
+#define        MID_SPARC64     0x099   /* LP64 sparc */
+#define        MID_X86_64      0x09a   /* AMD x86-64 */
+#define        MID_SH5_32      0x09b   /* ILP32 SH5 */
+#define        MID_IA64        0x09c   /* Itanium */
+#define        MID_AARCH64     0x09d   /* ARM AARCH64 */
+#define        MID_OR1K        0x09e   /* OpenRISC 1000 */
+#define        MID_RISCV       0x09f   /* Risc-V */
+
+#define        MID_HP200       0x0c8   /* hp200 (68010) BSD binary */
+
+#define        MID_HP300       0x12c   /* hp300 (68020+68881) BSD binary */
+
+#define        MID_HPUX800     0x20b   /* hp800 HP-UX binary */
+#define        MID_HPUX        0x20c   /* hp200/300 HP-UX binary */
+
+#endif /* _SYS_AOUT_MIDS_H_ */