aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-03-07 15:03:07 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-07 15:03:07 -0500
commit8d971e98a7be749445ac6eb9eb37b116f1a6d3c0 (patch)
treeb85cfb2552797a12e39448b7bba1f5b381507b79 /drivers/char
parent751b3840d216f1ecd3b91ff5251bf7703b690cd8 (diff)
Staging: tty: fix build with epca.c driver
I forgot to move the digi*.h files from drivers/char/ to drivers/staging/tty/ Thanks to Randy for pointing out the issue. Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/digi1.h100
-rw-r--r--drivers/char/digiFep1.h136
-rw-r--r--drivers/char/digiPCI.h42
3 files changed, 0 insertions, 278 deletions
diff --git a/drivers/char/digi1.h b/drivers/char/digi1.h
deleted file mode 100644
index 94d4eab5d3ca..000000000000
--- a/drivers/char/digi1.h
+++ /dev/null
@@ -1,100 +0,0 @@
1/* Definitions for DigiBoard ditty(1) command. */
2
3#if !defined(TIOCMODG)
4#define TIOCMODG (('d'<<8) | 250) /* get modem ctrl state */
5#define TIOCMODS (('d'<<8) | 251) /* set modem ctrl state */
6#endif
7
8#if !defined(TIOCMSET)
9#define TIOCMSET (('d'<<8) | 252) /* set modem ctrl state */
10#define TIOCMGET (('d'<<8) | 253) /* set modem ctrl state */
11#endif
12
13#if !defined(TIOCMBIC)
14#define TIOCMBIC (('d'<<8) | 254) /* set modem ctrl state */
15#define TIOCMBIS (('d'<<8) | 255) /* set modem ctrl state */
16#endif
17
18#if !defined(TIOCSDTR)
19#define TIOCSDTR (('e'<<8) | 0) /* set DTR */
20#define TIOCCDTR (('e'<<8) | 1) /* clear DTR */
21#endif
22
23/************************************************************************
24 * Ioctl command arguments for DIGI parameters.
25 ************************************************************************/
26#define DIGI_GETA (('e'<<8) | 94) /* Read params */
27
28#define DIGI_SETA (('e'<<8) | 95) /* Set params */
29#define DIGI_SETAW (('e'<<8) | 96) /* Drain & set params */
30#define DIGI_SETAF (('e'<<8) | 97) /* Drain, flush & set params */
31
32#define DIGI_GETFLOW (('e'<<8) | 99) /* Get startc/stopc flow */
33 /* control characters */
34#define DIGI_SETFLOW (('e'<<8) | 100) /* Set startc/stopc flow */
35 /* control characters */
36#define DIGI_GETAFLOW (('e'<<8) | 101) /* Get Aux. startc/stopc */
37 /* flow control chars */
38#define DIGI_SETAFLOW (('e'<<8) | 102) /* Set Aux. startc/stopc */
39 /* flow control chars */
40
41#define DIGI_GETINFO (('e'<<8) | 103) /* Fill in digi_info */
42#define DIGI_POLLER (('e'<<8) | 104) /* Turn on/off poller */
43#define DIGI_INIT (('e'<<8) | 105) /* Allow things to run. */
44
45struct digiflow_struct
46{
47 unsigned char startc; /* flow cntl start char */
48 unsigned char stopc; /* flow cntl stop char */
49};
50
51typedef struct digiflow_struct digiflow_t;
52
53
54/************************************************************************
55 * Values for digi_flags
56 ************************************************************************/
57#define DIGI_IXON 0x0001 /* Handle IXON in the FEP */
58#define DIGI_FAST 0x0002 /* Fast baud rates */
59#define RTSPACE 0x0004 /* RTS input flow control */
60#define CTSPACE 0x0008 /* CTS output flow control */
61#define DSRPACE 0x0010 /* DSR output flow control */
62#define DCDPACE 0x0020 /* DCD output flow control */
63#define DTRPACE 0x0040 /* DTR input flow control */
64#define DIGI_FORCEDCD 0x0100 /* Force carrier */
65#define DIGI_ALTPIN 0x0200 /* Alternate RJ-45 pin config */
66#define DIGI_AIXON 0x0400 /* Aux flow control in fep */
67
68
69/************************************************************************
70 * Values for digiDload
71 ************************************************************************/
72#define NORMAL 0
73#define PCI_CTL 1
74
75#define SIZE8 0
76#define SIZE16 1
77#define SIZE32 2
78
79/************************************************************************
80 * Structure used with ioctl commands for DIGI parameters.
81 ************************************************************************/
82struct digi_struct
83{
84 unsigned short digi_flags; /* Flags (see above) */
85};
86
87typedef struct digi_struct digi_t;
88
89struct digi_info
90{
91 unsigned long board; /* Which board is this ? */
92 unsigned char status; /* Alive or dead */
93 unsigned char type; /* see epca.h */
94 unsigned char subtype; /* For future XEM, XR, etc ... */
95 unsigned short numports; /* Number of ports configured */
96 unsigned char *port; /* I/O Address */
97 unsigned char *membase; /* DPR Address */
98 unsigned char *version; /* For future ... */
99 unsigned short windowData; /* For future ... */
100} ;
diff --git a/drivers/char/digiFep1.h b/drivers/char/digiFep1.h
deleted file mode 100644
index 3c1f1922c798..000000000000
--- a/drivers/char/digiFep1.h
+++ /dev/null
@@ -1,136 +0,0 @@
1
2#define CSTART 0x400L
3#define CMAX 0x800L
4#define ISTART 0x800L
5#define IMAX 0xC00L
6#define CIN 0xD10L
7#define GLOBAL 0xD10L
8#define EIN 0xD18L
9#define FEPSTAT 0xD20L
10#define CHANSTRUCT 0x1000L
11#define RXTXBUF 0x4000L
12
13
14struct global_data
15{
16 u16 cin;
17 u16 cout;
18 u16 cstart;
19 u16 cmax;
20 u16 ein;
21 u16 eout;
22 u16 istart;
23 u16 imax;
24};
25
26
27struct board_chan
28{
29 u32 filler1;
30 u32 filler2;
31 u16 tseg;
32 u16 tin;
33 u16 tout;
34 u16 tmax;
35
36 u16 rseg;
37 u16 rin;
38 u16 rout;
39 u16 rmax;
40
41 u16 tlow;
42 u16 rlow;
43 u16 rhigh;
44 u16 incr;
45
46 u16 etime;
47 u16 edelay;
48 unchar *dev;
49
50 u16 iflag;
51 u16 oflag;
52 u16 cflag;
53 u16 gmask;
54
55 u16 col;
56 u16 delay;
57 u16 imask;
58 u16 tflush;
59
60 u32 filler3;
61 u32 filler4;
62 u32 filler5;
63 u32 filler6;
64
65 u8 num;
66 u8 ract;
67 u8 bstat;
68 u8 tbusy;
69 u8 iempty;
70 u8 ilow;
71 u8 idata;
72 u8 eflag;
73
74 u8 tflag;
75 u8 rflag;
76 u8 xmask;
77 u8 xval;
78 u8 mstat;
79 u8 mchange;
80 u8 mint;
81 u8 lstat;
82
83 u8 mtran;
84 u8 orun;
85 u8 startca;
86 u8 stopca;
87 u8 startc;
88 u8 stopc;
89 u8 vnext;
90 u8 hflow;
91
92 u8 fillc;
93 u8 ochar;
94 u8 omask;
95
96 u8 filler7;
97 u8 filler8[28];
98};
99
100
101#define SRXLWATER 0xE0
102#define SRXHWATER 0xE1
103#define STOUT 0xE2
104#define PAUSETX 0xE3
105#define RESUMETX 0xE4
106#define SAUXONOFFC 0xE6
107#define SENDBREAK 0xE8
108#define SETMODEM 0xE9
109#define SETIFLAGS 0xEA
110#define SONOFFC 0xEB
111#define STXLWATER 0xEC
112#define PAUSERX 0xEE
113#define RESUMERX 0xEF
114#define SETBUFFER 0xF2
115#define SETCOOKED 0xF3
116#define SETHFLOW 0xF4
117#define SETCTRLFLAGS 0xF5
118#define SETVNEXT 0xF6
119
120
121
122#define BREAK_IND 0x01
123#define LOWTX_IND 0x02
124#define EMPTYTX_IND 0x04
125#define DATA_IND 0x08
126#define MODEMCHG_IND 0x20
127
128#define FEP_HUPCL 0002000
129#if 0
130#define RTS 0x02
131#define CD 0x08
132#define DSR 0x10
133#define CTS 0x20
134#define RI 0x40
135#define DTR 0x80
136#endif
diff --git a/drivers/char/digiPCI.h b/drivers/char/digiPCI.h
deleted file mode 100644
index 6ca7819e5069..000000000000
--- a/drivers/char/digiPCI.h
+++ /dev/null
@@ -1,42 +0,0 @@
1/*************************************************************************
2 * Defines and structure definitions for PCI BIOS Interface
3 *************************************************************************/
4#define PCIMAX 32 /* maximum number of PCI boards */
5
6
7#define PCI_VENDOR_DIGI 0x114F
8#define PCI_DEVICE_EPC 0x0002
9#define PCI_DEVICE_RIGHTSWITCH 0x0003 /* For testing */
10#define PCI_DEVICE_XEM 0x0004
11#define PCI_DEVICE_XR 0x0005
12#define PCI_DEVICE_CX 0x0006
13#define PCI_DEVICE_XRJ 0x0009 /* Jupiter boards with */
14#define PCI_DEVICE_EPCJ 0x000a /* PLX 9060 chip for PCI */
15
16
17/*
18 * On the PCI boards, there is no IO space allocated
19 * The I/O registers will be in the first 3 bytes of the
20 * upper 2MB of the 4MB memory space. The board memory
21 * will be mapped into the low 2MB of the 4MB memory space
22 */
23
24/* Potential location of PCI Bios from E0000 to FFFFF*/
25#define PCI_BIOS_SIZE 0x00020000
26
27/* Size of Memory and I/O for PCI (4MB) */
28#define PCI_RAM_SIZE 0x00400000
29
30/* Size of Memory (2MB) */
31#define PCI_MEM_SIZE 0x00200000
32
33/* Offset of I/0 in Memory (2MB) */
34#define PCI_IO_OFFSET 0x00200000
35
36#define MEMOUTB(basemem, pnum, setmemval) *(caddr_t)((basemem) + ( PCI_IO_OFFSET | pnum << 4 | pnum )) = (setmemval)
37#define MEMINB(basemem, pnum) *(caddr_t)((basemem) + (PCI_IO_OFFSET | pnum << 4 | pnum )) /* for PCI I/O */
38
39
40
41
42