diff options
| author |   miod <miod@openbsd.org> | 2010-03-07 13:36:47 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2010-03-07 13:36:47 +0000 |
| commit | e0e0da29df226bf85199d7c31bcf8fa56e59a93d (patch) | |
| tree | 980ad0adbbd7a3ca14af812c78d23249cfc1f2c6 | |
| parent | Better battery % computation; ok otto@ (diff) | |
| download | wireguard-openbsd-e0e0da29df226bf85199d7c31bcf8fa56e59a93d.tar.xz wireguard-openbsd-e0e0da29df226bf85199d7c31bcf8fa56e59a93d.zip | |
Correct layout of arc_config{,64} and order of items in enum arc_config_type.
ok deraadt@
| -rw-r--r-- | sys/arch/mips64/include/arcbios.h | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/sys/arch/mips64/include/arcbios.h b/sys/arch/mips64/include/arcbios.h index acaaef10505..cad7f524d36 100644 --- a/sys/arch/mips64/include/arcbios.h +++ b/sys/arch/mips64/include/arcbios.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arcbios.h,v 1.14 2010/03/03 12:25:09 jsing Exp $ */ +/* $OpenBSD: arcbios.h,v 1.15 2010/03/07 13:36:47 miod Exp $ */ /*- * Copyright (c) 1996 M. Warner Losh. All rights reserved. * @@ -59,6 +59,10 @@ typedef enum arc_config_type arc_SecondaryDcache, arc_SecondaryCache, +#ifdef __sgi__ + arc_SystemMemory, +#endif + arc_EisaAdapter, /* Eisa adapter */ arc_TcAdapter, /* Turbochannel adapter */ arc_ScsiAdapter, /* SCSI adapter */ @@ -87,21 +91,34 @@ typedef enum arc_config_type arc_PointerPeripheral, arc_KeyboardPeripheral, arc_TerminalPeripheral, +#ifdef __arc__ arc_OtherPeripheral, /* denotes a peripheral not otherwise defined */ +#endif arc_LinePeripheral, arc_NetworkPeripheral, - - arc_SystemMemory +#ifdef __arc__ + arc_SystemMemory, +#endif +#ifdef __sgi__ + arc_OtherPeripheral, /* denotes a peripheral not otherwise defined */ +#endif } arc_config_type_t; -typedef u_char arc_dev_flags_t; +typedef u_int32_t arc_dev_flags_t; + +#define ARCBIOS_DEVFLAGS_FAILED 0x01 +#define ARCBIOS_DEVFLAGS_READONLY 0x02 +#define ARCBIOS_DEVFLAGS_REMOVABLE 0x04 +#define ARCBIOS_DEVFLAGS_CONSOLE_INPUT 0x08 +#define ARCBIOS_DEVFLAGS_CONSOLE_OUTPUT 0x10 +#define ARCBIOS_DEVFLAGS_INPUT 0x20 +#define ARCBIOS_DEVFLAGS_OUTPUT 0x40 -/* Wonder how this is aligned... */ typedef struct arc_config { - arc_config_class_t class; /* Likely these three all */ - arc_config_type_t type; /* need to be uchar to make */ - arc_dev_flags_t flags; /* the alignment right */ + arc_config_class_t class; + arc_config_type_t type; + arc_dev_flags_t flags; u_int16_t version; u_int16_t revision; u_int32_t key; @@ -113,9 +130,9 @@ typedef struct arc_config typedef struct arc_config64 { - arc_config_class_t class; /* Likely these three all */ - arc_config_type_t type; /* need to be uchar to make */ - arc_dev_flags_t flags; /* the alignment right */ + arc_config_class_t class; + arc_config_type_t type; + arc_dev_flags_t flags; u_int16_t version; u_int16_t revision; u_int64_t key; |