Commit cf288bd5 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/UAPI: Move VME Board ID definition to <asm/bootinfo-vme.h> 



Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 8693d616

arch/m68k/include/asm/mvme16xhw.h

+0 −15
Original line number Diff line number Diff line
@@ -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,

arch/m68k/include/uapi/asm/bootinfo-vme.h

+23 −2
Original line number Diff line number Diff line
@@ -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