Commit f8779588 authored by Finn Thain's avatar Finn Thain Committed by Linus Torvalds
Browse files

NuBus header update 



Sync the nubus defines with the latest code in the mac68k repo. Some of these
are needed for DP8390 driver update in the next patch.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e10e5c43

drivers/net/macsonic.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -402,7 +402,7 @@ int __init macsonic_ident(struct nubus_dev* ndev) 
	    ndev->dr_sw == NUBUS_DRSW_DAYNA)

	    ndev->dr_sw == NUBUS_DRSW_DAYNA)

		return MACSONIC_DAYNA;

		return MACSONIC_DAYNA;





	if (ndev->dr_hw == NUBUS_DRHW_SONIC_LC &&

	if (ndev->dr_hw == NUBUS_DRHW_APPLE_SONIC_LC &&

	    ndev->dr_sw == 0) { /* huh? */

	    ndev->dr_sw == 0) { /* huh? */

		return MACSONIC_APPLE16;

		return MACSONIC_APPLE16;

	}

	}

include/linux/nubus.h

+75 −51
Original line number Original line Diff line number Diff line
@@ -56,6 +56,7 @@ enum nubus_type_cpu { 
 *

 *

 *  SONIC comm-slot/on-board and DuoDock Ethernet: <4,1,1,272>

 *  SONIC comm-slot/on-board and DuoDock Ethernet: <4,1,1,272>

 *  SONIC LC-PDS Ethernet (Dayna, but like Apple 16-bit, sort of): <4,1,1,271>

 *  SONIC LC-PDS Ethernet (Dayna, but like Apple 16-bit, sort of): <4,1,1,271>

 *  Apple SONIC LC-PDS Ethernet ("Apple Ethernet LC Twisted-Pair Card"): <4,1,0,281>

 *  Sonic Systems Ethernet A-Series Card: <4,1,268,256>

 *  Sonic Systems Ethernet A-Series Card: <4,1,268,256>

 *  Asante MacCon NuBus-A: <4,1,260,256> (alpha-1.0,1.1 revision)

 *  Asante MacCon NuBus-A: <4,1,260,256> (alpha-1.0,1.1 revision)

 *   ROM on the above card: <2,1,0,0>

 *   ROM on the above card: <2,1,0,0>
@@ -84,10 +85,12 @@ enum nubus_drsw { 
	NUBUS_DRSW_APPLE_HIRES  = 0x0013, /* MacII HiRes card driver */

	NUBUS_DRSW_APPLE_HIRES  = 0x0013, /* MacII HiRes card driver */

	

	

	/* NUBUS_CAT_NETWORK */

	/* NUBUS_CAT_NETWORK */

	NUBUS_DRSW_3COM         = 0x0000,

	NUBUS_DRSW_CABLETRON    = 0x0001,

	NUBUS_DRSW_CABLETRON    = 0x0001,

	NUBUS_DRSW_SONIC_LC     = 0x0001,

	NUBUS_DRSW_SONIC_LC     = 0x0001,

	NUBUS_DRSW_KINETICS     = 0x0103,

	NUBUS_DRSW_KINETICS     = 0x0103,

	NUBUS_DRSW_ASANTE       = 0x0104,

	NUBUS_DRSW_ASANTE       = 0x0104,

	NUBUS_DRSW_TECHWORKS    = 0x0109,

	NUBUS_DRSW_DAYNA        = 0x010b,

	NUBUS_DRSW_DAYNA        = 0x010b,

	NUBUS_DRSW_FARALLON     = 0x010c,

	NUBUS_DRSW_FARALLON     = 0x010c,

	NUBUS_DRSW_APPLE_SN     = 0x010f,

	NUBUS_DRSW_APPLE_SN     = 0x010f,
@@ -108,13 +111,34 @@ enum nubus_drsw { 
enum nubus_drhw {

enum nubus_drhw {

	/* NUBUS_CAT_DISPLAY */

	/* NUBUS_CAT_DISPLAY */

	NUBUS_DRHW_APPLE_TFB      = 0x0001, /* Toby frame buffer card */

	NUBUS_DRHW_APPLE_TFB      = 0x0001, /* Toby frame buffer card */

	NUBUS_DRHW_APPLE_HRVC	= 0x0013, /* Mac II High Res Video card */

	NUBUS_DRHW_APPLE_WVC      = 0x0006, /* Apple Workstation Video Card */

	NUBUS_DRHW_SIGMA_CLRMAX   = 0x0007, /* Sigma Design ColorMax */

	NUBUS_DRHW_APPLE_SE30     = 0x0009, /* Apple SE/30 video */

	NUBUS_DRHW_APPLE_HRVC     = 0x0013, /* Mac II High-Res Video Card */

	NUBUS_DRHW_APPLE_PVC      = 0x0017, /* Mac II Portrait Video Card */

	NUBUS_DRHW_APPLE_RBV1     = 0x0018, /* IIci RBV video */

	NUBUS_DRHW_APPLE_RBV1     = 0x0018, /* IIci RBV video */

	NUBUS_DRHW_APPLE_MDC      = 0x0019, /* Macintosh Display Card */

	NUBUS_DRHW_APPLE_MDC      = 0x0019, /* Macintosh Display Card */

	NUBUS_DRHW_APPLE_SONORA   = 0x0022, /* Sonora built-in video */

	NUBUS_DRHW_APPLE_SONORA   = 0x0022, /* Sonora built-in video */

	NUBUS_DRHW_APPLE_JET 	= 0x0029, /* Jet framebuffer (DuoDock) */

	NUBUS_DRHW_APPLE_24AC     = 0x002b, /* Mac 24AC Video Card */

	NUBUS_DRHW_APPLE_VALKYRIE = 0x002e,

	NUBUS_DRHW_APPLE_VALKYRIE = 0x002e,

	NUBUS_DRHW_THUNDER24	= 0x02cb, /* SuperMac Thunder/24 */

	NUBUS_DRHW_APPLE_JET      = 0x0029, /* Jet framebuffer (DuoDock) */

	NUBUS_DRHW_SMAC_GFX       = 0x0105, /* SuperMac GFX */

	NUBUS_DRHW_RASTER_CB264   = 0x013B, /* RasterOps ColorBoard 264 */

	NUBUS_DRHW_MICRON_XCEED   = 0x0146, /* Micron Exceed color */

	NUBUS_DRHW_RDIUS_GSC      = 0x0153, /* Radius GS/C */

	NUBUS_DRHW_SMAC_SPEC8     = 0x017B, /* SuperMac Spectrum/8 */

	NUBUS_DRHW_SMAC_SPEC24    = 0x017C, /* SuperMac Spectrum/24 */

	NUBUS_DRHW_RASTER_CB364   = 0x026F, /* RasterOps ColorBoard 364 */

	NUBUS_DRHW_RDIUS_DCGX     = 0x027C, /* Radius DirectColor/GX */

	NUBUS_DRHW_RDIUS_PC8      = 0x0291, /* Radius PrecisionColor 8 */

	NUBUS_DRHW_LAPIS_PCS8     = 0x0292, /* Lapis ProColorServer 8 */

	NUBUS_DRHW_RASTER_24LXI   = 0x02A0, /* RasterOps 8/24 XLi */

	NUBUS_DRHW_RASTER_PBPGT   = 0x02A5, /* RasterOps PaintBoard Prism GT */

	NUBUS_DRHW_EMACH_FSX      = 0x02AE, /* E-Machines Futura SX */

	NUBUS_DRHW_SMAC_THUND24   = 0x02CB, /* SuperMac Thunder/24 */

	NUBUS_DRHW_RDIUS_PC24XP   = 0x0406, /* Radius PrecisionColor 24Xp */

	NUBUS_DRHW_RDIUS_PC24X    = 0x040A, /* Radius PrecisionColor 24X */

	NUBUS_DRHW_RDIUS_PC8XJ    = 0x040B, /* Radius PrecisionColor 8XJ */

	

	

	/* NUBUS_CAT_NETWORK */

	/* NUBUS_CAT_NETWORK */

	NUBUS_DRHW_INTERLAN       = 0x0100,

	NUBUS_DRHW_INTERLAN       = 0x0100,
@@ -123,11 +147,11 @@ enum nubus_drhw { 
	NUBUS_DRHW_CABLETRON      = 0x0109,

	NUBUS_DRHW_CABLETRON      = 0x0109,

	NUBUS_DRHW_ASANTE_LC      = 0x010f,

	NUBUS_DRHW_ASANTE_LC      = 0x010f,

	NUBUS_DRHW_SONIC          = 0x0110,

	NUBUS_DRHW_SONIC          = 0x0110,

	NUBUS_DRHW_SONIC_NB	= 0x0118,

	NUBUS_DRHW_TECHWORKS      = 0x0112,

	NUBUS_DRHW_SONIC_LC	= 0x0119,

	NUBUS_DRHW_APPLE_SONIC_NB = 0x0118,

	

	NUBUS_DRHW_APPLE_SONIC_LC = 0x0119,

	/* NUBUS_CAT_COMMUNICATIONS */

	NUBUS_DRHW_FOCUS          = 0x011c,

	NUBUS_DRHW_DOVEFAX	= 0x0100,

	NUBUS_DRHW_SONNET         = 0x011d,

};

};





/* Resource IDs: These are the identifiers for the various weird and

/* Resource IDs: These are the identifiers for the various weird and

CRA Git | Maintained and supported by SUSTech CRA and CCSE