diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-01-18 18:46:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-18 18:46:29 -0800 |
| commit | 4e8caa8f8af9494069b860564566e446f8538078 (patch) | |
| tree | 15c23bc15bcb72031a59a47faa31aa38cae076e6 /include | |
| parent | 7445915447136ac18e051a29d1a82b7b05f3885b (diff) | |
[PATCH] sn: New code for Opus and CGbrick
From: Pat Gefre <pfg@sgi.com>
New code for Opus and CGbrick
More minor clean up
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/sn/iograph.h | 14 | ||||
| -rw-r--r-- | include/asm-ia64/sn/klconfig.h | 1 | ||||
| -rw-r--r-- | include/asm-ia64/sn/ksys/l1.h | 5 | ||||
| -rw-r--r-- | include/asm-ia64/sn/module.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/include/asm-ia64/sn/iograph.h b/include/asm-ia64/sn/iograph.h index b4243a2fa63a..65d191c23cf7 100644 --- a/include/asm-ia64/sn/iograph.h +++ b/include/asm-ia64/sn/iograph.h @@ -52,6 +52,9 @@ #define EDGE_LBL_PCIX "pci-x" #define EDGE_LBL_PCIX_0 EDGE_LBL_PCIX "/0" #define EDGE_LBL_PCIX_1 EDGE_LBL_PCIX "/1" +#define EDGE_LBL_AGP "agp" +#define EDGE_LBL_AGP_0 EDGE_LBL_AGP "/0" +#define EDGE_LBL_AGP_1 EDGE_LBL_AGP "/1" #define EDGE_LBL_PORT "port" #define EDGE_LBL_PROM "prom" #define EDGE_LBL_RACK "rack" @@ -79,6 +82,7 @@ #define EDGE_LBL_XPLINK_ADMIN "admin" /* Partition admin */ #define EDGE_LBL_IOBRICK "iobrick" #define EDGE_LBL_PXBRICK "PXbrick" +#define EDGE_LBL_OPUSBRICK "onboardio" #define EDGE_LBL_IXBRICK "IXbrick" #define EDGE_LBL_CGBRICK "CGbrick" #define EDGE_LBL_CPUBUS "cpubus" /* CPU Interfaces (SysAd) */ @@ -90,9 +94,7 @@ #define INFO_LBL_CPUID "_cpuid" #define INFO_LBL_CPU_INFO "_cpu" #define INFO_LBL_DETAIL_INVENT "_detail_invent" /* inventory data*/ -#define INFO_LBL_DEVICE_DESC "_device_desc" -#define INFO_LBL_DIAGVAL "_diag_reason" /* Reason disabled */ -#define INFO_LBL_DKIOTIME "_dkiotime" +#define INFO_LBL_DIAGVAL "_diag_reason" /* Reason disabled */ #define INFO_LBL_DRIVER "_driver" /* points to attached device_driver_t */ #define INFO_LBL_ELSC "_elsc" #define INFO_LBL_SUBCH "_subch" /* system controller subchannel */ @@ -135,12 +137,6 @@ * thread priority * default class */ -/* Special reserved info labels (also hwgfs attributes) */ -#define _DEVNAME_ATTR "_devname" /* device name */ -#define _DRIVERNAME_ATTR "_drivername" /* driver name */ -#define _INVENT_ATTR "_inventory" /* device inventory data */ -#define _MASTERNODE_ATTR "_masternode" /* node that "controls" device */ - /* Info labels that begin with '_' cannot be overwritten by an attr_set call */ #define INFO_LBL_RESERVED(name) ((name)[0] == '_') diff --git a/include/asm-ia64/sn/klconfig.h b/include/asm-ia64/sn/klconfig.h index c1b601077e6b..22443819fb66 100644 --- a/include/asm-ia64/sn/klconfig.h +++ b/include/asm-ia64/sn/klconfig.h @@ -354,6 +354,7 @@ typedef struct kl_config_hdr { #define KLTYPE_PXBRICK (KLCLASS_IOBRICK | 0x6) #define KLTYPE_IXBRICK (KLCLASS_IOBRICK | 0x7) #define KLTYPE_CGBRICK (KLCLASS_IOBRICK | 0x8) +#define KLTYPE_OPUSBRICK (KLCLASS_IOBRICK | 0x9) #define KLTYPE_PBRICK_BRIDGE KLTYPE_PBRICK diff --git a/include/asm-ia64/sn/ksys/l1.h b/include/asm-ia64/sn/ksys/l1.h index 6b6bcacac93e..09f08da60a27 100644 --- a/include/asm-ia64/sn/ksys/l1.h +++ b/include/asm-ia64/sn/ksys/l1.h @@ -90,10 +90,11 @@ #define L1_BRICKTYPE_IP45 0x34 /* 4 */ #define L1_BRICKTYPE_C 0x43 /* C */ #define L1_BRICKTYPE_R 0x52 /* R */ -#define L1_BRICKTYPE_CHI_CG 0x76 /* v */ +#define L1_BRICKTYPE_CHI_CG 0x76 /* v */ #define L1_BRICKTYPE_N 0x4e /* N */ #define L1_BRICKTYPE_PX 0x23 /* # */ #define L1_BRICKTYPE_IX 0x3d /* = */ +#define L1_BRICKTYPE_OPUS 0x6f /* o */ /* EEPROM codes (for the "read EEPROM" request) */ /* c brick */ @@ -125,7 +126,7 @@ int elsc_display_line(nasid_t nasid, char *line, int lnum); int iobrick_rack_bay_type_get( nasid_t nasid, unsigned int *rack, unsigned int *bay, unsigned int *brick_type ); -int iobrick_module_get( nasid_t nasid ); +int iomoduleid_get( nasid_t nasid ); #endif /* _ASM_IA64_SN_KSYS_L1_H */ diff --git a/include/asm-ia64/sn/module.h b/include/asm-ia64/sn/module.h index 3a819fe427c7..1ca14d9f86ba 100644 --- a/include/asm-ia64/sn/module.h +++ b/include/asm-ia64/sn/module.h @@ -138,6 +138,8 @@ extern char brick_types[]; #define MODULE_PEBRICK 8 #define MODULE_PXBRICK 9 #define MODULE_IXBRICK 10 +#define MODULE_CGBRICK 11 +#define MODULE_OPUSBRICK 12 /* * Moduleid_t comparison macros |