git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
stallion.h
diff --git
a/include/linux/stallion.h
b/include/linux/stallion.h
index
fc118c6
..
4a0a329
100644
(file)
--- a/
include/linux/stallion.h
+++ b/
include/linux/stallion.h
@@
-3,7
+3,7
@@
/*
* stallion.h -- stallion multiport serial driver.
*
/*
* stallion.h -- stallion multiport serial driver.
*
- * Copyright (C) 1996-1998 Stallion Technologies
(support@stallion.oz.au).
+ * Copyright (C) 1996-1998 Stallion Technologies
* Copyright (C) 1994-1996 Greg Ungerer.
*
* This program is free software; you can redistribute it and/or modify
* Copyright (C) 1994-1996 Greg Ungerer.
*
* This program is free software; you can redistribute it and/or modify
@@
-21,8
+21,6
@@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/version.h>
-
/*****************************************************************************/
#ifndef _STALLION_H
#define _STALLION_H
/*****************************************************************************/
#ifndef _STALLION_H
#define _STALLION_H
@@
-54,11
+52,11
@@
* protection - since "write" code only needs to change the head, and
* interrupt code only needs to change the tail.
*/
* protection - since "write" code only needs to change the head, and
* interrupt code only needs to change the tail.
*/
-
typedef struct
{
+
struct stlrq
{
char *buf;
char *head;
char *tail;
char *buf;
char *head;
char *tail;
-}
stlrq_t
;
+};
/*
* Port, panel and board structures to hold status info about each.
/*
* Port, panel and board structures to hold status info about each.
@@
-69,14
+67,14
@@
typedef struct {
* is associated with, this makes it (fairly) easy to get back to the
* board/panel info for a port.
*/
* is associated with, this makes it (fairly) easy to get back to the
* board/panel info for a port.
*/
-
typedef
struct stlport {
+struct stlport {
unsigned long magic;
unsigned long magic;
-
int
portnr;
-
int
panelnr;
-
int
brdnr;
+
unsigned int
portnr;
+
unsigned int
panelnr;
+
unsigned int
brdnr;
int ioaddr;
int uartaddr;
int ioaddr;
int uartaddr;
-
int
pagenr;
+
unsigned int
pagenr;
long istate;
int flags;
int baud_base;
long istate;
int flags;
int baud_base;
@@
-99,34
+97,34
@@
typedef struct stlport {
wait_queue_head_t close_wait;
struct work_struct tqueue;
comstats_t stats;
wait_queue_head_t close_wait;
struct work_struct tqueue;
comstats_t stats;
- st
lrq_t
tx;
-}
stlport_t
;
+ st
ruct stlrq
tx;
+};
-
typedef
struct stlpanel {
+struct stlpanel {
unsigned long magic;
unsigned long magic;
-
int
panelnr;
-
int
brdnr;
-
int
pagenr;
-
int
nrports;
+
unsigned int
panelnr;
+
unsigned int
brdnr;
+
unsigned int
pagenr;
+
unsigned int
nrports;
int iobase;
void *uartp;
void (*isr)(struct stlpanel *panelp, unsigned int iobase);
unsigned int hwid;
unsigned int ackmask;
int iobase;
void *uartp;
void (*isr)(struct stlpanel *panelp, unsigned int iobase);
unsigned int hwid;
unsigned int ackmask;
- st
lport_t
*ports[STL_PORTSPERPANEL];
-}
stlpanel_t
;
+ st
ruct stlport
*ports[STL_PORTSPERPANEL];
+};
-
typedef
struct stlbrd {
+struct stlbrd {
unsigned long magic;
unsigned long magic;
-
int
brdnr;
-
int
brdtype;
-
int
state;
-
int
nrpanels;
-
int
nrports;
-
int
nrbnks;
+
unsigned int
brdnr;
+
unsigned int
brdtype;
+
unsigned int
state;
+
unsigned int
nrpanels;
+
unsigned int
nrports;
+
unsigned int
nrbnks;
int irq;
int irqtype;
int irq;
int irqtype;
-
void
(*isr)(struct stlbrd *brdp);
+
int
(*isr)(struct stlbrd *brdp);
unsigned int ioaddr1;
unsigned int ioaddr2;
unsigned int iosize1;
unsigned int ioaddr1;
unsigned int ioaddr2;
unsigned int iosize1;
@@
-138,9
+136,9
@@
typedef struct stlbrd {
unsigned long clk;
unsigned int bnkpageaddr[STL_MAXBANKS];
unsigned int bnkstataddr[STL_MAXBANKS];
unsigned long clk;
unsigned int bnkpageaddr[STL_MAXBANKS];
unsigned int bnkstataddr[STL_MAXBANKS];
- st
lpanel_t
*bnk2panel[STL_MAXBANKS];
- st
lpanel_t
*panels[STL_MAXPANELS];
-}
stlbrd_t
;
+ st
ruct stlpanel
*bnk2panel[STL_MAXBANKS];
+ st
ruct stlpanel
*panels[STL_MAXPANELS];
+};
/*
/*