Commit 8693d616 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/UAPI: Move Macintosh model definitions to <asm/bootinfo-mac.h> 



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

arch/m68k/include/asm/macintosh.h

+3 −59
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
#include <linux/seq_file.h>

#include <linux/interrupt.h>



#include <asm/bootinfo-mac.h>





/*

 *	Apple Macintoshisms

 */
@@ -74,65 +77,6 @@ struct mac_model 
#define MAC_FLOPPY_SWIM_IOP	3

#define MAC_FLOPPY_AV		4



/*

 *	Gestalt numbers

 */



#define MAC_MODEL_II		6

#define MAC_MODEL_IIX		7

#define MAC_MODEL_IICX		8

#define MAC_MODEL_SE30		9

#define MAC_MODEL_IICI		11

#define MAC_MODEL_IIFX		13	/* And well numbered it is too */

#define MAC_MODEL_IISI		18

#define MAC_MODEL_LC		19

#define MAC_MODEL_Q900		20

#define MAC_MODEL_PB170		21

#define MAC_MODEL_Q700		22

#define MAC_MODEL_CLII		23	/* aka: P200 */

#define MAC_MODEL_PB140		25

#define MAC_MODEL_Q950		26	/* aka: WGS95 */

#define MAC_MODEL_LCIII		27	/* aka: P450 */

#define MAC_MODEL_PB210		29

#define MAC_MODEL_C650		30

#define MAC_MODEL_PB230		32

#define MAC_MODEL_PB180		33

#define MAC_MODEL_PB160		34

#define MAC_MODEL_Q800		35	/* aka: WGS80 */

#define MAC_MODEL_Q650		36

#define MAC_MODEL_LCII		37	/* aka: P400/405/410/430 */

#define MAC_MODEL_PB250		38

#define MAC_MODEL_IIVI		44

#define MAC_MODEL_P600		45	/* aka: P600CD */

#define MAC_MODEL_IIVX		48

#define MAC_MODEL_CCL		49	/* aka: P250 */

#define MAC_MODEL_PB165C	50

#define MAC_MODEL_C610		52	/* aka: WGS60 */

#define MAC_MODEL_Q610		53

#define MAC_MODEL_PB145		54	/* aka: PB145B */

#define MAC_MODEL_P520		56	/* aka: LC520 */

#define MAC_MODEL_C660		60

#define MAC_MODEL_P460		62	/* aka: LCIII+, P466/P467 */

#define MAC_MODEL_PB180C	71

#define MAC_MODEL_PB520		72	/* aka: PB520C, PB540, PB540C, PB550C */

#define MAC_MODEL_PB270C	77

#define MAC_MODEL_Q840		78

#define MAC_MODEL_P550		80	/* aka: LC550, P560 */

#define MAC_MODEL_CCLII		83	/* aka: P275 */

#define MAC_MODEL_PB165		84

#define MAC_MODEL_PB190		85	/* aka: PB190CS */

#define MAC_MODEL_TV		88

#define MAC_MODEL_P475		89	/* aka: LC475, P476 */

#define MAC_MODEL_P475F		90	/* aka: P475 w/ FPU (no LC040) */

#define MAC_MODEL_P575		92	/* aka: LC575, P577/P578 */

#define MAC_MODEL_Q605		94

#define MAC_MODEL_Q605_ACC	95	/* Q605 accelerated to 33 MHz */

#define MAC_MODEL_Q630		98	/* aka: LC630, P630/631/635/636/637/638/640 */

#define MAC_MODEL_P588		99	/* aka: LC580, P580 */

#define MAC_MODEL_PB280		102

#define MAC_MODEL_PB280C	103

#define MAC_MODEL_PB150		115



extern struct mac_model *macintosh_config;

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

+60 −0
Original line number Diff line number Diff line
@@ -49,6 +49,66 @@ 
#define BI_MAC_IOP_ADB		0x8021	/* Mac ADB IOP */





    /*

     * Macintosh Gestalt numbers (BI_MAC_MODEL)

     */



#define MAC_MODEL_II		6

#define MAC_MODEL_IIX		7

#define MAC_MODEL_IICX		8

#define MAC_MODEL_SE30		9

#define MAC_MODEL_IICI		11

#define MAC_MODEL_IIFX		13	/* And well numbered it is too */

#define MAC_MODEL_IISI		18

#define MAC_MODEL_LC		19

#define MAC_MODEL_Q900		20

#define MAC_MODEL_PB170		21

#define MAC_MODEL_Q700		22

#define MAC_MODEL_CLII		23	/* aka: P200 */

#define MAC_MODEL_PB140		25

#define MAC_MODEL_Q950		26	/* aka: WGS95 */

#define MAC_MODEL_LCIII		27	/* aka: P450 */

#define MAC_MODEL_PB210		29

#define MAC_MODEL_C650		30

#define MAC_MODEL_PB230		32

#define MAC_MODEL_PB180		33

#define MAC_MODEL_PB160		34

#define MAC_MODEL_Q800		35	/* aka: WGS80 */

#define MAC_MODEL_Q650		36

#define MAC_MODEL_LCII		37	/* aka: P400/405/410/430 */

#define MAC_MODEL_PB250		38

#define MAC_MODEL_IIVI		44

#define MAC_MODEL_P600		45	/* aka: P600CD */

#define MAC_MODEL_IIVX		48

#define MAC_MODEL_CCL		49	/* aka: P250 */

#define MAC_MODEL_PB165C	50

#define MAC_MODEL_C610		52	/* aka: WGS60 */

#define MAC_MODEL_Q610		53

#define MAC_MODEL_PB145		54	/* aka: PB145B */

#define MAC_MODEL_P520		56	/* aka: LC520 */

#define MAC_MODEL_C660		60

#define MAC_MODEL_P460		62	/* aka: LCIII+, P466/P467 */

#define MAC_MODEL_PB180C	71

#define MAC_MODEL_PB520		72	/* aka: PB520C, PB540, PB540C, PB550C */

#define MAC_MODEL_PB270C	77

#define MAC_MODEL_Q840		78

#define MAC_MODEL_P550		80	/* aka: LC550, P560 */

#define MAC_MODEL_CCLII		83	/* aka: P275 */

#define MAC_MODEL_PB165		84

#define MAC_MODEL_PB190		85	/* aka: PB190CS */

#define MAC_MODEL_TV		88

#define MAC_MODEL_P475		89	/* aka: LC475, P476 */

#define MAC_MODEL_P475F		90	/* aka: P475 w/ FPU (no LC040) */

#define MAC_MODEL_P575		92	/* aka: LC575, P577/P578 */

#define MAC_MODEL_Q605		94

#define MAC_MODEL_Q605_ACC	95	/* Q605 accelerated to 33 MHz */

#define MAC_MODEL_Q630		98	/* aka: LC630, P630/631/635/636/637/638/640 */

#define MAC_MODEL_P588		99	/* aka: LC580, P580 */

#define MAC_MODEL_PB280		102

#define MAC_MODEL_PB280C	103

#define MAC_MODEL_PB150		115





    /*

     *  Latest Macintosh bootinfo version

     */