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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
isdn
/
hysdn
/
boardergo.c
diff --git
a/drivers/isdn/hysdn/boardergo.c
b/drivers/isdn/hysdn/boardergo.c
index
e19a01a
..
73afebd
100644
(file)
--- a/
drivers/isdn/hysdn/boardergo.c
+++ b/
drivers/isdn/hysdn/boardergo.c
@@
-14,7
+14,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/signal.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/signal.h>
#include <linux/kernel.h>
@@
-38,8
+37,8
@@
ergo_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{
hysdn_card *card = dev_id; /* parameter from irq */
tErgDpram *dpr;
{
hysdn_card *card = dev_id; /* parameter from irq */
tErgDpram *dpr;
- ulong flags;
- uchar volatile b;
+ u
nsigned
long flags;
+ u
nsigned
char volatile b;
if (!card)
return IRQ_NONE; /* error -> spurious interrupt */
if (!card)
return IRQ_NONE; /* error -> spurious interrupt */
@@
-77,7
+76,7
@@
ergo_irq_bh(hysdn_card * card)
{
tErgDpram *dpr;
int again;
{
tErgDpram *dpr;
int again;
- ulong flags;
+ u
nsigned
long flags;
if (card->state != CARD_STATE_RUN)
return; /* invalid call */
if (card->state != CARD_STATE_RUN)
return; /* invalid call */
@@
-131,8
+130,8
@@
ergo_irq_bh(hysdn_card * card)
static void
ergo_stopcard(hysdn_card * card)
{
static void
ergo_stopcard(hysdn_card * card)
{
- ulong flags;
- uchar val;
+ u
nsigned
long flags;
+ u
nsigned
char val;
hysdn_net_release(card); /* first release the net device if existing */
#ifdef CONFIG_HYSDN_CAPI
hysdn_net_release(card); /* first release the net device if existing */
#ifdef CONFIG_HYSDN_CAPI
@@
-157,7
+156,7
@@
ergo_stopcard(hysdn_card * card)
static void
ergo_set_errlog_state(hysdn_card * card, int on)
{
static void
ergo_set_errlog_state(hysdn_card * card, int on)
{
- ulong flags;
+ u
nsigned
long flags;
if (card->state != CARD_STATE_RUN) {
card->err_log_state = ERRLOG_STATE_OFF; /* must be off */
if (card->state != CARD_STATE_RUN) {
card->err_log_state = ERRLOG_STATE_OFF; /* must be off */
@@
-217,9
+216,10
@@
ergo_testram(hysdn_card * card)
/* Negative return values are interpreted as errors. */
/*****************************************************************************/
static int
/* Negative return values are interpreted as errors. */
/*****************************************************************************/
static int
-ergo_writebootimg(struct HYSDN_CARD *card, uchar * buf, ulong offs)
+ergo_writebootimg(struct HYSDN_CARD *card, unsigned char *buf,
+ unsigned long offs)
{
{
- uchar *dst;
+ u
nsigned
char *dst;
tErgDpram *dpram;
int cnt = (BOOT_IMG_SIZE >> 2); /* number of words to move and swap (byte order!) */
tErgDpram *dpram;
int cnt = (BOOT_IMG_SIZE >> 2); /* number of words to move and swap (byte order!) */
@@
-264,14
+264,14
@@
ergo_writebootimg(struct HYSDN_CARD *card, uchar * buf, ulong offs)
/* case of errors a negative error value is returned. */
/********************************************************************************/
static int
/* case of errors a negative error value is returned. */
/********************************************************************************/
static int
-ergo_writebootseq(struct HYSDN_CARD *card, u
char *
buf, int len)
+ergo_writebootseq(struct HYSDN_CARD *card, u
nsigned char *
buf, int len)
{
tDpramBootSpooler *sp = (tDpramBootSpooler *) card->dpram;
{
tDpramBootSpooler *sp = (tDpramBootSpooler *) card->dpram;
- uchar *dst;
- uchar buflen;
+ u
nsigned
char *dst;
+ u
nsigned
char buflen;
int nr_write;
int nr_write;
- uchar tmp_rdptr;
- uchar wr_mirror;
+ u
nsigned
char tmp_rdptr;
+ u
nsigned
char wr_mirror;
int i;
if (card->debug_flags & LOG_POF_CARD)
int i;
if (card->debug_flags & LOG_POF_CARD)
@@
-330,7
+330,7
@@
ergo_waitpofready(struct HYSDN_CARD *card)
{
tErgDpram *dpr = card->dpram; /* pointer to DPRAM structure */
int timecnt = 10000 / 50; /* timeout is 10 secs max. */
{
tErgDpram *dpr = card->dpram; /* pointer to DPRAM structure */
int timecnt = 10000 / 50; /* timeout is 10 secs max. */
- ulong flags;
+ u
nsigned
long flags;
int msg_size;
int i;
int msg_size;
int i;
@@
-345,7
+345,7
@@
ergo_waitpofready(struct HYSDN_CARD *card)
if ((dpr->ToPcChannel != CHAN_SYSTEM) ||
(dpr->ToPcSize < MIN_RDY_MSG_SIZE) ||
(dpr->ToPcSize > MAX_RDY_MSG_SIZE) ||
if ((dpr->ToPcChannel != CHAN_SYSTEM) ||
(dpr->ToPcSize < MIN_RDY_MSG_SIZE) ||
(dpr->ToPcSize > MAX_RDY_MSG_SIZE) ||
- ((*(ulong *) dpr->ToPcBuf) != RDY_MAGIC))
+ ((*(u
nsigned
long *) dpr->ToPcBuf) != RDY_MAGIC))
break; /* an error occurred */
/* Check for additional data delivered during SysReady */
break; /* an error occurred */
/* Check for additional data delivered during SysReady */
@@
-435,7
+435,7
@@
ergo_inithardware(hysdn_card * card)
}
ergo_stopcard(card); /* disable interrupts */
}
ergo_stopcard(card); /* disable interrupts */
- if (request_irq(card->irq, ergo_interrupt,
SA_SHIRQ
, "HYSDN", card)) {
+ if (request_irq(card->irq, ergo_interrupt,
IRQF_SHARED
, "HYSDN", card)) {
ergo_releasehardware(card); /* return the acquired hardware */
return (-1);
}
ergo_releasehardware(card); /* return the acquired hardware */
return (-1);
}