Commit 31168afe authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] sn: Kill the arcs/*.h files

From: Pat Gefre <pfg@sgi.com>

Kill the arcs/*.h files
Some general clean up on klconfig.h
parent f0f1f768
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 2000-2003 Silicon Graphics, Inc. All rights reserved.
*/
/*
* ARCS hardware/memory inventory/configuration and system ID definitions.
*/
#ifndef _ASM_SN_ARC_HINV_H
#define _ASM_SN_ARC_HINV_H
#include <asm/sn/arc/types.h>
/* configuration query defines */
typedef enum configclass {
SystemClass,
ProcessorClass,
CacheClass,
#ifndef _NT_PROM
MemoryClass,
AdapterClass,
ControllerClass,
PeripheralClass
#else /* _NT_PROM */
AdapterClass,
ControllerClass,
PeripheralClass,
MemoryClass
#endif /* _NT_PROM */
} CONFIGCLASS;
typedef enum configtype {
ARC,
CPU,
FPU,
PrimaryICache,
PrimaryDCache,
SecondaryICache,
SecondaryDCache,
SecondaryCache,
#ifndef _NT_PROM
Memory,
#endif
EISAAdapter,
TCAdapter,
SCSIAdapter,
DTIAdapter,
MultiFunctionAdapter,
DiskController,
TapeController,
CDROMController,
WORMController,
SerialController,
NetworkController,
DisplayController,
ParallelController,
PointerController,
KeyboardController,
AudioController,
OtherController,
DiskPeripheral,
FloppyDiskPeripheral,
TapePeripheral,
ModemPeripheral,
MonitorPeripheral,
PrinterPeripheral,
PointerPeripheral,
KeyboardPeripheral,
TerminalPeripheral,
LinePeripheral,
NetworkPeripheral,
#ifdef _NT_PROM
Memory,
#endif
OtherPeripheral,
/* new stuff for IP30 */
/* added without moving anything */
/* except ANONYMOUS. */
XTalkAdapter,
PCIAdapter,
GIOAdapter,
TPUAdapter,
TernaryCache,
Anonymous
} CONFIGTYPE;
typedef enum {
Failed = 1,
ReadOnly = 2,
Removable = 4,
ConsoleIn = 8,
ConsoleOut = 16,
Input = 32,
Output = 64
} IDENTIFIERFLAG;
#ifndef NULL /* for GetChild(NULL); */
#define NULL 0
#endif
union key_u {
struct {
#ifdef _MIPSEB
unsigned char c_bsize; /* block size in lines */
unsigned char c_lsize; /* line size in bytes/tag */
unsigned short c_size; /* cache size in 4K pages */
#else /* _MIPSEL */
unsigned short c_size; /* cache size in 4K pages */
unsigned char c_lsize; /* line size in bytes/tag */
unsigned char c_bsize; /* block size in lines */
#endif /* _MIPSEL */
} cache;
ULONG FullKey;
};
#if _MIPS_SIM == _ABI64
#define SGI_ARCS_VERS 64 /* sgi 64-bit version */
#define SGI_ARCS_REV 0 /* rev .00 */
#else
#define SGI_ARCS_VERS 1 /* first version */
#define SGI_ARCS_REV 10 /* rev .10, 3/04/92 */
#endif
typedef struct component {
CONFIGCLASS Class;
CONFIGTYPE Type;
IDENTIFIERFLAG Flags;
USHORT Version;
USHORT Revision;
ULONG Key;
ULONG AffinityMask;
ULONG ConfigurationDataSize;
ULONG IdentifierLength;
char *Identifier;
} COMPONENT;
/* internal structure that holds pathname parsing data */
struct cfgdata {
char *name; /* full name */
int minlen; /* minimum length to match */
CONFIGTYPE type; /* type of token */
};
/* System ID */
typedef struct systemid {
CHAR VendorId[8];
CHAR ProductId[8];
} SYSTEMID;
/* memory query functions */
typedef enum memorytype {
ExceptionBlock,
SPBPage, /* ARCS == SystemParameterBlock */
#ifndef _NT_PROM
FreeContiguous,
FreeMemory,
BadMemory,
LoadedProgram,
FirmwareTemporary,
FirmwarePermanent
#else /* _NT_PROM */
FreeMemory,
BadMemory,
LoadedProgram,
FirmwareTemporary,
FirmwarePermanent,
FreeContiguous
#endif /* _NT_PROM */
} MEMORYTYPE;
typedef struct memorydescriptor {
MEMORYTYPE Type;
LONG BasePage;
LONG PageCount;
} MEMORYDESCRIPTOR;
#endif /* _ASM_SN_ARC_HINV_H */
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (c) 1999,2001-2003 Silicon Graphics, Inc. All Rights Reserved.
* Copyright 1999 Ralf Baechle (ralf@gnu.org)
*/
#ifndef _ASM_SN_ARC_TYPES_H
#define _ASM_SN_ARC_TYPES_H
typedef char CHAR;
typedef short SHORT;
typedef long LARGE_INTEGER __attribute__ ((__mode__ (__DI__)));
typedef long LONG __attribute__ ((__mode__ (__DI__)));
typedef unsigned char UCHAR;
typedef unsigned short USHORT;
typedef unsigned long ULONG __attribute__ ((__mode__ (__DI__)));
typedef void VOID;
/* The pointer types. We're 64-bit and the firmware is also 64-bit, so
live is sane ... */
typedef CHAR *_PCHAR;
typedef SHORT *_PSHORT;
typedef LARGE_INTEGER *_PLARGE_INTEGER;
typedef LONG *_PLONG;
typedef UCHAR *_PUCHAR;
typedef USHORT *_PUSHORT;
typedef ULONG *_PULONG;
typedef VOID *_PVOID;
typedef CHAR *PCHAR;
typedef SHORT *PSHORT;
typedef LARGE_INTEGER *PLARGE_INTEGER;
typedef LONG *PLONG;
typedef UCHAR *PUCHAR;
typedef USHORT *PUSHORT;
typedef ULONG *PULONG;
typedef VOID *PVOID;
#endif /* _ASM_SN_ARC_TYPES_H */
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include <asm/sn/sgi.h> #include <asm/sn/sgi.h>
#include <asm/sn/addrs.h> #include <asm/sn/addrs.h>
#include <asm/sn/vector.h> #include <asm/sn/vector.h>
#include <asm/sn/arc/hinv.h>
#include <asm/sn/xtalk/xbow.h> #include <asm/sn/xtalk/xbow.h>
#include <asm/sn/xtalk/xtalk.h> #include <asm/sn/xtalk/xtalk.h>
#include <asm/sn/kldir.h> #include <asm/sn/kldir.h>
...@@ -514,7 +513,7 @@ typedef struct klinfo_s { /* Generic info */ ...@@ -514,7 +513,7 @@ typedef struct klinfo_s { /* Generic info */
nasid_t nasid; /* node number - from parent */ nasid_t nasid; /* node number - from parent */
char pad1; /* pad out structure. */ char pad1; /* pad out structure. */
char pad2; /* pad out structure. */ char pad2; /* pad out structure. */
COMPONENT *arcs_compt; /* ptr to the arcs struct for ease*/ void *data;
klconf_off_t errinfo; /* component specific errors */ klconf_off_t errinfo; /* component specific errors */
unsigned short pad3; /* pci fields have moved over to */ unsigned short pad3; /* pci fields have moved over to */
unsigned short pad4; /* klbri_t */ unsigned short pad4; /* klbri_t */
...@@ -633,7 +632,7 @@ typedef struct klcpu_s { /* CPU */ ...@@ -633,7 +632,7 @@ typedef struct klcpu_s { /* CPU */
typedef struct klhub_s { /* HUB */ typedef struct klhub_s { /* HUB */
klinfo_t hub_info; klinfo_t hub_info;
uint hub_flags; /* PCFG_HUB_xxx flags */ unsigned int hub_flags; /* PCFG_HUB_xxx flags */
#define MAX_NI_PORTS 2 #define MAX_NI_PORTS 2
klport_t hub_port[MAX_NI_PORTS + 1];/* hub is connected to this */ klport_t hub_port[MAX_NI_PORTS + 1];/* hub is connected to this */
nic_t hub_box_nic; /* nic of containing box */ nic_t hub_box_nic; /* nic of containing box */
...@@ -645,7 +644,7 @@ typedef struct klhub_s { /* HUB */ ...@@ -645,7 +644,7 @@ typedef struct klhub_s { /* HUB */
typedef struct klhub_uart_s { /* HUB */ typedef struct klhub_uart_s { /* HUB */
klinfo_t hubuart_info; klinfo_t hubuart_info;
uint hubuart_flags; /* PCFG_HUB_xxx flags */ unsigned int hubuart_flags; /* PCFG_HUB_xxx flags */
nic_t hubuart_box_nic; /* nic of containing box */ nic_t hubuart_box_nic; /* nic of containing box */
unsigned long pad; unsigned long pad;
} klhub_uart_t ; } klhub_uart_t ;
...@@ -752,7 +751,7 @@ typedef struct klvmed_s { /* VME DEVICE - VME BOARD */ ...@@ -752,7 +751,7 @@ typedef struct klvmed_s { /* VME DEVICE - VME BOARD */
/* XXX - Don't we need the number of ports here?!? */ /* XXX - Don't we need the number of ports here?!? */
typedef struct klrou_s { /* ROUTER */ typedef struct klrou_s { /* ROUTER */
klinfo_t rou_info ; klinfo_t rou_info ;
uint rou_flags ; /* PCFG_ROUTER_xxx flags */ unsigned int rou_flags ; /* PCFG_ROUTER_xxx flags */
nic_t rou_box_nic ; /* nic of the containing module */ nic_t rou_box_nic ; /* nic of the containing module */
klport_t rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */ klport_t rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */
klconf_off_t rou_mfg_nic ; /* MFG NIC string */ klconf_off_t rou_mfg_nic ; /* MFG NIC string */
...@@ -776,10 +775,10 @@ typedef struct klgfx_s { /* GRAPHICS Device */ ...@@ -776,10 +775,10 @@ typedef struct klgfx_s { /* GRAPHICS Device */
klinfo_t gfx_info; klinfo_t gfx_info;
klconf_off_t old_gndevs; /* for compatibility with older proms */ klconf_off_t old_gndevs; /* for compatibility with older proms */
klconf_off_t old_gdoff0; /* for compatibility with older proms */ klconf_off_t old_gdoff0; /* for compatibility with older proms */
uint cookie; /* for compatibility with older proms */ unsigned int cookie; /* for compatibility with older proms */
uint moduleslot; unsigned int moduleslot;
struct klgfx_s *gfx_next_pipe; struct klgfx_s *gfx_next_pipe;
graphics_t gfx_specific; u64 *gfx_specific;
klconf_off_t pad0; /* for compatibility with older proms */ klconf_off_t pad0; /* for compatibility with older proms */
klconf_off_t gfx_mfg_nic; klconf_off_t gfx_mfg_nic;
unsigned long pad; unsigned long pad;
...@@ -813,7 +812,7 @@ typedef struct klgsn_s { /* GSN board */ ...@@ -813,7 +812,7 @@ typedef struct klgsn_s { /* GSN board */
typedef struct klscsi_s { /* SCSI Bus */ typedef struct klscsi_s { /* SCSI Bus */
klinfo_t scsi_info ; klinfo_t scsi_info ;
scsi_t scsi_specific ; u64 *scsi_specific ;
unsigned char scsi_numdevs ; unsigned char scsi_numdevs ;
klconf_off_t scsi_devinfo[MAX_SCSI_DEVS] ; klconf_off_t scsi_devinfo[MAX_SCSI_DEVS] ;
unsigned long pad; unsigned long pad;
...@@ -821,8 +820,8 @@ typedef struct klscsi_s { /* SCSI Bus */ ...@@ -821,8 +820,8 @@ typedef struct klscsi_s { /* SCSI Bus */
typedef struct klscctl_s { /* SCSI Controller */ typedef struct klscctl_s { /* SCSI Controller */
klinfo_t scsi_info ; klinfo_t scsi_info ;
uint type; unsigned int type;
uint scsi_buscnt; /* # busses this cntlr */ unsigned int scsi_buscnt; /* # busses this cntlr */
void *scsi_bus[2]; /* Pointer to 2 klscsi_t's */ void *scsi_bus[2]; /* Pointer to 2 klscsi_t's */
unsigned long pad; unsigned long pad;
} klscctl_t ; } klscctl_t ;
...@@ -889,16 +888,11 @@ typedef union klcomp_s { ...@@ -889,16 +888,11 @@ typedef union klcomp_s {
klmembnk_t kc_mem; klmembnk_t kc_mem;
klxbow_t kc_xbow; klxbow_t kc_xbow;
klbri_t kc_bri; klbri_t kc_bri;
klioc3_t kc_ioc3;
klvmeb_t kc_vmeb;
klvmed_t kc_vmed;
klrou_t kc_rou; klrou_t kc_rou;
klgfx_t kc_gfx; klgfx_t kc_gfx;
klscsi_t kc_scsi; klscsi_t kc_scsi;
klscctl_t kc_scsi_ctl; klscctl_t kc_scsi_ctl;
klscdev_t kc_scsi_dev; klscdev_t kc_scsi_dev;
klfddi_t kc_fddi;
klmio_t kc_mio;
klmod_serial_num_t kc_snum ; klmod_serial_num_t kc_snum ;
klusb_t kc_usb; klusb_t kc_usb;
} klcomp_t; } klcomp_t;
...@@ -906,7 +900,6 @@ typedef union klcomp_s { ...@@ -906,7 +900,6 @@ typedef union klcomp_s {
typedef union kldev_s { /* for device structure allocation */ typedef union kldev_s { /* for device structure allocation */
klscdev_t kc_scsi_dev ; klscdev_t kc_scsi_dev ;
klttydev_t kc_tty_dev ; klttydev_t kc_tty_dev ;
klenetdev_t kc_enet_dev ;
klkbddev_t kc_kbd_dev ; klkbddev_t kc_kbd_dev ;
} kldev_t ; } kldev_t ;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment