From: Geert Uytterhoeven <geert@linux-m68k.org>
To: linux-m68k@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
David Howells <dhowells@redhat.com>
Subject: [PATCH 14/16] m68k/UAPI: Move VME Board ID definition to <asm/bootinfo-vme.h>
Date: Wed, 16 Oct 2013 14:31:31 +0200 [thread overview]
Message-ID: <1381926693-6392-15-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1381926693-6392-1-git-send-email-geert@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: David Howells <dhowells@redhat.com>
---
arch/m68k/include/asm/mvme16xhw.h | 15 ---------------
arch/m68k/include/uapi/asm/bootinfo-vme.h | 25 +++++++++++++++++++++++--
2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/arch/m68k/include/asm/mvme16xhw.h b/arch/m68k/include/asm/mvme16xhw.h
index 87fa84ad252e..1eb89de631e5 100644
--- a/arch/m68k/include/asm/mvme16xhw.h
+++ b/arch/m68k/include/asm/mvme16xhw.h
@@ -3,21 +3,6 @@
#include <asm/irq.h>
-/* Board ID data structure - pointer to this retrieved from Bug by head.S */
-
-/* Note, bytes 12 and 13 are board no in BCD (0162,0166,0167,0177,etc) */
-
-typedef struct {
- char bdid[4];
- u_char rev, mth, day, yr;
- u_short size, reserved;
- u_short brdno;
- char brdsuffix[2];
- u_long options;
- u_short clun, dlun, ctype, dnum;
- u_long option2;
-} t_bdid, *p_bdid;
-
typedef struct {
u_char ack_icr,
diff --git a/arch/m68k/include/uapi/asm/bootinfo-vme.h b/arch/m68k/include/uapi/asm/bootinfo-vme.h
index 4643a55ed768..13ba5e19fe24 100644
--- a/arch/m68k/include/uapi/asm/bootinfo-vme.h
+++ b/arch/m68k/include/uapi/asm/bootinfo-vme.h
@@ -28,11 +28,32 @@
#define VME_TYPE_BVME4000 0x4000 /* BVM Ltd. BVME4000 */
#define VME_TYPE_BVME6000 0x6000 /* BVM Ltd. BVME6000 */
-/* BI_VME_BRDINFO is a 32 byte struct as returned by the Bug code on
+
+#ifndef __ASSEMBLY__
+
+/*
+ * Board ID data structure - pointer to this retrieved from Bug by head.S
+ *
+ * BI_VME_BRDINFO is a 32 byte struct as returned by the Bug code on
* Motorola VME boards. Contains board number, Bug version, board
- * configuration options, etc. See include/asm/mvme16xhw.h for details.
+ * configuration options, etc.
+ *
+ * Note, bytes 12 and 13 are board no in BCD (0162,0166,0167,0177,etc)
*/
+typedef struct {
+ char bdid[4];
+ u_char rev, mth, day, yr;
+ u_short size, reserved;
+ u_short brdno;
+ char brdsuffix[2];
+ u_long options;
+ u_short clun, dlun, ctype, dnum;
+ u_long option2;
+} t_bdid, *p_bdid;
+
+#endif /* __ASSEMBLY__ */
+
/*
* Latest VME bootinfo versions
--
1.7.9.5
next prev parent reply other threads:[~2013-10-16 12:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 12:31 [PATCH 00/16] m68k bootinfo updates Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 01/16] block/z2ram: Remove duplicate external declarations Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 02/16] m68k: The bootinfo is located right after the kernel Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 03/16] m68k: head.S - Correct date and spelling Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 04/16] m68k: Drop remainings and API of BOOTINFO_COMPAT_1_0 Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 05/16] m68k/mac: Move struct mac_booter_data to <asm/macintosh.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 06/16] m68k/mac: Remove unused hardware profile tags Geert Uytterhoeven
2013-10-20 12:14 ` Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 07/16] m68k/vme: Remove unused mvme_bdid_ptr Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 08/16] m68k/UAPI: Disintegrate arch/m68k/include/asm/bootinfo.h Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 09/16] m68k/UAPI: Move generic definitions to <asm/bootinfo.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 10/16] m68k/UAPI: Move Amiga model/chipset definitions to <asm/bootinfo-amiga.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 11/16] m68k/UAPI: Move Apollo model definitions to <asm/bootinfo-apollo.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 12/16] m68k/UAPI: Move HP300 model definitions to <asm/bootinfo-hp300.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 13/16] m68k/UAPI: Move Macintosh model definitions to <asm/bootinfo-mac.h> Geert Uytterhoeven
2013-10-16 12:31 ` Geert Uytterhoeven [this message]
2013-10-16 12:31 ` [PATCH 15/16] m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 16/16] m68k: Remove superfluous inclusions of <asm/bootinfo.h> Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381926693-6392-15-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).