patch-2.4.25 linux-2.4.25/include/asm-mips/sgi/ioc.h
Next file: linux-2.4.25/include/asm-mips/sgi/pi1.h
Previous file: linux-2.4.25/include/asm-mips/serial.h
Back to the patch index
Back to the overall index
- Lines: 59
- Date:
2004-02-18 05:36:32.000000000 -0800
- Orig file:
linux-2.4.24/include/asm-mips/sgi/ioc.h
- Orig date:
2003-08-25 04:44:44.000000000 -0700
diff -urN linux-2.4.24/include/asm-mips/sgi/ioc.h linux-2.4.25/include/asm-mips/sgi/ioc.h
@@ -14,48 +14,13 @@
#define _SGI_IOC_H
#include <linux/types.h>
+#include <asm/sgi/pi1.h>
/*
* All registers are 8-bit wide alligned on 32-bit boundary. Bad things
* happen if you try word access them. You have been warned.
*/
-struct sgioc_pport_regs {
- u8 _data[3];
- volatile u8 data;
- u8 _ctrl[3];
- volatile u8 ctrl;
-#define SGIOC_PCTRL_STROBE 0x01
-#define SGIOC_PCTRL_AFD 0x02
-#define SGIOC_PCTRL_INIT 0x04
-#define SGIOC_PCTRL_SLIN 0x08
-#define SGIOC_PCTRL_DIRECTION 0x20
-#define SGIOC_PCTRL_SEL 0x40
- u8 _status[3];
- volatile u8 status;
-#define SGIOC_PSTAT_DEVID 0x03
-#define SGIOC_PSTAT_NOINK 0x04
-#define SGIOC_PSTAT_ERROR 0x08
-#define SGIOC_PSTAT_ONLINE 0x10
-#define SGIOC_PSTAT_PE 0x20
-#define SGIOC_PSTAT_ACK 0x40
-#define SGIOC_PSTAT_BUSY 0x80
- u8 _dmactrl[3];
- volatile u8 dmactrl;
- u8 _intrstat[3];
- volatile u8 intrstat;
- u8 _intrmask[3];
- volatile u8 intrmask;
- u8 _timer1[3];
- volatile u8 timer1;
- u8 _timer2[3];
- volatile u8 timer2;
- u8 _timer3[3];
- volatile u8 timer3;
- u8 _timer4[3];
- volatile u8 timer4;
-};
-
struct sgioc_uart_regs {
u8 _ctrl1[3];
volatile u8 ctrl1;
@@ -153,7 +118,7 @@
extern u8 sgi_ioc_reset, sgi_ioc_write;
struct sgioc_regs {
- struct sgioc_pport_regs pport;
+ struct pi1_regs pport;
u32 _unused0[2];
struct sgioc_uart_regs serport;
struct sgioc_keyb_regs kbdmouse;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)