Skip to content

L
linux
Commit 9ca46b71 authored by Kai Germaschewski's avatar Kai Germaschewski
Browse files
Options

ISDN/HiSax: Use u8 instead of u_char 

Just a simple search and replace, switch to the more commonly
used "u8" type.
parent 24e904bd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1128 additions and 1128 deletions
drivers/isdn/hisax/amd7930.c
View file @ 9ca46b71
...@@ -642,7 +642,7 @@ amd7930_liu_callback(struct IsdnCardState *cs) ...@@ -642,7 +642,7 @@ amd7930_liu_callback(struct IsdnCardState *cs)
void void
amd7930_l1cmd(struct IsdnCardState *cs, int msg, void *arg) amd7930_l1cmd(struct IsdnCardState *cs, int msg, void *arg)
{ {
u_char val; u8 val;
char tmp[32]; char tmp[32];
if (cs->debug & L1_DEB_ISAC) { if (cs->debug & L1_DEB_ISAC) {
......
drivers/isdn/hisax/amd7930_fn.c
View file @ 9ca46b71
...@@ -125,7 +125,7 @@ AmdIrqOn(struct IsdnCardState *cs) ...@@ -125,7 +125,7 @@ AmdIrqOn(struct IsdnCardState *cs)
} }
static void static void
Amd7930_ph_command(struct IsdnCardState *cs, u_char command, char *s) Amd7930_ph_command(struct IsdnCardState *cs, u8 command, char *s)
{ {
if (cs->debug & L1_DEB_ISAC) if (cs->debug & L1_DEB_ISAC)
debugl1(cs, "AMD7930: %s: ph_command 0x%02X", s, command); debugl1(cs, "AMD7930: %s: ph_command 0x%02X", s, command);
...@@ -167,8 +167,8 @@ Amd7930_get_state(struct IsdnCardState *cs) { ...@@ -167,8 +167,8 @@ Amd7930_get_state(struct IsdnCardState *cs) {
static void static void
Amd7930_new_ph(struct IsdnCardState *cs) Amd7930_new_ph(struct IsdnCardState *cs)
{ {
u_char index = stateHelper[cs->dc.amd7930.old_state]*8 + stateHelper[cs->dc.amd7930.ph_state]-1; u8 index = stateHelper[cs->dc.amd7930.old_state]*8 + stateHelper[cs->dc.amd7930.ph_state]-1;
u_char message = i430States[index]; u8 message = i430States[index];
if (cs->debug & L1_DEB_ISAC) if (cs->debug & L1_DEB_ISAC)
debugl1(cs, "AMD7930: new_ph %d, old_ph %d, message %d, index %d", debugl1(cs, "AMD7930: new_ph %d, old_ph %d, message %d, index %d",
......
drivers/isdn/hisax/arcofi.c
View file @ 9ca46b71
...@@ -29,7 +29,7 @@ add_arcofi_timer(struct IsdnCardState *cs) { ...@@ -29,7 +29,7 @@ add_arcofi_timer(struct IsdnCardState *cs) {
static void static void
send_arcofi(struct IsdnCardState *cs) { send_arcofi(struct IsdnCardState *cs) {
u_char val; u8 val;
add_arcofi_timer(cs); add_arcofi_timer(cs);
cs->dc.isac.mon_txp = 0; cs->dc.isac.mon_txp = 0;
......
drivers/isdn/hisax/asuscom.c
View file @ 9ca46b71
...@@ -92,26 +92,26 @@ writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int siz ...@@ -92,26 +92,26 @@ writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int siz
/* Interface functions */ /* Interface functions */
static u_char static u8
ReadISAC(struct IsdnCardState *cs, u_char offset) ReadISAC(struct IsdnCardState *cs, u8 offset)
{ {
return readreg(cs, cs->hw.asus.isac, offset); return readreg(cs, cs->hw.asus.isac, offset);
} }
static void static void
WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
writereg(cs, cs->hw.asus.isac, offset, value); writereg(cs, cs->hw.asus.isac, offset, value);
} }
static void static void
ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
readfifo(cs, cs->hw.asus.isac, 0, data, size); readfifo(cs, cs->hw.asus.isac, 0, data, size);
} }
static void static void
WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
writefifo(cs, cs->hw.asus.isac, 0, data, size); writefifo(cs, cs->hw.asus.isac, 0, data, size);
} }
...@@ -123,26 +123,26 @@ static struct dc_hw_ops isac_ops = { ...@@ -123,26 +123,26 @@ static struct dc_hw_ops isac_ops = {
.write_fifo = WriteISACfifo, .write_fifo = WriteISACfifo,
}; };
static u_char static u8
ReadISAC_IPAC(struct IsdnCardState *cs, u_char offset) ReadISAC_IPAC(struct IsdnCardState *cs, u8 offset)
{ {
return readreg(cs, cs->hw.asus.isac, offset|0x80); return readreg(cs, cs->hw.asus.isac, offset|0x80);
} }
static void static void
WriteISAC_IPAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC_IPAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
writereg(cs, cs->hw.asus.isac, offset|0x80, value); writereg(cs, cs->hw.asus.isac, offset|0x80, value);
} }
static void static void
ReadISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo_IPAC(struct IsdnCardState *cs, u8 * data, int size)
{ {
readfifo(cs, cs->hw.asus.isac, 0x80, data, size); readfifo(cs, cs->hw.asus.isac, 0x80, data, size);
} }
static void static void
WriteISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo_IPAC(struct IsdnCardState *cs, u8 * data, int size)
{ {
writefifo(cs, cs->hw.asus.isac, 0x80, data, size); writefifo(cs, cs->hw.asus.isac, 0x80, data, size);
} }
...@@ -154,14 +154,14 @@ static struct dc_hw_ops ipac_dc_ops = { ...@@ -154,14 +154,14 @@ static struct dc_hw_ops ipac_dc_ops = {
.write_fifo = WriteISACfifo_IPAC, .write_fifo = WriteISACfifo_IPAC,
}; };
static u_char static u8
ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) ReadHSCX(struct IsdnCardState *cs, int hscx, u8 offset)
{ {
return readreg(cs, cs->hw.asus.hscx, offset + (hscx ? 0x40 : 0)); return readreg(cs, cs->hw.asus.hscx, offset + (hscx ? 0x40 : 0));
} }
static void static void
WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) WriteHSCX(struct IsdnCardState *cs, int hscx, u8 offset, u8 value)
{ {
writereg(cs, cs->hw.asus.hscx, offset + (hscx ? 0x40 : 0), value); writereg(cs, cs->hw.asus.hscx, offset + (hscx ? 0x40 : 0), value);
} }
...@@ -192,7 +192,7 @@ static void ...@@ -192,7 +192,7 @@ static void
asuscom_interrupt(int intno, void *dev_id, struct pt_regs *regs) asuscom_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val; u8 val;
spin_lock(&cs->lock); spin_lock(&cs->lock);
val = readreg(cs, cs->hw.asus.hscx, HSCX_ISTA + 0x40); val = readreg(cs, cs->hw.asus.hscx, HSCX_ISTA + 0x40);
...@@ -228,7 +228,7 @@ static void ...@@ -228,7 +228,7 @@ static void
asuscom_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs) asuscom_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char ista, val, icnt = 5; u8 ista, val, icnt = 5;
if (!cs) { if (!cs) {
printk(KERN_WARNING "ISDNLink: Spurious interrupt!\n"); printk(KERN_WARNING "ISDNLink: Spurious interrupt!\n");
...@@ -349,7 +349,7 @@ setup_asuscom(struct IsdnCard *card) ...@@ -349,7 +349,7 @@ setup_asuscom(struct IsdnCard *card)
{ {
int bytecnt; int bytecnt;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
u_char val; u8 val;
char tmp[64]; char tmp[64];
strcpy(tmp, Asuscom_revision); strcpy(tmp, Asuscom_revision);
......
drivers/isdn/hisax/avm_a1.c
View file @ 9ca46b71
...@@ -26,53 +26,53 @@ static const char *avm_revision = "$Revision: 2.13.6.2 $"; ...@@ -26,53 +26,53 @@ static const char *avm_revision = "$Revision: 2.13.6.2 $";
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr) #define bytein(addr) inb(addr)
static inline u_char static inline u8
readreg(unsigned int adr, u_char off) readreg(unsigned int adr, u8 off)
{ {
return (bytein(adr + off)); return (bytein(adr + off));
} }
static inline void static inline void
writereg(unsigned int adr, u_char off, u_char data) writereg(unsigned int adr, u8 off, u8 data)
{ {
byteout(adr + off, data); byteout(adr + off, data);
} }
static inline void static inline void
read_fifo(unsigned int adr, u_char * data, int size) read_fifo(unsigned int adr, u8 * data, int size)
{ {
insb(adr, data, size); insb(adr, data, size);
} }
static void static void
write_fifo(unsigned int adr, u_char * data, int size) write_fifo(unsigned int adr, u8 * data, int size)
{ {
outsb(adr, data, size); outsb(adr, data, size);
} }
/* Interface functions */ /* Interface functions */
static u_char static u8
ReadISAC(struct IsdnCardState *cs, u_char offset) ReadISAC(struct IsdnCardState *cs, u8 offset)
{ {
return (readreg(cs->hw.avm.isac, offset)); return (readreg(cs->hw.avm.isac, offset));
} }
static void static void
WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
writereg(cs->hw.avm.isac, offset, value); writereg(cs->hw.avm.isac, offset, value);
} }
static void static void
ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
read_fifo(cs->hw.avm.isacfifo, data, size); read_fifo(cs->hw.avm.isacfifo, data, size);
} }
static void static void
WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
write_fifo(cs->hw.avm.isacfifo, data, size); write_fifo(cs->hw.avm.isacfifo, data, size);
} }
...@@ -84,14 +84,14 @@ static struct dc_hw_ops isac_ops = { ...@@ -84,14 +84,14 @@ static struct dc_hw_ops isac_ops = {
.write_fifo = WriteISACfifo, .write_fifo = WriteISACfifo,
}; };
static u_char static u8
ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) ReadHSCX(struct IsdnCardState *cs, int hscx, u8 offset)
{ {
return (readreg(cs->hw.avm.hscx[hscx], offset)); return (readreg(cs->hw.avm.hscx[hscx], offset));
} }
static void static void
WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) WriteHSCX(struct IsdnCardState *cs, int hscx, u8 offset, u8 value)
{ {
writereg(cs->hw.avm.hscx[hscx], offset, value); writereg(cs->hw.avm.hscx[hscx], offset, value);
} }
...@@ -116,7 +116,7 @@ static void ...@@ -116,7 +116,7 @@ static void
avm_a1_interrupt(int intno, void *dev_id, struct pt_regs *regs) avm_a1_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val, sval; u8 val, sval;
spin_lock(&cs->lock); spin_lock(&cs->lock);
while (((sval = bytein(cs->hw.avm.cfg_reg)) & 0xf) != 0x7) { while (((sval = bytein(cs->hw.avm.cfg_reg)) & 0xf) != 0x7) {
...@@ -186,7 +186,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg) ...@@ -186,7 +186,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
int __init int __init
setup_avm_a1(struct IsdnCard *card) setup_avm_a1(struct IsdnCard *card)
{ {
u_char val; u8 val;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];
......
drivers/isdn/hisax/avm_a1p.c
View file @ 9ca46b71
...@@ -106,26 +106,26 @@ writefifo(struct IsdnCardState *cs, int offset, u8 *data, int size) ...@@ -106,26 +106,26 @@ writefifo(struct IsdnCardState *cs, int offset, u8 *data, int size)
spin_unlock_irqrestore(&avm_a1p_lock, flags); spin_unlock_irqrestore(&avm_a1p_lock, flags);
} }
static inline u_char static inline u8
ReadISAC(struct IsdnCardState *cs, u_char adr) ReadISAC(struct IsdnCardState *cs, u8 adr)
{ {
return readreg(cs, ISAC_REG_OFFSET, adr); return readreg(cs, ISAC_REG_OFFSET, adr);
} }
static inline void static inline void
WriteISAC(struct IsdnCardState *cs, u_char adr, u_char value) WriteISAC(struct IsdnCardState *cs, u8 adr, u8 value)
{ {
writereg(cs, ISAC_REG_OFFSET, adr, value); writereg(cs, ISAC_REG_OFFSET, adr, value);
} }
static inline void static inline void
ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
readfifo(cs, ISAC_FIFO_OFFSET, data, size); readfifo(cs, ISAC_FIFO_OFFSET, data, size);
} }
static inline void static inline void
WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
writefifo(cs, ISAC_FIFO_OFFSET, data, size); writefifo(cs, ISAC_FIFO_OFFSET, data, size);
} }
...@@ -137,26 +137,26 @@ static struct dc_hw_ops isac_ops = { ...@@ -137,26 +137,26 @@ static struct dc_hw_ops isac_ops = {
.write_fifo = WriteISACfifo, .write_fifo = WriteISACfifo,
}; };
static inline u_char static inline u8
ReadHSCX(struct IsdnCardState *cs, int hscx, u_char adr) ReadHSCX(struct IsdnCardState *cs, int hscx, u8 adr)
{ {
return readreg(cs, HSCX_REG_OFFSET + hscx*HSCX_CH_DIFF, adr); return readreg(cs, HSCX_REG_OFFSET + hscx*HSCX_CH_DIFF, adr);
} }
static inline void static inline void
WriteHSCX(struct IsdnCardState *cs, int hscx, u_char adr, u_char value) WriteHSCX(struct IsdnCardState *cs, int hscx, u8 adr, u8 value)
{ {
writereg(cs, HSCX_REG_OFFSET + hscx*HSCX_CH_DIFF, adr, value); writereg(cs, HSCX_REG_OFFSET + hscx*HSCX_CH_DIFF, adr, value);
} }
static inline void static inline void
ReadHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size) ReadHSCXfifo(struct IsdnCardState *cs, int hscx, u8 * data, int size)
{ {
return readfifo(cs, HSCX_FIFO_OFFSET + hscx*HSCX_CH_DIFF, data, size); return readfifo(cs, HSCX_FIFO_OFFSET + hscx*HSCX_CH_DIFF, data, size);
} }
static inline void static inline void
WriteHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size) WriteHSCXfifo(struct IsdnCardState *cs, int hscx, u8 * data, int size)
{ {
writefifo(cs, HSCX_FIFO_OFFSET + hscx*HSCX_CH_DIFF, data, size); writefifo(cs, HSCX_FIFO_OFFSET + hscx*HSCX_CH_DIFF, data, size);
} }
...@@ -181,7 +181,7 @@ static void ...@@ -181,7 +181,7 @@ static void
avm_a1p_interrupt(int intno, void *dev_id, struct pt_regs *regs) avm_a1p_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val, sval; u8 val, sval;
spin_lock(&cs->lock); spin_lock(&cs->lock);
while ((sval = (~bytein(cs->hw.avm.cfg_reg+ASL0_OFFSET) & ASL0_R_IRQPENDING))) { while ((sval = (~bytein(cs->hw.avm.cfg_reg+ASL0_OFFSET) & ASL0_R_IRQPENDING))) {
...@@ -243,7 +243,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg) ...@@ -243,7 +243,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
int __devinit int __devinit
setup_avm_a1_pcmcia(struct IsdnCard *card) setup_avm_a1_pcmcia(struct IsdnCard *card)
{ {
u_char model, vers; u8 model, vers;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];
......
drivers/isdn/hisax/avm_pci.c
View file @ 9ca46b71
...@@ -76,11 +76,11 @@ static spinlock_t avm_pci_lock = SPIN_LOCK_UNLOCKED; ...@@ -76,11 +76,11 @@ static spinlock_t avm_pci_lock = SPIN_LOCK_UNLOCKED;
/* Interface functions */ /* Interface functions */
static u_char static u8
ReadISAC(struct IsdnCardState *cs, u_char offset) ReadISAC(struct IsdnCardState *cs, u8 offset)
{ {
register u_char idx = (offset > 0x2f) ? AVM_ISAC_REG_HIGH : AVM_ISAC_REG_LOW; register u8 idx = (offset > 0x2f) ? AVM_ISAC_REG_HIGH : AVM_ISAC_REG_LOW;
register u_char val; register u8 val;
register unsigned long flags; register unsigned long flags;
spin_lock_irqsave(&avm_pci_lock, flags); spin_lock_irqsave(&avm_pci_lock, flags);
...@@ -91,9 +91,9 @@ ReadISAC(struct IsdnCardState *cs, u_char offset) ...@@ -91,9 +91,9 @@ ReadISAC(struct IsdnCardState *cs, u_char offset)
} }
static void static void
WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
register u_char idx = (offset > 0x2f) ? AVM_ISAC_REG_HIGH : AVM_ISAC_REG_LOW; register u8 idx = (offset > 0x2f) ? AVM_ISAC_REG_HIGH : AVM_ISAC_REG_LOW;
register unsigned long flags; register unsigned long flags;
spin_lock_irqsave(&avm_pci_lock, flags); spin_lock_irqsave(&avm_pci_lock, flags);
...@@ -103,14 +103,14 @@ WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) ...@@ -103,14 +103,14 @@ WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value)
} }
static void static void
ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
outb(AVM_ISAC_FIFO, cs->hw.avm.cfg_reg + 4); outb(AVM_ISAC_FIFO, cs->hw.avm.cfg_reg + 4);
insb(cs->hw.avm.isac, data, size); insb(cs->hw.avm.isac, data, size);
} }
static void static void
WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
outb(AVM_ISAC_FIFO, cs->hw.avm.cfg_reg + 4); outb(AVM_ISAC_FIFO, cs->hw.avm.cfg_reg + 4);
outsb(cs->hw.avm.isac, data, size); outsb(cs->hw.avm.isac, data, size);
...@@ -124,7 +124,7 @@ static struct dc_hw_ops isac_ops = { ...@@ -124,7 +124,7 @@ static struct dc_hw_ops isac_ops = {
}; };
static inline u_int static inline u_int
ReadHDLCPCI(struct IsdnCardState *cs, int chan, u_char offset) ReadHDLCPCI(struct IsdnCardState *cs, int chan, u8 offset)
{ {
register u_int idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; register u_int idx = chan ? AVM_HDLC_2 : AVM_HDLC_1;
register u_int val; register u_int val;
...@@ -138,7 +138,7 @@ ReadHDLCPCI(struct IsdnCardState *cs, int chan, u_char offset) ...@@ -138,7 +138,7 @@ ReadHDLCPCI(struct IsdnCardState *cs, int chan, u_char offset)
} }
static inline void static inline void
WriteHDLCPCI(struct IsdnCardState *cs, int chan, u_char offset, u_int value) WriteHDLCPCI(struct IsdnCardState *cs, int chan, u8 offset, u_int value)
{ {
register u_int idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; register u_int idx = chan ? AVM_HDLC_2 : AVM_HDLC_1;
register unsigned long flags; register unsigned long flags;
...@@ -149,11 +149,11 @@ WriteHDLCPCI(struct IsdnCardState *cs, int chan, u_char offset, u_int value) ...@@ -149,11 +149,11 @@ WriteHDLCPCI(struct IsdnCardState *cs, int chan, u_char offset, u_int value)
spin_unlock_irqrestore(&avm_pci_lock, flags); spin_unlock_irqrestore(&avm_pci_lock, flags);
} }
static inline u_char static inline u8
ReadHDLCPnP(struct IsdnCardState *cs, int chan, u_char offset) ReadHDLCPnP(struct IsdnCardState *cs, int chan, u8 offset)
{ {
register u_char idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; register u8 idx = chan ? AVM_HDLC_2 : AVM_HDLC_1;
register u_char val; register u8 val;
register unsigned long flags; register unsigned long flags;
spin_lock_irqsave(&avm_pci_lock, flags); spin_lock_irqsave(&avm_pci_lock, flags);
...@@ -164,9 +164,9 @@ ReadHDLCPnP(struct IsdnCardState *cs, int chan, u_char offset) ...@@ -164,9 +164,9 @@ ReadHDLCPnP(struct IsdnCardState *cs, int chan, u_char offset)
} }
static inline void static inline void
WriteHDLCPnP(struct IsdnCardState *cs, int chan, u_char offset, u_char value) WriteHDLCPnP(struct IsdnCardState *cs, int chan, u8 offset, u8 value)
{ {
register u_char idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; register u8 idx = chan ? AVM_HDLC_2 : AVM_HDLC_1;
register unsigned long flags; register unsigned long flags;
spin_lock_irqsave(&avm_pci_lock, flags); spin_lock_irqsave(&avm_pci_lock, flags);
...@@ -260,8 +260,8 @@ static inline void ...@@ -260,8 +260,8 @@ static inline void
hdlc_empty_fifo(struct BCState *bcs, int count) hdlc_empty_fifo(struct BCState *bcs, int count)
{ {
register u_int *ptr; register u_int *ptr;
u_char *p; u8 *p;
u_char idx = bcs->channel ? AVM_HDLC_2 : AVM_HDLC_1; u8 idx = bcs->channel ? AVM_HDLC_2 : AVM_HDLC_1;
int cnt=0; int cnt=0;
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
...@@ -299,7 +299,7 @@ hdlc_empty_fifo(struct BCState *bcs, int count) ...@@ -299,7 +299,7 @@ hdlc_empty_fifo(struct BCState *bcs, int count)
char *t = bcs->blog; char *t = bcs->blog;
if (cs->subtyp == AVM_FRITZ_PNP) if (cs->subtyp == AVM_FRITZ_PNP)
p = (u_char *) ptr; p = (u8 *) ptr;
t += sprintf(t, "hdlc_empty_fifo %c cnt %d", t += sprintf(t, "hdlc_empty_fifo %c cnt %d",
bcs->channel ? 'B' : 'A', count); bcs->channel ? 'B' : 'A', count);
QuickHex(t, p, count); QuickHex(t, p, count);
...@@ -590,8 +590,8 @@ static void ...@@ -590,8 +590,8 @@ static void
avm_pcipnp_interrupt(int intno, void *dev_id, struct pt_regs *regs) avm_pcipnp_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val; u8 val;
u_char sval; u8 sval;
if (!cs) { if (!cs) {
printk(KERN_WARNING "AVM PCI: Spurious interrupt!\n"); printk(KERN_WARNING "AVM PCI: Spurious interrupt!\n");
......
drivers/isdn/hisax/avma1_cs.c
View file @ 9ca46b71
...@@ -298,7 +298,7 @@ static void avma1cs_config(dev_link_t *link) ...@@ -298,7 +298,7 @@ static void avma1cs_config(dev_link_t *link)
cistpl_cftable_entry_t *cf = &parse.cftable_entry; cistpl_cftable_entry_t *cf = &parse.cftable_entry;
local_info_t *dev; local_info_t *dev;
int i; int i;
u_char buf[64]; u8 buf[64];
char devname[128]; char devname[128];
int busy = 0; int busy = 0;
......
drivers/isdn/hisax/bkm_a4t.c
View file @ 9ca46b71
...@@ -26,8 +26,8 @@ static spinlock_t bkm_a4t_lock = SPIN_LOCK_UNLOCKED; ...@@ -26,8 +26,8 @@ static spinlock_t bkm_a4t_lock = SPIN_LOCK_UNLOCKED;
const char *bkm_a4t_revision = "$Revision: 1.13.6.6 $"; const char *bkm_a4t_revision = "$Revision: 1.13.6.6 $";
static inline u_char static inline u8
readreg(unsigned int ale, unsigned long adr, u_char off) readreg(unsigned int ale, unsigned long adr, u8 off)
{ {
register u_int ret; register u_int ret;
unsigned long flags; unsigned long flags;
...@@ -44,7 +44,7 @@ readreg(unsigned int ale, unsigned long adr, u_char off) ...@@ -44,7 +44,7 @@ readreg(unsigned int ale, unsigned long adr, u_char off)
static inline void static inline void
readfifo(unsigned int ale, unsigned long adr, u_char off, u_char * data, int size) readfifo(unsigned int ale, unsigned long adr, u8 off, u8 * data, int size)
{ {
/* fifo read without cli because it's allready done */ /* fifo read without cli because it's allready done */
int i; int i;
...@@ -54,7 +54,7 @@ readfifo(unsigned int ale, unsigned long adr, u_char off, u_char * data, int siz ...@@ -54,7 +54,7 @@ readfifo(unsigned int ale, unsigned long adr, u_char off, u_char * data, int siz
static inline void static inline void
writereg(unsigned int ale, unsigned long adr, u_char off, u_char data) writereg(unsigned int ale, unsigned long adr, u8 off, u8 data)
{ {
unsigned long flags; unsigned long flags;
unsigned int *po = (unsigned int *) adr; /* Postoffice */ unsigned int *po = (unsigned int *) adr; /* Postoffice */
...@@ -68,7 +68,7 @@ writereg(unsigned int ale, unsigned long adr, u_char off, u_char data) ...@@ -68,7 +68,7 @@ writereg(unsigned int ale, unsigned long adr, u_char off, u_char data)
static inline void static inline void
writefifo(unsigned int ale, unsigned long adr, u_char off, u_char * data, int size) writefifo(unsigned int ale, unsigned long adr, u8 off, u8 * data, int size)
{ {
/* fifo write without cli because it's allready done */ /* fifo write without cli because it's allready done */
int i; int i;
...@@ -80,26 +80,26 @@ writefifo(unsigned int ale, unsigned long adr, u_char off, u_char * data, int si ...@@ -80,26 +80,26 @@ writefifo(unsigned int ale, unsigned long adr, u_char off, u_char * data, int si
/* Interface functions */ /* Interface functions */
static u_char static u8
ReadISAC(struct IsdnCardState *cs, u_char offset) ReadISAC(struct IsdnCardState *cs, u8 offset)
{ {
return (readreg(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, offset)); return (readreg(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, offset));
} }
static void static void
WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
writereg(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, offset, value); writereg(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, offset, value);
} }
static void static void
ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
readfifo(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, 0, data, size); readfifo(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, 0, data, size);
} }
static void static void
WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
writefifo(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, 0, data, size); writefifo(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, 0, data, size);
} }
...@@ -111,14 +111,14 @@ static struct dc_hw_ops isac_ops = { ...@@ -111,14 +111,14 @@ static struct dc_hw_ops isac_ops = {
.write_fifo = WriteISACfifo, .write_fifo = WriteISACfifo,
}; };
static u_char static u8
ReadJADE(struct IsdnCardState *cs, int jade, u_char offset) ReadJADE(struct IsdnCardState *cs, int jade, u8 offset)
{ {
return (readreg(cs->hw.ax.jade_ale, cs->hw.ax.jade_adr, offset + (jade == -1 ? 0 : (jade ? 0xC0 : 0x80)))); return (readreg(cs->hw.ax.jade_ale, cs->hw.ax.jade_adr, offset + (jade == -1 ? 0 : (jade ? 0xC0 : 0x80))));
} }
static void static void
WriteJADE(struct IsdnCardState *cs, int jade, u_char offset, u_char value) WriteJADE(struct IsdnCardState *cs, int jade, u8 offset, u8 value)
{ {
writereg(cs->hw.ax.jade_ale, cs->hw.ax.jade_adr, offset + (jade == -1 ? 0 : (jade ? 0xC0 : 0x80)), value); writereg(cs->hw.ax.jade_ale, cs->hw.ax.jade_adr, offset + (jade == -1 ? 0 : (jade ? 0xC0 : 0x80)), value);
} }
...@@ -148,7 +148,7 @@ static void ...@@ -148,7 +148,7 @@ static void
bkm_interrupt(int intno, void *dev_id, struct pt_regs *regs) bkm_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val = 0; u8 val = 0;
I20_REGISTER_FILE *pI20_Regs; I20_REGISTER_FILE *pI20_Regs;
spin_lock(&cs->lock); spin_lock(&cs->lock);
......
drivers/isdn/hisax/bkm_a8.c
View file @ 9ca46b71
...@@ -92,26 +92,26 @@ writefifo(struct IsdnCardState *cs, u8 off, u8 *data, int size) ...@@ -92,26 +92,26 @@ writefifo(struct IsdnCardState *cs, u8 off, u8 *data, int size)
/* Interface functions */ /* Interface functions */
static u_char static u8
ReadISAC(struct IsdnCardState *cs, u_char offset) ReadISAC(struct IsdnCardState *cs, u8 offset)
{ {
return readreg(cs, offset | 0x80); return readreg(cs, offset | 0x80);
} }
static void static void
WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
writereg(cs, offset | 0x80, value); writereg(cs, offset | 0x80, value);
} }
static void static void
ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
readfifo(cs, 0x80, data, size); readfifo(cs, 0x80, data, size);
} }
static void static void
WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
writefifo(cs, 0x80, data, size); writefifo(cs, 0x80, data, size);
} }
...@@ -123,14 +123,14 @@ static struct dc_hw_ops isac_ops = { ...@@ -123,14 +123,14 @@ static struct dc_hw_ops isac_ops = {
.write_fifo = WriteISACfifo, .write_fifo = WriteISACfifo,
}; };
static u_char static u8
ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) ReadHSCX(struct IsdnCardState *cs, int hscx, u8 offset)
{ {
return readreg(cs, offset + (hscx ? 0x40 : 0)); return readreg(cs, offset + (hscx ? 0x40 : 0));
} }
static void static void
WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) WriteHSCX(struct IsdnCardState *cs, int hscx, u8 offset, u8 value)
{ {
writereg(cs, offset + (hscx ? 0x40 : 0), value); writereg(cs, offset + (hscx ? 0x40 : 0), value);
} }
...@@ -167,7 +167,7 @@ static void ...@@ -167,7 +167,7 @@ static void
bkm_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs) bkm_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char ista, val, icnt = 5; u8 ista, val, icnt = 5;
spin_lock(&cs->lock); spin_lock(&cs->lock);
ista = readreg(cs, IPAC_ISTA); ista = readreg(cs, IPAC_ISTA);
...@@ -293,7 +293,7 @@ sct_alloc_io(u_int adr, u_int len) ...@@ -293,7 +293,7 @@ sct_alloc_io(u_int adr, u_int len)
static struct pci_dev *dev_a8 __initdata = NULL; static struct pci_dev *dev_a8 __initdata = NULL;
static u16 sub_vendor_id __initdata = 0; static u16 sub_vendor_id __initdata = 0;
static u16 sub_sys_id __initdata = 0; static u16 sub_sys_id __initdata = 0;
static u_char pci_irq __initdata = 0; static u8 pci_irq __initdata = 0;
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
...@@ -303,7 +303,7 @@ setup_sct_quadro(struct IsdnCard *card) ...@@ -303,7 +303,7 @@ setup_sct_quadro(struct IsdnCard *card)
#if CONFIG_PCI #if CONFIG_PCI
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];
u_char pci_rev_id; u8 pci_rev_id;
u_int found = 0; u_int found = 0;
u_int pci_ioaddr1, pci_ioaddr2, pci_ioaddr3, pci_ioaddr4, pci_ioaddr5; u_int pci_ioaddr1, pci_ioaddr2, pci_ioaddr3, pci_ioaddr4, pci_ioaddr5;
......
drivers/isdn/hisax/callc.c
View file @ 9ca46b71
...@@ -1424,7 +1424,7 @@ capi_debug(struct Channel *chanp, capi_msg *cm) ...@@ -1424,7 +1424,7 @@ capi_debug(struct Channel *chanp, capi_msg *cm)
{ {
char *t = tmpbuf; char *t = tmpbuf;
t += QuickHex(t, (u_char *)cm, (cm->Length>50)? 50: cm->Length); t += QuickHex(t, (u8 *)cm, (cm->Length>50)? 50: cm->Length);
t--; t--;
*t= 0; *t= 0;
HiSax_putstatus(chanp->cs, "Ch", "%d CAPIMSG %s", chanp->chan, tmpbuf); HiSax_putstatus(chanp->cs, "Ch", "%d CAPIMSG %s", chanp->chan, tmpbuf);
......
drivers/isdn/hisax/config.c
View file @ 9ca46b71
...@@ -634,10 +634,10 @@ struct IsdnCardState *hisax_get_card(int cardnr) ...@@ -634,10 +634,10 @@ struct IsdnCardState *hisax_get_card(int cardnr)
return NULL; return NULL;
} }
int HiSax_readstatus(u_char * buf, int len, int user, int id, int channel) int HiSax_readstatus(u8 * buf, int len, int user, int id, int channel)
{ {
int count, cnt; int count, cnt;
u_char *p = buf; u8 *p = buf;
struct IsdnCardState *cs = hisax_findcard(id); struct IsdnCardState *cs = hisax_findcard(id);
if (cs) { if (cs) {
...@@ -702,7 +702,7 @@ int jiftime(char *s, long mark) ...@@ -702,7 +702,7 @@ int jiftime(char *s, long mark)
return 8; return 8;
} }
static u_char tmpbuf[HISAX_STATUS_BUFSIZE]; static u8 tmpbuf[HISAX_STATUS_BUFSIZE];
void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt,
va_list args) va_list args)
...@@ -711,7 +711,7 @@ void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, ...@@ -711,7 +711,7 @@ void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt,
unsigned long flags; unsigned long flags;
int count, i; int count, i;
u_char *p; u8 *p;
isdn_ctrl ic; isdn_ctrl ic;
int len; int len;
...@@ -1711,7 +1711,7 @@ int avm_a1_init_pcmcia(void *pcm_iob, int pcm_irq, int *busy_flag, int prot) ...@@ -1711,7 +1711,7 @@ int avm_a1_init_pcmcia(void *pcm_iob, int pcm_irq, int *busy_flag, int prot)
int __devinit hisax_init_pcmcia(void *pcm_iob, int *busy_flag, int __devinit hisax_init_pcmcia(void *pcm_iob, int *busy_flag,
struct IsdnCard *card) struct IsdnCard *card)
{ {
u_char ids[16]; u8 ids[16];
int ret = -1; int ret = -1;
cards[nrcards] = *card; cards[nrcards] = *card;
...@@ -2018,7 +2018,7 @@ static void hisax_bc_close(struct BCState *bcs) ...@@ -2018,7 +2018,7 @@ static void hisax_bc_close(struct BCState *bcs)
static void EChannel_proc_rcv(struct hisax_d_if *d_if) static void EChannel_proc_rcv(struct hisax_d_if *d_if)
{ {
struct IsdnCardState *cs = d_if->cs; struct IsdnCardState *cs = d_if->cs;
u_char *ptr; u8 *ptr;
struct sk_buff *skb; struct sk_buff *skb;
while ((skb = skb_dequeue(&d_if->erq)) != NULL) { while ((skb = skb_dequeue(&d_if->erq)) != NULL) {
......
drivers/isdn/hisax/diva.c
View file @ 9ca46b71
...@@ -82,10 +82,10 @@ static spinlock_t diva_lock = SPIN_LOCK_UNLOCKED; ...@@ -82,10 +82,10 @@ static spinlock_t diva_lock = SPIN_LOCK_UNLOCKED;
#endif #endif
#define PITA_INT0_STATUS 0x02 #define PITA_INT0_STATUS 0x02
static inline u_char static inline u8
readreg(unsigned int ale, unsigned int adr, u_char off) readreg(unsigned int ale, unsigned int adr, u8 off)
{ {
register u_char ret; register u8 ret;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&diva_lock, flags); spin_lock_irqsave(&diva_lock, flags);
...@@ -96,7 +96,7 @@ readreg(unsigned int ale, unsigned int adr, u_char off) ...@@ -96,7 +96,7 @@ readreg(unsigned int ale, unsigned int adr, u_char off)
} }
static inline void static inline void
readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) readfifo(unsigned int ale, unsigned int adr, u8 off, u8 * data, int size)
{ {
/* fifo read without cli because it's allready done */ /* fifo read without cli because it's allready done */
...@@ -106,7 +106,7 @@ readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size ...@@ -106,7 +106,7 @@ readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size
static inline void static inline void
writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) writereg(unsigned int ale, unsigned int adr, u8 off, u8 data)
{ {
unsigned long flags; unsigned long flags;
...@@ -117,24 +117,24 @@ writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) ...@@ -117,24 +117,24 @@ writereg(unsigned int ale, unsigned int adr, u_char off, u_char data)
} }
static inline void static inline void
writefifo(unsigned int ale, unsigned int adr, u_char off, u_char *data, int size) writefifo(unsigned int ale, unsigned int adr, u8 off, u8 *data, int size)
{ {
/* fifo write without cli because it's allready done */ /* fifo write without cli because it's allready done */
byteout(ale, off); byteout(ale, off);
outsb(adr, data, size); outsb(adr, data, size);
} }
static inline u_char static inline u8
memreadreg(unsigned long adr, u_char off) memreadreg(unsigned long adr, u8 off)
{ {
return(*((unsigned char *) return(*((unsigned char *)
(((unsigned int *)adr) + off))); (((unsigned int *)adr) + off)));
} }
static inline void static inline void
memwritereg(unsigned long adr, u_char off, u_char data) memwritereg(unsigned long adr, u8 off, u8 data)
{ {
register u_char *p; register u8 *p;
p = (unsigned char *)(((unsigned int *)adr) + off); p = (unsigned char *)(((unsigned int *)adr) + off);
*p = data; *p = data;
...@@ -142,26 +142,26 @@ memwritereg(unsigned long adr, u_char off, u_char data) ...@@ -142,26 +142,26 @@ memwritereg(unsigned long adr, u_char off, u_char data)
/* Interface functions */ /* Interface functions */
static u_char static u8
ReadISAC(struct IsdnCardState *cs, u_char offset) ReadISAC(struct IsdnCardState *cs, u8 offset)
{ {
return(readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset)); return(readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset));
} }
static void static void
WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset, value); writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset, value);
} }
static void static void
ReadISACfifo(struct IsdnCardState *cs, u_char *data, int size) ReadISACfifo(struct IsdnCardState *cs, u8 *data, int size)
{ {
readfifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0, data, size); readfifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0, data, size);
} }
static void static void
WriteISACfifo(struct IsdnCardState *cs, u_char *data, int size) WriteISACfifo(struct IsdnCardState *cs, u8 *data, int size)
{ {
writefifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0, data, size); writefifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0, data, size);
} }
...@@ -173,26 +173,26 @@ static struct dc_hw_ops isac_ops = { ...@@ -173,26 +173,26 @@ static struct dc_hw_ops isac_ops = {
.write_fifo = WriteISACfifo, .write_fifo = WriteISACfifo,
}; };
static u_char static u8
ReadISAC_IPAC(struct IsdnCardState *cs, u_char offset) ReadISAC_IPAC(struct IsdnCardState *cs, u8 offset)
{ {
return (readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset+0x80)); return (readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset+0x80));
} }
static void static void
WriteISAC_IPAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC_IPAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset|0x80, value); writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset|0x80, value);
} }
static void static void
ReadISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo_IPAC(struct IsdnCardState *cs, u8 * data, int size)
{ {
readfifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0x80, data, size); readfifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0x80, data, size);
} }
static void static void
WriteISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo_IPAC(struct IsdnCardState *cs, u8 * data, int size)
{ {
writefifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0x80, data, size); writefifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0x80, data, size);
} }
...@@ -204,15 +204,15 @@ static struct dc_hw_ops ipac_dc_ops = { ...@@ -204,15 +204,15 @@ static struct dc_hw_ops ipac_dc_ops = {
.write_fifo = WriteISACfifo_IPAC, .write_fifo = WriteISACfifo_IPAC,
}; };
static u_char static u8
ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) ReadHSCX(struct IsdnCardState *cs, int hscx, u8 offset)
{ {
return(readreg(cs->hw.diva.hscx_adr, return(readreg(cs->hw.diva.hscx_adr,
cs->hw.diva.hscx, offset + (hscx ? 0x40 : 0))); cs->hw.diva.hscx, offset + (hscx ? 0x40 : 0)));
} }
static void static void
WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) WriteHSCX(struct IsdnCardState *cs, int hscx, u8 offset, u8 value)
{ {
writereg(cs->hw.diva.hscx_adr, writereg(cs->hw.diva.hscx_adr,
cs->hw.diva.hscx, offset + (hscx ? 0x40 : 0), value); cs->hw.diva.hscx, offset + (hscx ? 0x40 : 0), value);
...@@ -223,27 +223,27 @@ static struct bc_hw_ops hscx_ops = { ...@@ -223,27 +223,27 @@ static struct bc_hw_ops hscx_ops = {
.write_reg = WriteHSCX, .write_reg = WriteHSCX,
}; };
static u_char static u8
MemReadISAC_IPAC(struct IsdnCardState *cs, u_char offset) MemReadISAC_IPAC(struct IsdnCardState *cs, u8 offset)
{ {
return (memreadreg(cs->hw.diva.cfg_reg, offset+0x80)); return (memreadreg(cs->hw.diva.cfg_reg, offset+0x80));
} }
static void static void
MemWriteISAC_IPAC(struct IsdnCardState *cs, u_char offset, u_char value) MemWriteISAC_IPAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
memwritereg(cs->hw.diva.cfg_reg, offset|0x80, value); memwritereg(cs->hw.diva.cfg_reg, offset|0x80, value);
} }
static void static void
MemReadISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) MemReadISACfifo_IPAC(struct IsdnCardState *cs, u8 * data, int size)
{ {
while(size--) while(size--)
*data++ = memreadreg(cs->hw.diva.cfg_reg, 0x80); *data++ = memreadreg(cs->hw.diva.cfg_reg, 0x80);
} }
static void static void
MemWriteISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) MemWriteISACfifo_IPAC(struct IsdnCardState *cs, u8 * data, int size)
{ {
while(size--) while(size--)
memwritereg(cs->hw.diva.cfg_reg, 0x80, *data++); memwritereg(cs->hw.diva.cfg_reg, 0x80, *data++);
...@@ -256,14 +256,14 @@ static struct dc_hw_ops mem_ipac_dc_ops = { ...@@ -256,14 +256,14 @@ static struct dc_hw_ops mem_ipac_dc_ops = {
.write_fifo = MemWriteISACfifo_IPAC, .write_fifo = MemWriteISACfifo_IPAC,
}; };
static u_char static u8
MemReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) MemReadHSCX(struct IsdnCardState *cs, int hscx, u8 offset)
{ {
return(memreadreg(cs->hw.diva.cfg_reg, offset + (hscx ? 0x40 : 0))); return(memreadreg(cs->hw.diva.cfg_reg, offset + (hscx ? 0x40 : 0)));
} }
static void static void
MemWriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) MemWriteHSCX(struct IsdnCardState *cs, int hscx, u8 offset, u8 value)
{ {
memwritereg(cs->hw.diva.cfg_reg, offset + (hscx ? 0x40 : 0), value); memwritereg(cs->hw.diva.cfg_reg, offset + (hscx ? 0x40 : 0), value);
} }
...@@ -274,27 +274,27 @@ static struct bc_hw_ops mem_hscx_ops = { ...@@ -274,27 +274,27 @@ static struct bc_hw_ops mem_hscx_ops = {
}; };
/* IO-Functions for IPACX type cards */ /* IO-Functions for IPACX type cards */
static u_char static u8
MemReadISAC_IPACX(struct IsdnCardState *cs, u_char offset) MemReadISAC_IPACX(struct IsdnCardState *cs, u8 offset)
{ {
return (memreadreg(cs->hw.diva.cfg_reg, offset)); return (memreadreg(cs->hw.diva.cfg_reg, offset));
} }
static void static void
MemWriteISAC_IPACX(struct IsdnCardState *cs, u_char offset, u_char value) MemWriteISAC_IPACX(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
memwritereg(cs->hw.diva.cfg_reg, offset, value); memwritereg(cs->hw.diva.cfg_reg, offset, value);
} }
static void static void
MemReadISACfifo_IPACX(struct IsdnCardState *cs, u_char * data, int size) MemReadISACfifo_IPACX(struct IsdnCardState *cs, u8 * data, int size)
{ {
while(size--) while(size--)
*data++ = memreadreg(cs->hw.diva.cfg_reg, 0); *data++ = memreadreg(cs->hw.diva.cfg_reg, 0);
} }
static void static void
MemWriteISACfifo_IPACX(struct IsdnCardState *cs, u_char * data, int size) MemWriteISACfifo_IPACX(struct IsdnCardState *cs, u8 * data, int size)
{ {
while(size--) while(size--)
memwritereg(cs->hw.diva.cfg_reg, 0, *data++); memwritereg(cs->hw.diva.cfg_reg, 0, *data++);
...@@ -307,15 +307,15 @@ static struct dc_hw_ops mem_ipacx_dc_ops = { ...@@ -307,15 +307,15 @@ static struct dc_hw_ops mem_ipacx_dc_ops = {
.write_fifo = MemWriteISACfifo_IPACX, .write_fifo = MemWriteISACfifo_IPACX,
}; };
static u_char static u8
MemReadHSCX_IPACX(struct IsdnCardState *cs, int hscx, u_char offset) MemReadHSCX_IPACX(struct IsdnCardState *cs, int hscx, u8 offset)
{ {
return(memreadreg(cs->hw.diva.cfg_reg, offset + return(memreadreg(cs->hw.diva.cfg_reg, offset +
(hscx ? IPACX_OFF_B2 : IPACX_OFF_B1))); (hscx ? IPACX_OFF_B2 : IPACX_OFF_B1)));
} }
static void static void
MemWriteHSCX_IPACX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) MemWriteHSCX_IPACX(struct IsdnCardState *cs, int hscx, u8 offset, u8 value)
{ {
memwritereg(cs->hw.diva.cfg_reg, offset + memwritereg(cs->hw.diva.cfg_reg, offset +
(hscx ? IPACX_OFF_B2 : IPACX_OFF_B1), value); (hscx ? IPACX_OFF_B2 : IPACX_OFF_B1), value);
...@@ -347,7 +347,7 @@ static void ...@@ -347,7 +347,7 @@ static void
diva_interrupt(int intno, void *dev_id, struct pt_regs *regs) diva_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val, sval; u8 val, sval;
int cnt=5; int cnt=5;
spin_lock(&cs->lock); spin_lock(&cs->lock);
...@@ -375,7 +375,7 @@ static void ...@@ -375,7 +375,7 @@ static void
diva_irq_ipac_isa(int intno, void *dev_id, struct pt_regs *regs) diva_irq_ipac_isa(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char ista,val; u8 ista,val;
int icnt=5; int icnt=5;
if (!cs) { if (!cs) {
...@@ -446,7 +446,7 @@ MemwaitforXFW(struct IsdnCardState *cs, int hscx) ...@@ -446,7 +446,7 @@ MemwaitforXFW(struct IsdnCardState *cs, int hscx)
} }
static inline void static inline void
MemWriteHSCXCMDR(struct IsdnCardState *cs, int hscx, u_char data) MemWriteHSCXCMDR(struct IsdnCardState *cs, int hscx, u8 data)
{ {
unsigned long flags; unsigned long flags;
...@@ -459,7 +459,7 @@ MemWriteHSCXCMDR(struct IsdnCardState *cs, int hscx, u_char data) ...@@ -459,7 +459,7 @@ MemWriteHSCXCMDR(struct IsdnCardState *cs, int hscx, u_char data)
static void static void
Memhscx_empty_fifo(struct BCState *bcs, int count) Memhscx_empty_fifo(struct BCState *bcs, int count)
{ {
u_char *ptr; u8 *ptr;
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
unsigned long flags; unsigned long flags;
int cnt; int cnt;
...@@ -513,9 +513,9 @@ Memhscx_fill_fifo(struct BCState *bcs) ...@@ -513,9 +513,9 @@ Memhscx_fill_fifo(struct BCState *bcs)
} }
static inline void static inline void
Memhscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx) Memhscx_interrupt(struct IsdnCardState *cs, u8 val, u8 hscx)
{ {
u_char r; u8 r;
struct BCState *bcs = cs->bcs + hscx; struct BCState *bcs = cs->bcs + hscx;
struct sk_buff *skb; struct sk_buff *skb;
int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32; int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32;
...@@ -584,10 +584,10 @@ Memhscx_reset_xmit(struct BCState *bcs) ...@@ -584,10 +584,10 @@ Memhscx_reset_xmit(struct BCState *bcs)
} }
static inline void static inline void
Memhscx_int_main(struct IsdnCardState *cs, u_char val) Memhscx_int_main(struct IsdnCardState *cs, u8 val)
{ {
u_char exval; u8 exval;
struct BCState *bcs; struct BCState *bcs;
if (val & 0x01) { // EXB if (val & 0x01) { // EXB
...@@ -625,15 +625,15 @@ static void ...@@ -625,15 +625,15 @@ static void
diva_irq_ipac_pci(int intno, void *dev_id, struct pt_regs *regs) diva_irq_ipac_pci(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char ista,val; u8 ista,val;
int icnt=5; int icnt=5;
u_char *cfg; u8 *cfg;
if (!cs) { if (!cs) {
printk(KERN_WARNING "Diva: Spurious interrupt!\n"); printk(KERN_WARNING "Diva: Spurious interrupt!\n");
return; return;
} }
cfg = (u_char *) cs->hw.diva.pci_cfg; cfg = (u8 *) cs->hw.diva.pci_cfg;
val = *cfg; val = *cfg;
if (!(val & PITA_INT0_STATUS)) if (!(val & PITA_INT0_STATUS))
return; /* other shared IRQ */ return; /* other shared IRQ */
...@@ -678,14 +678,14 @@ static void ...@@ -678,14 +678,14 @@ static void
diva_irq_ipacx_pci(int intno, void *dev_id, struct pt_regs *regs) diva_irq_ipacx_pci(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val; u8 val;
u_char *cfg; u8 *cfg;
if (!cs) { if (!cs) {
printk(KERN_WARNING "Diva: Spurious interrupt!\n"); printk(KERN_WARNING "Diva: Spurious interrupt!\n");
return; return;
} }
cfg = (u_char *) cs->hw.diva.pci_cfg; cfg = (u8 *) cs->hw.diva.pci_cfg;
val = *cfg; val = *cfg;
if (!(val &PITA_INT0_STATUS)) return; // other shared IRQ if (!(val &PITA_INT0_STATUS)) return; // other shared IRQ
interrupt_ipacx(cs); // handler for chip interrupt_ipacx(cs); // handler for chip
...@@ -908,7 +908,7 @@ int __init ...@@ -908,7 +908,7 @@ int __init
setup_diva(struct IsdnCard *card) setup_diva(struct IsdnCard *card)
{ {
int bytecnt = 8; int bytecnt = 8;
u_char val; u8 val;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];
......
drivers/isdn/hisax/elsa.c
View file @ 9ca46b71
...@@ -190,26 +190,26 @@ writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int siz ...@@ -190,26 +190,26 @@ writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int siz
/* Interface functions */ /* Interface functions */
static u_char static u8
ReadISAC(struct IsdnCardState *cs, u_char offset) ReadISAC(struct IsdnCardState *cs, u8 offset)
{ {
return readreg(cs, cs->hw.elsa.isac, offset); return readreg(cs, cs->hw.elsa.isac, offset);
} }
static void static void
WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
writereg(cs, cs->hw.elsa.isac, offset, value); writereg(cs, cs->hw.elsa.isac, offset, value);
} }
static void static void
ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
readfifo(cs, cs->hw.elsa.isac, 0, data, size); readfifo(cs, cs->hw.elsa.isac, 0, data, size);
} }
static void static void
WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
writefifo(cs, cs->hw.elsa.isac, 0, data, size); writefifo(cs, cs->hw.elsa.isac, 0, data, size);
} }
...@@ -221,26 +221,26 @@ static struct dc_hw_ops isac_ops = { ...@@ -221,26 +221,26 @@ static struct dc_hw_ops isac_ops = {
.write_fifo = WriteISACfifo, .write_fifo = WriteISACfifo,
}; };
static u_char static u8
ReadISAC_IPAC(struct IsdnCardState *cs, u_char offset) ReadISAC_IPAC(struct IsdnCardState *cs, u8 offset)
{ {
return readreg(cs, cs->hw.elsa.isac, offset+0x80); return readreg(cs, cs->hw.elsa.isac, offset+0x80);
} }
static void static void
WriteISAC_IPAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC_IPAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
writereg(cs, cs->hw.elsa.isac, offset|0x80, value); writereg(cs, cs->hw.elsa.isac, offset|0x80, value);
} }
static void static void
ReadISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo_IPAC(struct IsdnCardState *cs, u8 * data, int size)
{ {
readfifo(cs, cs->hw.elsa.isac, 0x80, data, size); readfifo(cs, cs->hw.elsa.isac, 0x80, data, size);
} }
static void static void
WriteISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo_IPAC(struct IsdnCardState *cs, u8 * data, int size)
{ {
writefifo(cs, cs->hw.elsa.isac, 0x80, data, size); writefifo(cs, cs->hw.elsa.isac, 0x80, data, size);
} }
...@@ -252,14 +252,14 @@ static struct dc_hw_ops ipac_dc_ops = { ...@@ -252,14 +252,14 @@ static struct dc_hw_ops ipac_dc_ops = {
.write_fifo = WriteISACfifo_IPAC, .write_fifo = WriteISACfifo_IPAC,
}; };
static u_char static u8
ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) ReadHSCX(struct IsdnCardState *cs, int hscx, u8 offset)
{ {
return readreg(cs, cs->hw.elsa.hscx, offset + (hscx ? 0x40 : 0)); return readreg(cs, cs->hw.elsa.hscx, offset + (hscx ? 0x40 : 0));
} }
static void static void
WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) WriteHSCX(struct IsdnCardState *cs, int hscx, u8 offset, u8 value)
{ {
writereg(cs, cs->hw.elsa.hscx, offset + (hscx ? 0x40 : 0), value); writereg(cs, cs->hw.elsa.hscx, offset + (hscx ? 0x40 : 0), value);
} }
...@@ -269,10 +269,10 @@ static struct bc_hw_ops hscx_ops = { ...@@ -269,10 +269,10 @@ static struct bc_hw_ops hscx_ops = {
.write_reg = WriteHSCX, .write_reg = WriteHSCX,
}; };
static inline u_char static inline u8
readitac(struct IsdnCardState *cs, u_char off) readitac(struct IsdnCardState *cs, u8 off)
{ {
register u_char ret; register u8 ret;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&elsa_lock, flags); spin_lock_irqsave(&elsa_lock, flags);
...@@ -283,7 +283,7 @@ readitac(struct IsdnCardState *cs, u_char off) ...@@ -283,7 +283,7 @@ readitac(struct IsdnCardState *cs, u_char off)
} }
static inline void static inline void
writeitac(struct IsdnCardState *cs, u_char off, u_char data) writeitac(struct IsdnCardState *cs, u8 off, u8 data)
{ {
unsigned long flags; unsigned long flags;
...@@ -296,7 +296,7 @@ writeitac(struct IsdnCardState *cs, u_char off, u_char data) ...@@ -296,7 +296,7 @@ writeitac(struct IsdnCardState *cs, u_char off, u_char data)
static inline int static inline int
TimerRun(struct IsdnCardState *cs) TimerRun(struct IsdnCardState *cs)
{ {
register u_char v; register u8 v;
v = bytein(cs->hw.elsa.cfg); v = bytein(cs->hw.elsa.cfg);
if ((cs->subtyp == ELSA_QS1000) || (cs->subtyp == ELSA_QS3000)) if ((cs->subtyp == ELSA_QS1000) || (cs->subtyp == ELSA_QS3000))
...@@ -326,7 +326,7 @@ static void ...@@ -326,7 +326,7 @@ static void
elsa_interrupt(int intno, void *dev_id, struct pt_regs *regs) elsa_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val; u8 val;
int icnt=5; int icnt=5;
spin_lock(&cs->lock); spin_lock(&cs->lock);
...@@ -404,7 +404,7 @@ static void ...@@ -404,7 +404,7 @@ static void
elsa_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs) elsa_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char ista,val; u8 ista,val;
int icnt=5; int icnt=5;
if (!cs) { if (!cs) {
...@@ -560,7 +560,7 @@ check_arcofi(struct IsdnCardState *cs) ...@@ -560,7 +560,7 @@ check_arcofi(struct IsdnCardState *cs)
int arcofi_present = 0; int arcofi_present = 0;
char tmp[40]; char tmp[40];
char *t; char *t;
u_char *p; u8 *p;
if (!cs->dc.isac.mon_tx) if (!cs->dc.isac.mon_tx)
if (!(cs->dc.isac.mon_tx=kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) { if (!(cs->dc.isac.mon_tx=kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) {
...@@ -670,7 +670,7 @@ elsa_led_handler(struct IsdnCardState *cs) ...@@ -670,7 +670,7 @@ elsa_led_handler(struct IsdnCardState *cs)
if ((cs->subtyp == ELSA_QS1000PCI) || if ((cs->subtyp == ELSA_QS1000PCI) ||
(cs->subtyp == ELSA_QS3000PCI)) { (cs->subtyp == ELSA_QS3000PCI)) {
u_char led = 0xff; u8 led = 0xff;
if (cs->hw.elsa.ctrl_reg & ELSA_LINE_LED) if (cs->hw.elsa.ctrl_reg & ELSA_LINE_LED)
led ^= ELSA_IPAC_LINE_LED; led ^= ELSA_IPAC_LINE_LED;
if (cs->hw.elsa.ctrl_reg & ELSA_STAT_LED) if (cs->hw.elsa.ctrl_reg & ELSA_STAT_LED)
...@@ -777,7 +777,7 @@ Elsa_card_msg(struct IsdnCardState *cs, int mt, void *arg) ...@@ -777,7 +777,7 @@ Elsa_card_msg(struct IsdnCardState *cs, int mt, void *arg)
case CARD_AUX_IND: case CARD_AUX_IND:
if (cs->hw.elsa.MFlag) { if (cs->hw.elsa.MFlag) {
int len; int len;
u_char *msg; u8 *msg;
if (!arg) if (!arg)
return(0); return(0);
...@@ -882,7 +882,7 @@ int __devinit ...@@ -882,7 +882,7 @@ int __devinit
setup_elsa(struct IsdnCard *card) setup_elsa(struct IsdnCard *card)
{ {
int bytecnt; int bytecnt;
u_char val, pci_rev; u8 val, pci_rev;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];
...@@ -916,15 +916,15 @@ setup_elsa(struct IsdnCard *card) ...@@ -916,15 +916,15 @@ setup_elsa(struct IsdnCard *card)
cs->hw.elsa.timer = cs->hw.elsa.base + ELSA_START_TIMER; cs->hw.elsa.timer = cs->hw.elsa.base + ELSA_START_TIMER;
val = bytein(cs->hw.elsa.cfg); val = bytein(cs->hw.elsa.cfg);
if (cs->subtyp == ELSA_PC) { if (cs->subtyp == ELSA_PC) {
const u_char CARD_IrqTab[8] = const u8 CARD_IrqTab[8] =
{7, 3, 5, 9, 0, 0, 0, 0}; {7, 3, 5, 9, 0, 0, 0, 0};
cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PC) >> 2]; cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PC) >> 2];
} else if (cs->subtyp == ELSA_PCC8) { } else if (cs->subtyp == ELSA_PCC8) {
const u_char CARD_IrqTab[8] = const u8 CARD_IrqTab[8] =
{7, 3, 5, 9, 0, 0, 0, 0}; {7, 3, 5, 9, 0, 0, 0, 0};
cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PCC8) >> 4]; cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PCC8) >> 4];
} else { } else {
const u_char CARD_IrqTab[8] = const u8 CARD_IrqTab[8] =
{15, 10, 15, 3, 11, 5, 11, 9}; {15, 10, 15, 3, 11, 5, 11, 9};
cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX) >> 3]; cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX) >> 3];
} }
......
drivers/isdn/hisax/elsa_ser.c
View file @ 9ca46b71
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
//#define SERIAL_DEBUG_REG 1 //#define SERIAL_DEBUG_REG 1
#ifdef SERIAL_DEBUG_REG #ifdef SERIAL_DEBUG_REG
static u_char deb[32]; static u8 deb[32];
const char *ModemIn[] = {"RBR","IER","IIR","LCR","MCR","LSR","MSR","SCR"}; const char *ModemIn[] = {"RBR","IER","IIR","LCR","MCR","LSR","MSR","SCR"};
const char *ModemOut[] = {"THR","IER","FCR","LCR","MCR","LSR","MSR","SCR"}; const char *ModemOut[] = {"THR","IER","FCR","LCR","MCR","LSR","MSR","SCR"};
#endif #endif
...@@ -436,9 +436,9 @@ close_elsastate(struct BCState *bcs) ...@@ -436,9 +436,9 @@ close_elsastate(struct BCState *bcs)
} }
void void
modem_write_cmd(struct IsdnCardState *cs, u_char *buf, int len) { modem_write_cmd(struct IsdnCardState *cs, u8 *buf, int len) {
int count, fp; int count, fp;
u_char *msg = buf; u8 *msg = buf;
unsigned long flags; unsigned long flags;
if (!len) if (!len)
......
drivers/isdn/hisax/gazel.c
View file @ 9ca46b71
...@@ -44,35 +44,35 @@ static spinlock_t gazel_lock = SPIN_LOCK_UNLOCKED; ...@@ -44,35 +44,35 @@ static spinlock_t gazel_lock = SPIN_LOCK_UNLOCKED;
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr) #define bytein(addr) inb(addr)
static inline u_char static inline u8
readreg(unsigned int adr, u_short off) readreg(unsigned int adr, u_short off)
{ {
return bytein(adr + off); return bytein(adr + off);
} }
static inline void static inline void
writereg(unsigned int adr, u_short off, u_char data) writereg(unsigned int adr, u_short off, u8 data)
{ {
byteout(adr + off, data); byteout(adr + off, data);
} }
static inline void static inline void
read_fifo(unsigned int adr, u_char * data, int size) read_fifo(unsigned int adr, u8 * data, int size)
{ {
insb(adr, data, size); insb(adr, data, size);
} }
static void static void
write_fifo(unsigned int adr, u_char * data, int size) write_fifo(unsigned int adr, u8 * data, int size)
{ {
outsb(adr, data, size); outsb(adr, data, size);
} }
static inline u_char static inline u8
readreg_ipac(unsigned int adr, u_short off) readreg_ipac(unsigned int adr, u_short off)
{ {
register u_char ret; register u8 ret;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&gazel_lock, flags); spin_lock_irqsave(&gazel_lock, flags);
...@@ -83,7 +83,7 @@ readreg_ipac(unsigned int adr, u_short off) ...@@ -83,7 +83,7 @@ readreg_ipac(unsigned int adr, u_short off)
} }
static inline void static inline void
writereg_ipac(unsigned int adr, u_short off, u_char data) writereg_ipac(unsigned int adr, u_short off, u8 data)
{ {
unsigned long flags; unsigned long flags;
...@@ -95,14 +95,14 @@ writereg_ipac(unsigned int adr, u_short off, u_char data) ...@@ -95,14 +95,14 @@ writereg_ipac(unsigned int adr, u_short off, u_char data)
static inline void static inline void
read_fifo_ipac(unsigned int adr, u_short off, u_char * data, int size) read_fifo_ipac(unsigned int adr, u_short off, u8 * data, int size)
{ {
byteout(adr, off); byteout(adr, off);
insb(adr + 4, data, size); insb(adr + 4, data, size);
} }
static void static void
write_fifo_ipac(unsigned int adr, u_short off, u_char * data, int size) write_fifo_ipac(unsigned int adr, u_short off, u8 * data, int size)
{ {
byteout(adr, off); byteout(adr, off);
outsb(adr + 4, data, size); outsb(adr + 4, data, size);
...@@ -110,8 +110,8 @@ write_fifo_ipac(unsigned int adr, u_short off, u_char * data, int size) ...@@ -110,8 +110,8 @@ write_fifo_ipac(unsigned int adr, u_short off, u_char * data, int size)
/* Interface functions */ /* Interface functions */
static u_char static u8
ReadISAC(struct IsdnCardState *cs, u_char offset) ReadISAC(struct IsdnCardState *cs, u8 offset)
{ {
u_short off2 = offset; u_short off2 = offset;
...@@ -128,7 +128,7 @@ ReadISAC(struct IsdnCardState *cs, u_char offset) ...@@ -128,7 +128,7 @@ ReadISAC(struct IsdnCardState *cs, u_char offset)
} }
static void static void
WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
u_short off2 = offset; u_short off2 = offset;
...@@ -146,7 +146,7 @@ WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) ...@@ -146,7 +146,7 @@ WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value)
} }
static void static void
ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
switch (cs->subtyp) { switch (cs->subtyp) {
case R647: case R647:
...@@ -161,7 +161,7 @@ ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ...@@ -161,7 +161,7 @@ ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size)
} }
static void static void
WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
switch (cs->subtyp) { switch (cs->subtyp) {
case R647: case R647:
...@@ -183,7 +183,7 @@ static struct dc_hw_ops isac_ops = { ...@@ -183,7 +183,7 @@ static struct dc_hw_ops isac_ops = {
}; };
static void static void
ReadHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size) ReadHSCXfifo(struct IsdnCardState *cs, int hscx, u8 * data, int size)
{ {
switch (cs->subtyp) { switch (cs->subtyp) {
case R647: case R647:
...@@ -198,7 +198,7 @@ ReadHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size) ...@@ -198,7 +198,7 @@ ReadHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size)
} }
static void static void
WriteHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size) WriteHSCXfifo(struct IsdnCardState *cs, int hscx, u8 * data, int size)
{ {
switch (cs->subtyp) { switch (cs->subtyp) {
case R647: case R647:
...@@ -212,8 +212,8 @@ WriteHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size) ...@@ -212,8 +212,8 @@ WriteHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size)
} }
} }
static u_char static u8
ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) ReadHSCX(struct IsdnCardState *cs, int hscx, u8 offset)
{ {
u_short off2 = offset; u_short off2 = offset;
...@@ -230,7 +230,7 @@ ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) ...@@ -230,7 +230,7 @@ ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset)
} }
static void static void
WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) WriteHSCX(struct IsdnCardState *cs, int hscx, u8 offset, u8 value)
{ {
u_short off2 = offset; u_short off2 = offset;
...@@ -268,7 +268,7 @@ gazel_interrupt(int intno, void *dev_id, struct pt_regs *regs) ...@@ -268,7 +268,7 @@ gazel_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
#define MAXCOUNT 5 #define MAXCOUNT 5
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char valisac, valhscx; u8 valisac, valhscx;
int count = 0; int count = 0;
spin_lock(&cs->lock); spin_lock(&cs->lock);
...@@ -296,7 +296,7 @@ static void ...@@ -296,7 +296,7 @@ static void
gazel_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs) gazel_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char ista, val; u8 ista, val;
int count = 0; int count = 0;
if (!cs) { if (!cs) {
...@@ -558,9 +558,9 @@ static int __init ...@@ -558,9 +558,9 @@ static int __init
setup_gazelpci(struct IsdnCardState *cs) setup_gazelpci(struct IsdnCardState *cs)
{ {
u_int pci_ioaddr0 = 0, pci_ioaddr1 = 0; u_int pci_ioaddr0 = 0, pci_ioaddr1 = 0;
u_char pci_irq = 0, found; u8 pci_irq = 0, found;
u_int nbseek, seekcard; u_int nbseek, seekcard;
u_char pci_rev; u8 pci_rev;
printk(KERN_WARNING "Gazel: PCI card automatic recognition\n"); printk(KERN_WARNING "Gazel: PCI card automatic recognition\n");
...@@ -658,7 +658,7 @@ setup_gazel(struct IsdnCard *card) ...@@ -658,7 +658,7 @@ setup_gazel(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];
u_char val; u8 val;
strcpy(tmp, gazel_revision); strcpy(tmp, gazel_revision);
printk(KERN_INFO "Gazel: Driver Revision %s\n", HiSax_getrev(tmp)); printk(KERN_INFO "Gazel: Driver Revision %s\n", HiSax_getrev(tmp));
......
drivers/isdn/hisax/hfc_2bds0.c
View file @ 9ca46b71
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr) #define bytein(addr) inb(addr)
static inline u_char static inline u8
ReadReg(struct IsdnCardState *cs, int data, u_char reg) ReadReg(struct IsdnCardState *cs, int data, u8 reg)
{ {
register u_char ret; register u8 ret;
if (data) { if (data) {
if (cs->hw.hfcD.cip != reg) { if (cs->hw.hfcD.cip != reg) {
...@@ -44,7 +44,7 @@ ReadReg(struct IsdnCardState *cs, int data, u_char reg) ...@@ -44,7 +44,7 @@ ReadReg(struct IsdnCardState *cs, int data, u_char reg)
} }
static inline void static inline void
WriteReg(struct IsdnCardState *cs, int data, u_char reg, u_char value) WriteReg(struct IsdnCardState *cs, int data, u8 reg, u8 value)
{ {
if (cs->hw.hfcD.cip != reg) { if (cs->hw.hfcD.cip != reg) {
cs->hw.hfcD.cip = reg; cs->hw.hfcD.cip = reg;
...@@ -112,9 +112,9 @@ WaitNoBusy(struct IsdnCardState *cs) ...@@ -112,9 +112,9 @@ WaitNoBusy(struct IsdnCardState *cs)
} }
static int static int
SelFiFo(struct IsdnCardState *cs, u_char FiFo) SelFiFo(struct IsdnCardState *cs, u8 FiFo)
{ {
u_char cip; u8 cip;
if (cs->hw.hfcD.fifo == FiFo) if (cs->hw.hfcD.fifo == FiFo)
return(1); return(1);
...@@ -171,7 +171,7 @@ GetFreeFifoBytes_D(struct IsdnCardState *cs) ...@@ -171,7 +171,7 @@ GetFreeFifoBytes_D(struct IsdnCardState *cs)
} }
static int static int
ReadZReg(struct IsdnCardState *cs, u_char reg) ReadZReg(struct IsdnCardState *cs, u8 reg)
{ {
int val; int val;
...@@ -185,12 +185,12 @@ ReadZReg(struct IsdnCardState *cs, u_char reg) ...@@ -185,12 +185,12 @@ ReadZReg(struct IsdnCardState *cs, u_char reg)
static struct sk_buff static struct sk_buff
*hfc_empty_fifo(struct BCState *bcs, int count) *hfc_empty_fifo(struct BCState *bcs, int count)
{ {
u_char *ptr; u8 *ptr;
struct sk_buff *skb; struct sk_buff *skb;
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
int idx; int idx;
int chksum; int chksum;
u_char stat, cip; u8 stat, cip;
if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO))
debugl1(cs, "hfc_empty_fifo"); debugl1(cs, "hfc_empty_fifo");
...@@ -266,7 +266,7 @@ hfc_fill_fifo(struct BCState *bcs) ...@@ -266,7 +266,7 @@ hfc_fill_fifo(struct BCState *bcs)
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
int idx, fcnt; int idx, fcnt;
int count; int count;
u_char cip; u8 cip;
if (!bcs->tx_skb) if (!bcs->tx_skb)
return; return;
...@@ -334,7 +334,7 @@ main_rec_2bds0(struct BCState *bcs) ...@@ -334,7 +334,7 @@ main_rec_2bds0(struct BCState *bcs)
{ {
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
int z1, z2, rcnt; int z1, z2, rcnt;
u_char f1, f2, cip; u8 f1, f2, cip;
int receive, count = 5; int receive, count = 5;
struct sk_buff *skb; struct sk_buff *skb;
...@@ -542,10 +542,10 @@ int receive_dmsg(struct IsdnCardState *cs) ...@@ -542,10 +542,10 @@ int receive_dmsg(struct IsdnCardState *cs)
struct sk_buff *skb; struct sk_buff *skb;
int idx; int idx;
int rcnt, z1, z2; int rcnt, z1, z2;
u_char stat, cip, f1, f2; u8 stat, cip, f1, f2;
int chksum; int chksum;
int count=5; int count=5;
u_char *ptr; u8 *ptr;
SelFiFo(cs, 4 | HFCD_REC); SelFiFo(cs, 4 | HFCD_REC);
cip = HFCD_FIFO | HFCD_F1 | HFCD_REC; cip = HFCD_FIFO | HFCD_F1 | HFCD_REC;
...@@ -638,7 +638,7 @@ hfc_fill_dfifo(struct IsdnCardState *cs) ...@@ -638,7 +638,7 @@ hfc_fill_dfifo(struct IsdnCardState *cs)
{ {
int idx, fcnt; int idx, fcnt;
int count; int count;
u_char cip; u8 cip;
if (!cs->tx_skb) if (!cs->tx_skb)
return; return;
...@@ -710,9 +710,9 @@ struct BCState *Sel_BCS(struct IsdnCardState *cs, int channel) ...@@ -710,9 +710,9 @@ struct BCState *Sel_BCS(struct IsdnCardState *cs, int channel)
} }
void void
hfc2bds0_interrupt(struct IsdnCardState *cs, u_char val) hfc2bds0_interrupt(struct IsdnCardState *cs, u8 val)
{ {
u_char exval; u8 exval;
struct BCState *bcs; struct BCState *bcs;
int count=15; int count=15;
......
drivers/isdn/hisax/hfc_2bds0.h
View file @ 9ca46b71
...@@ -124,5 +124,5 @@ ...@@ -124,5 +124,5 @@
extern void main_irq_2bds0(struct BCState *bcs); extern void main_irq_2bds0(struct BCState *bcs);
extern void init2bds0(struct IsdnCardState *cs); extern void init2bds0(struct IsdnCardState *cs);
extern void release2bds0(struct IsdnCardState *cs); extern void release2bds0(struct IsdnCardState *cs);
extern void hfc2bds0_interrupt(struct IsdnCardState *cs, u_char val); extern void hfc2bds0_interrupt(struct IsdnCardState *cs, u8 val);
extern void set_cs_func(struct IsdnCardState *cs); extern void set_cs_func(struct IsdnCardState *cs);
drivers/isdn/hisax/hfc_2bs0.c
View file @ 9ca46b71
...@@ -33,7 +33,7 @@ static inline int ...@@ -33,7 +33,7 @@ static inline int
WaitForBusy(struct IsdnCardState *cs) WaitForBusy(struct IsdnCardState *cs)
{ {
int to = 130; int to = 130;
u_char val; u8 val;
while (!(hfc_read_reg(cs, HFC_STATUS, 0) & HFC_BUSY) && to) { while (!(hfc_read_reg(cs, HFC_STATUS, 0) & HFC_BUSY) && to) {
val = hfc_read_reg(cs, HFC_DATA, HFC_CIP | HFC_F2 | val = hfc_read_reg(cs, HFC_DATA, HFC_CIP | HFC_F2 |
...@@ -79,7 +79,7 @@ GetFreeFifoBytes(struct BCState *bcs) ...@@ -79,7 +79,7 @@ GetFreeFifoBytes(struct BCState *bcs)
} }
int int
ReadZReg(struct BCState *bcs, u_char reg) ReadZReg(struct BCState *bcs, u8 reg)
{ {
int val; int val;
...@@ -96,7 +96,7 @@ hfc_clear_fifo(struct BCState *bcs) ...@@ -96,7 +96,7 @@ hfc_clear_fifo(struct BCState *bcs)
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
int idx, cnt; int idx, cnt;
int rcnt, z1, z2; int rcnt, z1, z2;
u_char cip, f1, f2; u8 cip, f1, f2;
if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO))
debugl1(cs, "hfc_clear_fifo"); debugl1(cs, "hfc_clear_fifo");
...@@ -155,12 +155,12 @@ static struct sk_buff ...@@ -155,12 +155,12 @@ static struct sk_buff
* *
hfc_empty_fifo(struct BCState *bcs, int count) hfc_empty_fifo(struct BCState *bcs, int count)
{ {
u_char *ptr; u8 *ptr;
struct sk_buff *skb; struct sk_buff *skb;
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
int idx; int idx;
int chksum; int chksum;
u_char stat, cip; u8 stat, cip;
if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO))
debugl1(cs, "hfc_empty_fifo"); debugl1(cs, "hfc_empty_fifo");
...@@ -252,7 +252,7 @@ hfc_fill_fifo(struct BCState *bcs) ...@@ -252,7 +252,7 @@ hfc_fill_fifo(struct BCState *bcs)
int idx, fcnt; int idx, fcnt;
int count; int count;
int z1, z2; int z1, z2;
u_char cip; u8 cip;
if (!bcs->tx_skb) if (!bcs->tx_skb)
return; return;
...@@ -331,7 +331,7 @@ main_irq_hfc(struct BCState *bcs) ...@@ -331,7 +331,7 @@ main_irq_hfc(struct BCState *bcs)
{ {
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
int z1, z2, rcnt; int z1, z2, rcnt;
u_char f1, f2, cip; u8 f1, f2, cip;
int receive, transmit, count = 5; int receive, transmit, count = 5;
struct sk_buff *skb; struct sk_buff *skb;
......
drivers/isdn/hisax/hfc_pci.c
View file @ 9ca46b71
...@@ -193,7 +193,7 @@ Sel_BCS(struct IsdnCardState *cs, int channel) ...@@ -193,7 +193,7 @@ Sel_BCS(struct IsdnCardState *cs, int channel)
/* clear the desired B-channel rx fifo */ /* clear the desired B-channel rx fifo */
/***************************************/ /***************************************/
static void hfcpci_clear_fifo_rx(struct IsdnCardState *cs, int fifo) static void hfcpci_clear_fifo_rx(struct IsdnCardState *cs, int fifo)
{ u_char fifo_state; { u8 fifo_state;
bzfifo_type *bzr; bzfifo_type *bzr;
if (fifo) { if (fifo) {
...@@ -220,7 +220,7 @@ static void hfcpci_clear_fifo_rx(struct IsdnCardState *cs, int fifo) ...@@ -220,7 +220,7 @@ static void hfcpci_clear_fifo_rx(struct IsdnCardState *cs, int fifo)
/* clear the desired B-channel tx fifo */ /* clear the desired B-channel tx fifo */
/***************************************/ /***************************************/
static void hfcpci_clear_fifo_tx(struct IsdnCardState *cs, int fifo) static void hfcpci_clear_fifo_tx(struct IsdnCardState *cs, int fifo)
{ u_char fifo_state; { u8 fifo_state;
bzfifo_type *bzt; bzfifo_type *bzt;
if (fifo) { if (fifo) {
...@@ -247,9 +247,9 @@ static void hfcpci_clear_fifo_tx(struct IsdnCardState *cs, int fifo) ...@@ -247,9 +247,9 @@ static void hfcpci_clear_fifo_tx(struct IsdnCardState *cs, int fifo)
/*********************************************/ /*********************************************/
static struct sk_buff static struct sk_buff
* *
hfcpci_empty_fifo(struct BCState *bcs, bzfifo_type * bz, u_char * bdata, int count) hfcpci_empty_fifo(struct BCState *bcs, bzfifo_type * bz, u8 * bdata, int count)
{ {
u_char *ptr, *ptr1, new_f2; u8 *ptr, *ptr1, new_f2;
struct sk_buff *skb; struct sk_buff *skb;
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
int total, maxlen, new_z2; int total, maxlen, new_z2;
...@@ -311,7 +311,7 @@ receive_dmsg(struct IsdnCardState *cs) ...@@ -311,7 +311,7 @@ receive_dmsg(struct IsdnCardState *cs)
int maxlen; int maxlen;
int rcnt, total; int rcnt, total;
int count = 5; int count = 5;
u_char *ptr, *ptr1; u8 *ptr, *ptr1;
dfifo_type *df; dfifo_type *df;
z_type *zp; z_type *zp;
...@@ -369,12 +369,12 @@ receive_dmsg(struct IsdnCardState *cs) ...@@ -369,12 +369,12 @@ receive_dmsg(struct IsdnCardState *cs)
/* check for transparent receive data and read max one threshold size if avail */ /* check for transparent receive data and read max one threshold size if avail */
/*******************************************************************************/ /*******************************************************************************/
int int
hfcpci_empty_fifo_trans(struct BCState *bcs, bzfifo_type * bz, u_char * bdata) hfcpci_empty_fifo_trans(struct BCState *bcs, bzfifo_type * bz, u8 * bdata)
{ {
unsigned short *z1r, *z2r; unsigned short *z1r, *z2r;
int new_z2, fcnt, maxlen; int new_z2, fcnt, maxlen;
struct sk_buff *skb; struct sk_buff *skb;
u_char *ptr, *ptr1; u8 *ptr, *ptr1;
z1r = &bz->za[MAX_B_FRAMES].z1; /* pointer to z reg */ z1r = &bz->za[MAX_B_FRAMES].z1; /* pointer to z reg */
z2r = z1r + 1; z2r = z1r + 1;
...@@ -428,7 +428,7 @@ main_rec_hfcpci(struct BCState *bcs) ...@@ -428,7 +428,7 @@ main_rec_hfcpci(struct BCState *bcs)
int receive, count = 5; int receive, count = 5;
struct sk_buff *skb; struct sk_buff *skb;
bzfifo_type *bz; bzfifo_type *bz;
u_char *bdata; u8 *bdata;
z_type *zp; z_type *zp;
if ((bcs->channel) && (!cs->hw.hfcpci.bswapped)) { if ((bcs->channel) && (!cs->hw.hfcpci.bswapped)) {
...@@ -490,7 +490,7 @@ hfcpci_fill_dfifo(struct IsdnCardState *cs) ...@@ -490,7 +490,7 @@ hfcpci_fill_dfifo(struct IsdnCardState *cs)
int fcnt; int fcnt;
int count, new_z1, maxlen; int count, new_z1, maxlen;
dfifo_type *df; dfifo_type *df;
u_char *src, *dst, new_f1; u8 *src, *dst, new_f1;
if (!cs->tx_skb) if (!cs->tx_skb)
return; return;
...@@ -562,8 +562,8 @@ hfcpci_fill_fifo(struct BCState *bcs) ...@@ -562,8 +562,8 @@ hfcpci_fill_fifo(struct BCState *bcs)
int maxlen, fcnt; int maxlen, fcnt;
int count, new_z1; int count, new_z1;
bzfifo_type *bz; bzfifo_type *bz;
u_char *bdata; u8 *bdata;
u_char new_f1, *src, *dst; u8 new_f1, *src, *dst;
unsigned short *z1t, *z2t; unsigned short *z1t, *z2t;
if (!bcs->tx_skb) if (!bcs->tx_skb)
...@@ -780,11 +780,11 @@ receive_emsg(struct IsdnCardState *cs) ...@@ -780,11 +780,11 @@ receive_emsg(struct IsdnCardState *cs)
int rcnt; int rcnt;
int receive, count = 5; int receive, count = 5;
bzfifo_type *bz; bzfifo_type *bz;
u_char *bdata; u8 *bdata;
z_type *zp; z_type *zp;
u_char *ptr, *ptr1, new_f2; u8 *ptr, *ptr1, new_f2;
int total, maxlen, new_z2; int total, maxlen, new_z2;
u_char e_buffer[256]; u8 e_buffer[256];
bz = &((fifo_area *) (cs->hw.hfcpci.fifos))->b_chans.rxbz_b2; bz = &((fifo_area *) (cs->hw.hfcpci.fifos))->b_chans.rxbz_b2;
bdata = ((fifo_area *) (cs->hw.hfcpci.fifos))->b_chans.rxdat_b2; bdata = ((fifo_area *) (cs->hw.hfcpci.fifos))->b_chans.rxdat_b2;
...@@ -873,10 +873,10 @@ static void ...@@ -873,10 +873,10 @@ static void
hfcpci_interrupt(int intno, void *dev_id, struct pt_regs *regs) hfcpci_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char exval; u8 exval;
struct BCState *bcs; struct BCState *bcs;
int count = 15; int count = 15;
u_char val, stat; u8 val, stat;
if (!cs) { if (!cs) {
printk(KERN_WARNING "HFC-PCI: Spurious interrupt!\n"); printk(KERN_WARNING "HFC-PCI: Spurious interrupt!\n");
......
drivers/isdn/hisax/hfc_pci.h
View file @ 9ca46b71
...@@ -188,18 +188,18 @@ typedef struct { ...@@ -188,18 +188,18 @@ typedef struct {
} __attribute__((packed)) z_type; } __attribute__((packed)) z_type;
typedef struct { typedef struct {
u_char data[D_FIFO_SIZE]; /* FIFO data space */ u8 data[D_FIFO_SIZE]; /* FIFO data space */
u_char fill1[0x20A0-D_FIFO_SIZE]; /* reserved, do not use */ u8 fill1[0x20A0-D_FIFO_SIZE]; /* reserved, do not use */
u_char f1,f2; /* f pointers */ u8 f1,f2; /* f pointers */
u_char fill2[0x20C0-0x20A2]; /* reserved, do not use */ u8 fill2[0x20C0-0x20A2]; /* reserved, do not use */
z_type za[MAX_D_FRAMES+1]; /* mask index with D_FREG_MASK for access */ z_type za[MAX_D_FRAMES+1]; /* mask index with D_FREG_MASK for access */
u_char fill3[0x4000-0x2100]; /* align 16K */ u8 fill3[0x4000-0x2100]; /* align 16K */
} __attribute__((packed)) dfifo_type; } __attribute__((packed)) dfifo_type;
typedef struct { typedef struct {
z_type za[MAX_B_FRAMES+1]; /* only range 0x0..0x1F allowed */ z_type za[MAX_B_FRAMES+1]; /* only range 0x0..0x1F allowed */
u_char f1,f2; /* f pointers */ u8 f1,f2; /* f pointers */
u_char fill[0x2100-0x2082]; /* alignment */ u8 fill[0x2100-0x2082]; /* alignment */
} __attribute__((packed)) bzfifo_type; } __attribute__((packed)) bzfifo_type;
...@@ -209,29 +209,29 @@ typedef union { ...@@ -209,29 +209,29 @@ typedef union {
dfifo_type d_rx; /* D-receive channel */ dfifo_type d_rx; /* D-receive channel */
} __attribute__((packed)) d_chan; } __attribute__((packed)) d_chan;
struct { struct {
u_char fill1[0x200]; u8 fill1[0x200];
u_char txdat_b1[B_FIFO_SIZE]; u8 txdat_b1[B_FIFO_SIZE];
bzfifo_type txbz_b1; bzfifo_type txbz_b1;
bzfifo_type txbz_b2; bzfifo_type txbz_b2;
u_char txdat_b2[B_FIFO_SIZE]; u8 txdat_b2[B_FIFO_SIZE];
u_char fill2[D_FIFO_SIZE]; u8 fill2[D_FIFO_SIZE];
u_char rxdat_b1[B_FIFO_SIZE]; u8 rxdat_b1[B_FIFO_SIZE];
bzfifo_type rxbz_b1; bzfifo_type rxbz_b1;
bzfifo_type rxbz_b2; bzfifo_type rxbz_b2;
u_char rxdat_b2[B_FIFO_SIZE]; u8 rxdat_b2[B_FIFO_SIZE];
} __attribute__((packed)) b_chans; } __attribute__((packed)) b_chans;
u_char fill[32768]; u8 fill[32768];
} __attribute__((packed)) fifo_area; } __attribute__((packed)) fifo_area;
//#define Write_hfc(a,b,c) (*(((u_char *)a->hw.hfcpci.pci_io)+b) = c) //#define Write_hfc(a,b,c) (*(((u8 *)a->hw.hfcpci.pci_io)+b) = c)
//#define Read_hfc(a,b) (*(((u_char *)a->hw.hfcpci.pci_io)+b)) //#define Read_hfc(a,b) (*(((u8 *)a->hw.hfcpci.pci_io)+b))
#define Write_hfc(a,b,c) writeb(c, ((u_char *)a->hw.hfcpci.pci_io)+b) #define Write_hfc(a,b,c) writeb(c, ((u8 *)a->hw.hfcpci.pci_io)+b)
#define Read_hfc(a,b) readb(((u_char *)a->hw.hfcpci.pci_io)+b) #define Read_hfc(a,b) readb(((u8 *)a->hw.hfcpci.pci_io)+b)
extern void main_irq_hcpci(struct BCState *bcs); extern void main_irq_hcpci(struct BCState *bcs);
extern void inithfcpci(struct IsdnCardState *cs); extern void inithfcpci(struct IsdnCardState *cs);
......
drivers/isdn/hisax/hfc_sx.c
View file @ 9ca46b71
...@@ -43,11 +43,11 @@ static const char *hfcsx_revision = "$Revision: 1.9.6.3 $"; ...@@ -43,11 +43,11 @@ static const char *hfcsx_revision = "$Revision: 1.9.6.3 $";
#undef CCD_DEMO_BOARD #undef CCD_DEMO_BOARD
#ifdef CCD_DEMO_BOARD #ifdef CCD_DEMO_BOARD
static u_char ccd_sp_irqtab[16] = { static u8 ccd_sp_irqtab[16] = {
0,0,0,0,0,2,1,0,0,0,3,4,5,0,0,6 0,0,0,0,0,2,1,0,0,0,3,4,5,0,0,6
}; };
#else /* Teles 16.3c */ #else /* Teles 16.3c */
static u_char ccd_sp_irqtab[16] = { static u8 ccd_sp_irqtab[16] = {
0,0,0,7,0,1,0,0,0,2,3,4,5,0,0,6 0,0,0,7,0,1,0,0,0,2,3,4,5,0,0,6
}; };
#endif #endif
...@@ -60,17 +60,17 @@ static u_char ccd_sp_irqtab[16] = { ...@@ -60,17 +60,17 @@ static u_char ccd_sp_irqtab[16] = {
/* In/Out access to registers */ /* In/Out access to registers */
/******************************/ /******************************/
static inline void static inline void
Write_hfc(struct IsdnCardState *cs, u_char regnum, u_char val) Write_hfc(struct IsdnCardState *cs, u8 regnum, u8 val)
{ {
byteout(cs->hw.hfcsx.base+1, regnum); byteout(cs->hw.hfcsx.base+1, regnum);
byteout(cs->hw.hfcsx.base, val); byteout(cs->hw.hfcsx.base, val);
} }
static inline u_char static inline u8
Read_hfc(struct IsdnCardState *cs, u_char regnum) Read_hfc(struct IsdnCardState *cs, u8 regnum)
{ {
u_char ret; u8 ret;
byteout(cs->hw.hfcsx.base+1, regnum); byteout(cs->hw.hfcsx.base+1, regnum);
ret = bytein(cs->hw.hfcsx.base); ret = bytein(cs->hw.hfcsx.base);
...@@ -82,7 +82,7 @@ Read_hfc(struct IsdnCardState *cs, u_char regnum) ...@@ -82,7 +82,7 @@ Read_hfc(struct IsdnCardState *cs, u_char regnum)
/* select a fifo and remember which one for reuse */ /* select a fifo and remember which one for reuse */
/**************************************************/ /**************************************************/
static void static void
fifo_select(struct IsdnCardState *cs, u_char fifo) fifo_select(struct IsdnCardState *cs, u8 fifo)
{ {
if (fifo == cs->hw.hfcsx.last_fifo) if (fifo == cs->hw.hfcsx.last_fifo)
return; /* still valid */ return; /* still valid */
...@@ -100,7 +100,7 @@ fifo_select(struct IsdnCardState *cs, u_char fifo) ...@@ -100,7 +100,7 @@ fifo_select(struct IsdnCardState *cs, u_char fifo)
/* If its a send fifo init needed markers */ /* If its a send fifo init needed markers */
/******************************************/ /******************************************/
static void static void
reset_fifo(struct IsdnCardState *cs, u_char fifo) reset_fifo(struct IsdnCardState *cs, u8 fifo)
{ {
fifo_select(cs, fifo); /* first select the fifo */ fifo_select(cs, fifo); /* first select the fifo */
byteout(cs->hw.hfcsx.base+1, HFCSX_CIRM); byteout(cs->hw.hfcsx.base+1, HFCSX_CIRM);
...@@ -116,10 +116,10 @@ reset_fifo(struct IsdnCardState *cs, u_char fifo) ...@@ -116,10 +116,10 @@ reset_fifo(struct IsdnCardState *cs, u_char fifo)
/* the skb is not released in any way. */ /* the skb is not released in any way. */
/*************************************************************/ /*************************************************************/
static int static int
write_fifo(struct IsdnCardState *cs, struct sk_buff *skb, u_char fifo, int trans_max) write_fifo(struct IsdnCardState *cs, struct sk_buff *skb, u8 fifo, int trans_max)
{ unsigned short *msp; { unsigned short *msp;
int fifo_size, count, z1, z2; int fifo_size, count, z1, z2;
u_char f_msk, f1, f2, *src; u8 f_msk, f1, f2, *src;
if (skb->len <= 0) return(0); if (skb->len <= 0) return(0);
if (fifo & 1) return(0); /* no write fifo */ if (fifo & 1) return(0); /* no write fifo */
...@@ -205,9 +205,9 @@ write_fifo(struct IsdnCardState *cs, struct sk_buff *skb, u_char fifo, int trans ...@@ -205,9 +205,9 @@ write_fifo(struct IsdnCardState *cs, struct sk_buff *skb, u_char fifo, int trans
/* the skb is not released in any way. */ /* the skb is not released in any way. */
/***************************************************************/ /***************************************************************/
static struct sk_buff * static struct sk_buff *
read_fifo(struct IsdnCardState *cs, u_char fifo, int trans_max) read_fifo(struct IsdnCardState *cs, u8 fifo, int trans_max)
{ int fifo_size, count, z1, z2; { int fifo_size, count, z1, z2;
u_char f_msk, f1, f2, *dst; u8 f_msk, f1, f2, *dst;
struct sk_buff *skb; struct sk_buff *skb;
if (!(fifo & 1)) return(NULL); /* no read fifo */ if (!(fifo & 1)) return(NULL); /* no read fifo */
...@@ -629,7 +629,7 @@ static void ...@@ -629,7 +629,7 @@ static void
receive_emsg(struct IsdnCardState *cs) receive_emsg(struct IsdnCardState *cs)
{ {
int count = 5; int count = 5;
u_char *ptr; u8 *ptr;
struct sk_buff *skb; struct sk_buff *skb;
do { do {
...@@ -664,10 +664,10 @@ static void ...@@ -664,10 +664,10 @@ static void
hfcsx_interrupt(int intno, void *dev_id, struct pt_regs *regs) hfcsx_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char exval; u8 exval;
struct BCState *bcs; struct BCState *bcs;
int count = 15; int count = 15;
u_char val, stat; u8 val, stat;
if (!cs) { if (!cs) {
printk(KERN_WARNING "HFC-SX: Spurious interrupt!\n"); printk(KERN_WARNING "HFC-SX: Spurious interrupt!\n");
......
drivers/isdn/hisax/hfcscard.c
View file @ 9ca46b71
...@@ -36,7 +36,7 @@ static void ...@@ -36,7 +36,7 @@ static void
hfcs_interrupt(int intno, void *dev_id, struct pt_regs *regs) hfcs_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val, stat; u8 val, stat;
if (!cs) { if (!cs) {
printk(KERN_WARNING "HFCS: Spurious interrupt!\n"); printk(KERN_WARNING "HFCS: Spurious interrupt!\n");
......
drivers/isdn/hisax/hisax.h
View file @ 9ca46b71
...@@ -292,14 +292,14 @@ struct Management { ...@@ -292,14 +292,14 @@ struct Management {
#define NO_CAUSE 254 #define NO_CAUSE 254
struct Param { struct Param {
u_char cause; u8 cause;
u_char loc; u8 loc;
u_char diag[6]; u8 diag[6];
int bchannel; int bchannel;
int chargeinfo; int chargeinfo;
int spv; /* SPV Flag */ int spv; /* SPV Flag */
setup_parm setup; /* from isdnif.h numbers and Serviceindicator */ setup_parm setup; /* from isdnif.h numbers and Serviceindicator */
u_char moderate; /* transfer mode and rate (bearer octet 4) */ u8 moderate; /* transfer mode and rate (bearer octet 4) */
}; };
...@@ -314,7 +314,7 @@ struct PStack { ...@@ -314,7 +314,7 @@ struct PStack {
/* protocol specific data fields */ /* protocol specific data fields */
union union
{ u_char uuuu; /* only as dummy */ { u8 uuuu; /* only as dummy */
#ifdef CONFIG_HISAX_EURO #ifdef CONFIG_HISAX_EURO
dss1_stk_priv dss1; /* private dss1 data */ dss1_stk_priv dss1; /* private dss1 data */
#endif /* CONFIG_HISAX_EURO */ #endif /* CONFIG_HISAX_EURO */
...@@ -338,7 +338,7 @@ struct l3_process { ...@@ -338,7 +338,7 @@ struct l3_process {
/* protocol specific data fields */ /* protocol specific data fields */
union union
{ u_char uuuu; /* only when euro not defined, avoiding empty union */ { u8 uuuu; /* only when euro not defined, avoiding empty union */
#ifdef CONFIG_HISAX_EURO #ifdef CONFIG_HISAX_EURO
dss1_proc_priv dss1; /* private dss1 data */ dss1_proc_priv dss1; /* private dss1 data */
#endif /* CONFIG_HISAX_EURO */ #endif /* CONFIG_HISAX_EURO */
...@@ -358,53 +358,53 @@ struct bc_hw_ops { ...@@ -358,53 +358,53 @@ struct bc_hw_ops {
struct hscx_hw { struct hscx_hw {
int hscx; int hscx;
int rcvidx; int rcvidx;
u_char *rcvbuf; /* B-Channel receive Buffer */ u8 *rcvbuf; /* B-Channel receive Buffer */
u_char tsaxr0; u8 tsaxr0;
u_char tsaxr1; u8 tsaxr1;
}; };
struct w6692B_hw { struct w6692B_hw {
int bchan; int bchan;
int rcvidx; int rcvidx;
u_char *rcvbuf; /* B-Channel receive Buffer */ u8 *rcvbuf; /* B-Channel receive Buffer */
}; };
struct isar_reg { struct isar_reg {
unsigned long Flags; unsigned long Flags;
volatile u_char bstat; volatile u8 bstat;
volatile u_char iis; volatile u8 iis;
volatile u_char cmsb; volatile u8 cmsb;
volatile u_char clsb; volatile u8 clsb;
volatile u_char par[8]; volatile u8 par[8];
}; };
struct isar_hw { struct isar_hw {
int dpath; int dpath;
int rcvidx; int rcvidx;
int mml; int mml;
u_char state; u8 state;
u_char cmd; u8 cmd;
u_char mod; u8 mod;
u_char newcmd; u8 newcmd;
u_char newmod; u8 newmod;
char try_mod; char try_mod;
struct timer_list ftimer; struct timer_list ftimer;
u_char *rcvbuf; /* B-Channel receive Buffer */ u8 *rcvbuf; /* B-Channel receive Buffer */
u_char conmsg[16]; u8 conmsg[16];
struct isar_reg *reg; struct isar_reg *reg;
}; };
struct hdlc_stat_reg { struct hdlc_stat_reg {
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
u_char fill __attribute__((packed)); u8 fill __attribute__((packed));
u_char mode __attribute__((packed)); u8 mode __attribute__((packed));
u_char xml __attribute__((packed)); u8 xml __attribute__((packed));
u_char cmd __attribute__((packed)); u8 cmd __attribute__((packed));
#else #else
u_char cmd __attribute__((packed)); u8 cmd __attribute__((packed));
u_char xml __attribute__((packed)); u8 xml __attribute__((packed));
u_char mode __attribute__((packed)); u8 mode __attribute__((packed));
u_char fill __attribute__((packed)); u8 fill __attribute__((packed));
#endif #endif
}; };
...@@ -415,7 +415,7 @@ struct hdlc_hw { ...@@ -415,7 +415,7 @@ struct hdlc_hw {
} ctrl; } ctrl;
u_int stat; u_int stat;
int rcvidx; int rcvidx;
u_char *rcvbuf; /* B-Channel receive Buffer */ u8 *rcvbuf; /* B-Channel receive Buffer */
}; };
struct hfcB_hw { struct hfcB_hw {
...@@ -432,24 +432,24 @@ struct tiger_hw { ...@@ -432,24 +432,24 @@ struct tiger_hw {
u_int *rec; u_int *rec;
dma_addr_t rec_dma; dma_addr_t rec_dma;
int free; int free;
u_char *rcvbuf; u8 *rcvbuf;
u_char *sendbuf; u8 *sendbuf;
u_char *sp; u8 *sp;
int sendcnt; int sendcnt;
u_int s_tot; u_int s_tot;
u_int r_bitcnt; u_int r_bitcnt;
u_int r_tot; u_int r_tot;
u_int r_err; u_int r_err;
u_int r_fcs; u_int r_fcs;
u_char r_state; u8 r_state;
u_char r_one; u8 r_one;
u_char r_val; u8 r_val;
u_char s_state; u8 s_state;
}; };
struct amd7930_hw { struct amd7930_hw {
u_char *tx_buff; u8 *tx_buff;
u_char *rv_buff; u8 *rv_buff;
int rv_buff_in; int rv_buff_in;
int rv_buff_out; int rv_buff_out;
struct sk_buff *rv_skb; struct sk_buff *rv_skb;
...@@ -494,8 +494,8 @@ struct BCState { ...@@ -494,8 +494,8 @@ struct BCState {
struct sk_buff_head squeue; /* B-Channel send queue */ struct sk_buff_head squeue; /* B-Channel send queue */
struct sk_buff_head cmpl_queue; /* B-Channel send complete queue */ struct sk_buff_head cmpl_queue; /* B-Channel send complete queue */
struct PStack *st; struct PStack *st;
u_char *blog; u8 *blog;
u_char *conmsg; u8 *conmsg;
struct timer_list transbusy; struct timer_list transbusy;
struct work_struct work; struct work_struct work;
unsigned long event; unsigned long event;
...@@ -554,17 +554,17 @@ struct elsa_hw { ...@@ -554,17 +554,17 @@ struct elsa_hw {
struct timer_list tl; struct timer_list tl;
unsigned int MFlag; unsigned int MFlag;
struct BCState *bcs; struct BCState *bcs;
u_char *transbuf; u8 *transbuf;
u_char *rcvbuf; u8 *rcvbuf;
unsigned int transp; unsigned int transp;
unsigned int rcvp; unsigned int rcvp;
unsigned int transcnt; unsigned int transcnt;
unsigned int rcvcnt; unsigned int rcvcnt;
u_char IER; u8 IER;
u_char FCR; u8 FCR;
u_char LCR; u8 LCR;
u_char MCR; u8 MCR;
u_char ctrl_reg; u8 ctrl_reg;
}; };
struct teles3_hw { struct teles3_hw {
...@@ -608,7 +608,7 @@ struct diva_hw { ...@@ -608,7 +608,7 @@ struct diva_hw {
unsigned int hscx; unsigned int hscx;
unsigned int status; unsigned int status;
struct timer_list tl; struct timer_list tl;
u_char ctrl_reg; u8 ctrl_reg;
}; };
struct asus_hw { struct asus_hw {
...@@ -627,7 +627,7 @@ struct hfc_hw { ...@@ -627,7 +627,7 @@ struct hfc_hw {
unsigned char cirm; unsigned char cirm;
unsigned char ctmt; unsigned char ctmt;
unsigned char cip; unsigned char cip;
u_char isac_spcr; u8 isac_spcr;
struct timer_list timer; struct timer_list timer;
}; };
...@@ -802,25 +802,25 @@ struct te_hw { ...@@ -802,25 +802,25 @@ struct te_hw {
struct arcofi_msg { struct arcofi_msg {
struct arcofi_msg *next; struct arcofi_msg *next;
u_char receive; u8 receive;
u_char len; u8 len;
u_char msg[10]; u8 msg[10];
}; };
struct isac_chip { struct isac_chip {
int ph_state; int ph_state;
u_char *mon_tx; u8 *mon_tx;
u_char *mon_rx; u8 *mon_rx;
int mon_txp; int mon_txp;
int mon_txc; int mon_txc;
int mon_rxp; int mon_rxp;
struct arcofi_msg *arcofi_list; struct arcofi_msg *arcofi_list;
struct timer_list arcofitimer; struct timer_list arcofitimer;
wait_queue_head_t arcofi_wait; wait_queue_head_t arcofi_wait;
u_char arcofi_bc; u8 arcofi_bc;
u_char arcofi_state; u8 arcofi_state;
u_char mocr; u8 mocr;
u_char adf2; u8 adf2;
}; };
struct hfcd_chip { struct hfcd_chip {
...@@ -840,30 +840,30 @@ struct w6692_chip { ...@@ -840,30 +840,30 @@ struct w6692_chip {
}; };
struct amd7930_chip { struct amd7930_chip {
u_char lmr1; u8 lmr1;
u_char ph_state; u8 ph_state;
u_char old_state; u8 old_state;
u_char flg_t3; u8 flg_t3;
unsigned int tx_xmtlen; unsigned int tx_xmtlen;
struct timer_list timer3; struct timer_list timer3;
void (*ph_command) (struct IsdnCardState *, u_char, char *); void (*ph_command) (struct IsdnCardState *, u8, char *);
void (*setIrqMask) (struct IsdnCardState *, u_char); void (*setIrqMask) (struct IsdnCardState *, u8);
}; };
struct icc_chip { struct icc_chip {
int ph_state; int ph_state;
u_char *mon_tx; u8 *mon_tx;
u_char *mon_rx; u8 *mon_rx;
int mon_txp; int mon_txp;
int mon_txc; int mon_txc;
int mon_rxp; int mon_rxp;
struct arcofi_msg *arcofi_list; struct arcofi_msg *arcofi_list;
struct timer_list arcofitimer; struct timer_list arcofitimer;
wait_queue_head_t arcofi_wait; wait_queue_head_t arcofi_wait;
u_char arcofi_bc; u8 arcofi_bc;
u_char arcofi_state; u8 arcofi_state;
u_char mocr; u8 mocr;
u_char adf2; u8 adf2;
}; };
struct dc_hw_ops { struct dc_hw_ops {
...@@ -925,10 +925,10 @@ struct IsdnCardState { ...@@ -925,10 +925,10 @@ struct IsdnCardState {
} hw; } hw;
int myid; int myid;
isdn_if iif; isdn_if iif;
u_char *status_buf; u8 *status_buf;
u_char *status_read; u8 *status_read;
u_char *status_write; u8 *status_write;
u_char *status_end; u8 *status_end;
struct dc_hw_ops *dc_hw_ops; struct dc_hw_ops *dc_hw_ops;
struct bc_hw_ops *bc_hw_ops; struct bc_hw_ops *bc_hw_ops;
void (*BC_Send_Data) (struct BCState *); void (*BC_Send_Data) (struct BCState *);
...@@ -954,7 +954,7 @@ struct IsdnCardState { ...@@ -954,7 +954,7 @@ struct IsdnCardState {
struct amd7930_chip amd7930; struct amd7930_chip amd7930;
struct icc_chip icc; struct icc_chip icc;
} dc; } dc;
u_char *rcvbuf; u8 *rcvbuf;
int rcvidx; int rcvidx;
struct sk_buff *tx_skb; struct sk_buff *tx_skb;
int tx_cnt; int tx_cnt;
...@@ -1327,8 +1327,8 @@ void setstack_l3dc(struct PStack *st, struct Channel *chanp); ...@@ -1327,8 +1327,8 @@ void setstack_l3dc(struct PStack *st, struct Channel *chanp);
void setstack_l3bc(struct PStack *st, struct Channel *chanp); void setstack_l3bc(struct PStack *st, struct Channel *chanp);
void releasestack_isdnl3(struct PStack *st); void releasestack_isdnl3(struct PStack *st);
u_char *findie(u_char * p, int size, u_char ie, int wanted_set); u8 *findie(u8 * p, int size, u8 ie, int wanted_set);
int getcallref(u_char * p); int getcallref(u8 * p);
int newcallref(void); int newcallref(void);
int FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount); int FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount);
...@@ -1348,10 +1348,10 @@ int HiSax_writebuf_skb(int id, int chan, int ack, struct sk_buff *skb); ...@@ -1348,10 +1348,10 @@ int HiSax_writebuf_skb(int id, int chan, int ack, struct sk_buff *skb);
void HiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, ...); void HiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, ...);
void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, va_list args); void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, va_list args);
void HiSax_reportcard(int cardnr, int sel); void HiSax_reportcard(int cardnr, int sel);
int QuickHex(char *txt, u_char * p, int cnt); int QuickHex(char *txt, u8 * p, int cnt);
void LogFrame(struct IsdnCardState *cs, u_char * p, int size); void LogFrame(struct IsdnCardState *cs, u8 * p, int size);
void dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir); void dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir);
void iecpy(u_char * dest, u_char * iestart, int ieoffset); void iecpy(u8 * dest, u8 * iestart, int ieoffset);
#ifdef ISDN_CHIP_ISAC #ifdef ISDN_CHIP_ISAC
void setstack_isac(struct PStack *st, struct IsdnCardState *cs); void setstack_isac(struct PStack *st, struct IsdnCardState *cs);
#endif /* ISDN_CHIP_ISAC */ #endif /* ISDN_CHIP_ISAC */
......
drivers/isdn/hisax/hisax_debug.h
View file @ 9ca46b71
...@@ -39,7 +39,7 @@ printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \ ...@@ -39,7 +39,7 @@ printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
static void __attribute__((unused)) static void __attribute__((unused))
dump_packet(const char *name,const u_char *data,int pkt_len) dump_packet(const char *name,const u8 *data,int pkt_len)
{ {
#define DUMP_HDR_SIZE 20 #define DUMP_HDR_SIZE 20
#define DUMP_TLR_SIZE 8 #define DUMP_TLR_SIZE 8
......
drivers/isdn/hisax/hisax_fcclassic.c
View file @ 9ca46b71
...@@ -86,8 +86,8 @@ fcclassic_write_isac_fifo(struct isac *isac, unsigned char * data, int size) ...@@ -86,8 +86,8 @@ fcclassic_write_isac_fifo(struct isac *isac, unsigned char * data, int size)
outsb(adapter->isac_fifo, data, size); outsb(adapter->isac_fifo, data, size);
} }
static u_char static u8
fcclassic_read_hscx(struct hscx *hscx, u_char offset) fcclassic_read_hscx(struct hscx *hscx, u8 offset)
{ {
struct fritz_adapter *adapter = hscx->priv; struct fritz_adapter *adapter = hscx->priv;
...@@ -95,7 +95,7 @@ fcclassic_read_hscx(struct hscx *hscx, u_char offset) ...@@ -95,7 +95,7 @@ fcclassic_read_hscx(struct hscx *hscx, u_char offset)
} }
static void static void
fcclassic_write_hscx(struct hscx *hscx, u_char offset, u_char value) fcclassic_write_hscx(struct hscx *hscx, u8 offset, u8 value)
{ {
struct fritz_adapter *adapter = hscx->priv; struct fritz_adapter *adapter = hscx->priv;
......
drivers/isdn/hisax/hisax_fcpcipnp.h
View file @ 9ca46b71
...@@ -12,15 +12,15 @@ enum { ...@@ -12,15 +12,15 @@ enum {
struct hdlc_stat_reg { struct hdlc_stat_reg {
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
u_char fill __attribute__((packed)); u8 fill __attribute__((packed));
u_char mode __attribute__((packed)); u8 mode __attribute__((packed));
u_char xml __attribute__((packed)); u8 xml __attribute__((packed));
u_char cmd __attribute__((packed)); u8 cmd __attribute__((packed));
#else #else
u_char cmd __attribute__((packed)); u8 cmd __attribute__((packed));
u_char xml __attribute__((packed)); u8 xml __attribute__((packed));
u_char mode __attribute__((packed)); u8 mode __attribute__((packed));
u_char fill __attribute__((packed)); u8 fill __attribute__((packed));
#endif #endif
}; };
...@@ -36,7 +36,7 @@ struct fritz_bcs { ...@@ -36,7 +36,7 @@ struct fritz_bcs {
} ctrl; } ctrl;
u_int stat; u_int stat;
int rcvidx; int rcvidx;
u_char rcvbuf[HSCX_BUFMAX]; /* B-Channel receive Buffer */ u8 rcvbuf[HSCX_BUFMAX]; /* B-Channel receive Buffer */
int tx_cnt; /* B-Channel transmit counter */ int tx_cnt; /* B-Channel transmit counter */
struct sk_buff *tx_skb; /* B-Channel transmit Buffer */ struct sk_buff *tx_skb; /* B-Channel transmit Buffer */
......
drivers/isdn/hisax/hisax_hscx.c
View file @ 9ca46b71
...@@ -113,7 +113,7 @@ static void hscx_version(struct hscx *hscx) ...@@ -113,7 +113,7 @@ static void hscx_version(struct hscx *hscx)
static void hscx_empty_fifo(struct hscx *hscx, int count) static void hscx_empty_fifo(struct hscx *hscx, int count)
{ {
u_char *ptr; u8 *ptr;
DBG(DBG_IRQ, "count %d", count); DBG(DBG_IRQ, "count %d", count);
......
drivers/isdn/hisax/hisax_hscx.h
View file @ 9ca46b71
...@@ -16,16 +16,16 @@ struct hscx { ...@@ -16,16 +16,16 @@ struct hscx {
struct hisax_b_if b_if; struct hisax_b_if b_if;
int mode; int mode;
int channel; int channel;
u_char tsaxr; u8 tsaxr;
struct sk_buff *tx_skb; struct sk_buff *tx_skb;
int tx_cnt; int tx_cnt;
u_char rcvbuf[HSCX_BUFMAX]; u8 rcvbuf[HSCX_BUFMAX];
int rcvidx; int rcvidx;
u_char (*read_hscx) (struct hscx *, u_char); u8 (*read_hscx) (struct hscx *, u8);
void (*write_hscx) (struct hscx *, u_char, u_char); void (*write_hscx) (struct hscx *, u8, u8);
void (*read_hscx_fifo) (struct hscx *, u_char *, int); void (*read_hscx_fifo) (struct hscx *, u8 *, int);
void (*write_hscx_fifo)(struct hscx *, u_char *, int); void (*write_hscx_fifo)(struct hscx *, u8 *, int);
}; };
void hscx_init(struct hscx *hscx); void hscx_init(struct hscx *hscx);
......
drivers/isdn/hisax/hisax_isac.c
View file @ 9ca46b71
...@@ -450,7 +450,7 @@ static void isac_empty_fifo(struct isac *isac, int count) ...@@ -450,7 +450,7 @@ static void isac_empty_fifo(struct isac *isac, int count)
{ {
// this also works for isacsx, since // this also works for isacsx, since
// CMDR(D) register works the same // CMDR(D) register works the same
u_char *ptr; u8 *ptr;
DBG(DBG_IRQ, "count %d", count); DBG(DBG_IRQ, "count %d", count);
...@@ -474,7 +474,7 @@ static void isac_fill_fifo(struct isac *isac) ...@@ -474,7 +474,7 @@ static void isac_fill_fifo(struct isac *isac)
int count; int count;
unsigned char cmd; unsigned char cmd;
u_char *ptr; u8 *ptr;
if (!isac->tx_skb) if (!isac->tx_skb)
BUG(); BUG();
......
drivers/isdn/hisax/hisax_isac.h
View file @ 9ca46b71
...@@ -17,20 +17,20 @@ struct isac { ...@@ -17,20 +17,20 @@ struct isac {
struct hisax_d_if hisax_d_if; struct hisax_d_if hisax_d_if;
struct FsmInst l1m; struct FsmInst l1m;
struct FsmTimer timer; struct FsmTimer timer;
u_char mocr; u8 mocr;
u_char adf2; u8 adf2;
int type; int type;
u_char rcvbuf[MAX_DFRAME_LEN_L1]; u8 rcvbuf[MAX_DFRAME_LEN_L1];
int rcvidx; int rcvidx;
struct sk_buff *tx_skb; struct sk_buff *tx_skb;
int tx_cnt; int tx_cnt;
u_char (*read_isac) (struct isac *, u_char); u8 (*read_isac) (struct isac *, u8);
void (*write_isac) (struct isac *, u_char, u_char); void (*write_isac) (struct isac *, u8, u8);
void (*read_isac_fifo) (struct isac *, u_char *, int); void (*read_isac_fifo) (struct isac *, u8 *, int);
void (*write_isac_fifo)(struct isac *, u_char *, int); void (*write_isac_fifo)(struct isac *, u8 *, int);
}; };
void isac_init(struct isac *isac); void isac_init(struct isac *isac);
......
drivers/isdn/hisax/hscx_irq.c
View file @ 9ca46b71
...@@ -41,7 +41,7 @@ waitforXFW(struct IsdnCardState *cs, int hscx) ...@@ -41,7 +41,7 @@ waitforXFW(struct IsdnCardState *cs, int hscx)
} }
static inline void static inline void
WriteHSCXCMDR(struct IsdnCardState *cs, int hscx, u_char data) WriteHSCXCMDR(struct IsdnCardState *cs, int hscx, u8 data)
{ {
waitforCEC(cs, hscx); waitforCEC(cs, hscx);
WRITEHSCX(cs, hscx, HSCX_CMDR, data); WRITEHSCX(cs, hscx, HSCX_CMDR, data);
...@@ -51,7 +51,7 @@ WriteHSCXCMDR(struct IsdnCardState *cs, int hscx, u_char data) ...@@ -51,7 +51,7 @@ WriteHSCXCMDR(struct IsdnCardState *cs, int hscx, u_char data)
static void static void
hscx_empty_fifo(struct BCState *bcs, int count) hscx_empty_fifo(struct BCState *bcs, int count)
{ {
u_char *ptr; u8 *ptr;
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO))
...@@ -84,7 +84,7 @@ hscx_fill_fifo(struct BCState *bcs) ...@@ -84,7 +84,7 @@ hscx_fill_fifo(struct BCState *bcs)
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
int more, count; int more, count;
int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32; int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32;
u_char *ptr; u8 *ptr;
if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO))
debugl1(cs, "hscx_fill_fifo"); debugl1(cs, "hscx_fill_fifo");
...@@ -119,9 +119,9 @@ hscx_fill_fifo(struct BCState *bcs) ...@@ -119,9 +119,9 @@ hscx_fill_fifo(struct BCState *bcs)
} }
static inline void static inline void
hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx) hscx_interrupt(struct IsdnCardState *cs, u8 val, u8 hscx)
{ {
u_char r; u8 r;
struct BCState *bcs = cs->bcs + hscx; struct BCState *bcs = cs->bcs + hscx;
struct sk_buff *skb; struct sk_buff *skb;
int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32; int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32;
...@@ -202,10 +202,10 @@ reset_xmit(struct BCState *bcs) ...@@ -202,10 +202,10 @@ reset_xmit(struct BCState *bcs)
} }
static inline void static inline void
hscx_int_main(struct IsdnCardState *cs, u_char val) hscx_int_main(struct IsdnCardState *cs, u8 val)
{ {
u_char exval; u8 exval;
struct BCState *bcs; struct BCState *bcs;
spin_lock(&cs->lock); spin_lock(&cs->lock);
......
drivers/isdn/hisax/icc.c
View file @ 9ca46b71
...@@ -137,7 +137,7 @@ icc_bh(void *data) ...@@ -137,7 +137,7 @@ icc_bh(void *data)
void void
icc_empty_fifo(struct IsdnCardState *cs, int count) icc_empty_fifo(struct IsdnCardState *cs, int count)
{ {
u_char *ptr; u8 *ptr;
unsigned long flags; unsigned long flags;
if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO)) if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO))
...@@ -191,9 +191,9 @@ icc_fill_fifo(struct IsdnCardState *cs) ...@@ -191,9 +191,9 @@ icc_fill_fifo(struct IsdnCardState *cs)
} }
void void
icc_interrupt(struct IsdnCardState *cs, u_char val) icc_interrupt(struct IsdnCardState *cs, u8 val)
{ {
u_char exval, v1; u8 exval, v1;
struct sk_buff *skb; struct sk_buff *skb;
unsigned int count; unsigned int count;
unsigned long flags; unsigned long flags;
......
drivers/isdn/hisax/icc.h
View file @ 9ca46b71
...@@ -67,4 +67,4 @@ ...@@ -67,4 +67,4 @@
extern void ICCVersion(struct IsdnCardState *cs, char *s); extern void ICCVersion(struct IsdnCardState *cs, char *s);
extern void initicc(struct IsdnCardState *cs); extern void initicc(struct IsdnCardState *cs);
extern void icc_interrupt(struct IsdnCardState *cs, u_char val); extern void icc_interrupt(struct IsdnCardState *cs, u8 val);
drivers/isdn/hisax/ipacx.c
View file @ 9ca46b71
...@@ -45,7 +45,7 @@ static void __devinit dch_setstack(struct PStack *st, struct IsdnCardState *cs); ...@@ -45,7 +45,7 @@ static void __devinit dch_setstack(struct PStack *st, struct IsdnCardState *cs);
static void __devinit dch_init(struct IsdnCardState *cs); static void __devinit dch_init(struct IsdnCardState *cs);
static void bch_l2l1(struct PStack *st, int pr, void *arg); static void bch_l2l1(struct PStack *st, int pr, void *arg);
static void bch_empty_fifo(struct BCState *bcs, int count); static void bch_empty_fifo(struct BCState *bcs, int count);
static void bch_int(struct IsdnCardState *cs, u_char hscx); static void bch_int(struct IsdnCardState *cs, u8 hscx);
static void bch_mode(struct BCState *bcs, int mode, int bc); static void bch_mode(struct BCState *bcs, int mode, int bc);
static void bch_close_state(struct BCState *bcs); static void bch_close_state(struct BCState *bcs);
static int bch_open_state(struct IsdnCardState *cs, struct BCState *bcs); static int bch_open_state(struct IsdnCardState *cs, struct BCState *bcs);
...@@ -112,7 +112,7 @@ ph_command(struct IsdnCardState *cs, unsigned int command) ...@@ -112,7 +112,7 @@ ph_command(struct IsdnCardState *cs, unsigned int command)
static inline void static inline void
cic_int(struct IsdnCardState *cs) cic_int(struct IsdnCardState *cs)
{ {
u_char event; u8 event;
event = ipacx_read_reg(cs, IPACX_CIR0) >> 4; event = ipacx_read_reg(cs, IPACX_CIR0) >> 4;
if (cs->debug &L1_DEB_ISAC) debugl1(cs, "cic_int(event=%#x)", event); if (cs->debug &L1_DEB_ISAC) debugl1(cs, "cic_int(event=%#x)", event);
...@@ -132,7 +132,7 @@ dch_l2l1(struct PStack *st, int pr, void *arg) ...@@ -132,7 +132,7 @@ dch_l2l1(struct PStack *st, int pr, void *arg)
{ {
struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware; struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware;
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
u_char cda1_cr, cda2_cr; u8 cda1_cr, cda2_cr;
switch (pr) { switch (pr) {
case (PH_DATA |REQUEST): case (PH_DATA |REQUEST):
...@@ -305,7 +305,7 @@ dch_bh(void *data) ...@@ -305,7 +305,7 @@ dch_bh(void *data)
static void static void
dch_empty_fifo(struct IsdnCardState *cs, int count) dch_empty_fifo(struct IsdnCardState *cs, int count)
{ {
u_char *ptr; u8 *ptr;
if ((cs->debug &L1_DEB_ISAC) && !(cs->debug &L1_DEB_ISAC_FIFO)) if ((cs->debug &L1_DEB_ISAC) && !(cs->debug &L1_DEB_ISAC_FIFO))
debugl1(cs, "dch_empty_fifo()"); debugl1(cs, "dch_empty_fifo()");
...@@ -373,7 +373,7 @@ static inline void ...@@ -373,7 +373,7 @@ static inline void
dch_int(struct IsdnCardState *cs) dch_int(struct IsdnCardState *cs)
{ {
struct sk_buff *skb; struct sk_buff *skb;
u_char istad, rstad; u8 istad, rstad;
int count; int count;
istad = ipacx_read_reg(cs, IPACX_ISTAD); istad = ipacx_read_reg(cs, IPACX_ISTAD);
...@@ -503,7 +503,7 @@ bch_l2l1(struct PStack *st, int pr, void *arg) ...@@ -503,7 +503,7 @@ bch_l2l1(struct PStack *st, int pr, void *arg)
static void static void
bch_empty_fifo(struct BCState *bcs, int count) bch_empty_fifo(struct BCState *bcs, int count)
{ {
u_char *ptr, hscx; u8 *ptr, hscx;
struct IsdnCardState *cs; struct IsdnCardState *cs;
int cnt; int cnt;
...@@ -569,13 +569,13 @@ reset_xmit(struct BCState *bcs) ...@@ -569,13 +569,13 @@ reset_xmit(struct BCState *bcs)
} }
static void static void
bch_int(struct IsdnCardState *cs, u_char hscx) bch_int(struct IsdnCardState *cs, u8 hscx)
{ {
u_char istab; u8 istab;
struct BCState *bcs; struct BCState *bcs;
struct sk_buff *skb; struct sk_buff *skb;
int count; int count;
u_char rstab; u8 rstab;
bcs = cs->bcs + hscx; bcs = cs->bcs + hscx;
istab = ipacx_bc_read_reg(bcs, IPACX_ISTAB); istab = ipacx_bc_read_reg(bcs, IPACX_ISTAB);
...@@ -787,7 +787,7 @@ bch_init(struct IsdnCardState *cs, int hscx) ...@@ -787,7 +787,7 @@ bch_init(struct IsdnCardState *cs, int hscx)
void void
interrupt_ipacx(struct IsdnCardState *cs) interrupt_ipacx(struct IsdnCardState *cs)
{ {
u_char ista; u8 ista;
spin_lock(&cs->lock); spin_lock(&cs->lock);
while ((ista = ipacx_read_reg(cs, IPACX_ISTA))) { while ((ista = ipacx_read_reg(cs, IPACX_ISTA))) {
......
drivers/isdn/hisax/isac.c
View file @ 9ca46b71
...@@ -116,7 +116,7 @@ isac_bh(void *data) ...@@ -116,7 +116,7 @@ isac_bh(void *data)
void void
isac_empty_fifo(struct IsdnCardState *cs, int count) isac_empty_fifo(struct IsdnCardState *cs, int count)
{ {
u_char *ptr; u8 *ptr;
if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO)) if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO))
debugl1(cs, "isac_empty_fifo"); debugl1(cs, "isac_empty_fifo");
...@@ -164,9 +164,9 @@ isac_fill_fifo(struct IsdnCardState *cs) ...@@ -164,9 +164,9 @@ isac_fill_fifo(struct IsdnCardState *cs)
} }
void void
isac_interrupt(struct IsdnCardState *cs, u_char val) isac_interrupt(struct IsdnCardState *cs, u8 val)
{ {
u_char exval, v1; u8 exval, v1;
struct sk_buff *skb; struct sk_buff *skb;
unsigned int count; unsigned int count;
......
drivers/isdn/hisax/isac.h
View file @ 9ca46b71
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
extern void ISACVersion(struct IsdnCardState *cs, char *s); extern void ISACVersion(struct IsdnCardState *cs, char *s);
extern void initisac(struct IsdnCardState *cs); extern void initisac(struct IsdnCardState *cs);
extern void isac_interrupt(struct IsdnCardState *cs, u_char val); extern void isac_interrupt(struct IsdnCardState *cs, u8 val);
static inline u8 static inline u8
isac_read_reg(struct IsdnCardState *cs, u8 addr) isac_read_reg(struct IsdnCardState *cs, u8 addr)
......
drivers/isdn/hisax/isar.c
View file @ 9ca46b71
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
#define ETX 0x03 #define ETX 0x03
const u_char faxmodulation_s[] = "3,24,48,72,73,74,96,97,98,121,122,145,146"; const u8 faxmodulation_s[] = "3,24,48,72,73,74,96,97,98,121,122,145,146";
const u_char faxmodulation[] = {3,24,48,72,73,74,96,97,98,121,122,145,146}; const u8 faxmodulation[] = {3,24,48,72,73,74,96,97,98,121,122,145,146};
#define FAXMODCNT 13 #define FAXMODCNT 13
void isar_setup(struct IsdnCardState *cs); void isar_setup(struct IsdnCardState *cs);
static void isar_pump_cmd(struct BCState *bcs, u_char cmd, u_char para); static void isar_pump_cmd(struct BCState *bcs, u8 cmd, u8 para);
static inline void ll_deliver_faxstat(struct BCState *bcs, u_char status); static inline void ll_deliver_faxstat(struct BCState *bcs, u8 status);
static spinlock_t isar_lock = SPIN_LOCK_UNLOCKED; static spinlock_t isar_lock = SPIN_LOCK_UNLOCKED;
static inline u8 static inline u8
...@@ -57,8 +57,8 @@ waitforHIA(struct IsdnCardState *cs, int timeout) ...@@ -57,8 +57,8 @@ waitforHIA(struct IsdnCardState *cs, int timeout)
int int
sendmsg(struct IsdnCardState *cs, u_char his, u_char creg, u_char len, sendmsg(struct IsdnCardState *cs, u8 his, u8 creg, u8 len,
u_char *msg) u8 *msg)
{ {
unsigned long flags; unsigned long flags;
int i; int i;
...@@ -100,7 +100,7 @@ sendmsg(struct IsdnCardState *cs, u_char his, u_char creg, u_char len, ...@@ -100,7 +100,7 @@ sendmsg(struct IsdnCardState *cs, u_char his, u_char creg, u_char len,
/* Call only with IRQ disabled !!! */ /* Call only with IRQ disabled !!! */
inline void inline void
rcv_mbox(struct IsdnCardState *cs, struct isar_reg *ireg, u_char *msg) rcv_mbox(struct IsdnCardState *cs, struct isar_reg *ireg, u8 *msg)
{ {
int i; int i;
...@@ -142,8 +142,8 @@ get_irq_infos(struct IsdnCardState *cs, struct isar_reg *ireg) ...@@ -142,8 +142,8 @@ get_irq_infos(struct IsdnCardState *cs, struct isar_reg *ireg)
} }
int int
waitrecmsg(struct IsdnCardState *cs, u_char *len, waitrecmsg(struct IsdnCardState *cs, u8 *len,
u_char *msg, int maxdelay) u8 *msg, int maxdelay)
{ {
int timeout = 0; int timeout = 0;
unsigned long flags; unsigned long flags;
...@@ -169,9 +169,9 @@ int ...@@ -169,9 +169,9 @@ int
ISARVersion(struct IsdnCardState *cs, char *s) ISARVersion(struct IsdnCardState *cs, char *s)
{ {
int ver; int ver;
u_char msg[] = ISAR_MSG_HWVER; u8 msg[] = ISAR_MSG_HWVER;
u_char tmp[64]; u8 tmp[64];
u_char len; u8 len;
int debug; int debug;
cs->cardmsg(cs, CARD_RESET, NULL); cs->cardmsg(cs, CARD_RESET, NULL);
...@@ -196,13 +196,13 @@ ISARVersion(struct IsdnCardState *cs, char *s) ...@@ -196,13 +196,13 @@ ISARVersion(struct IsdnCardState *cs, char *s)
} }
int int
isar_load_firmware(struct IsdnCardState *cs, u_char *buf) isar_load_firmware(struct IsdnCardState *cs, u8 *buf)
{ {
int ret, size, cnt, debug; int ret, size, cnt, debug;
u_char len, nom, noc; u8 len, nom, noc;
u_short sadr, left, *sp; u_short sadr, left, *sp;
u_char *p = buf; u8 *p = buf;
u_char *msg, *tmpmsg, *mp, tmp[64]; u8 *msg, *tmpmsg, *mp, tmp[64];
struct isar_reg *ireg = cs->bcs[0].hw.isar.reg; struct isar_reg *ireg = cs->bcs[0].hw.isar.reg;
struct {u_short sadr; struct {u_short sadr;
...@@ -451,7 +451,7 @@ isar_bh(void *data) ...@@ -451,7 +451,7 @@ isar_bh(void *data)
static inline void static inline void
send_DLE_ETX(struct BCState *bcs) send_DLE_ETX(struct BCState *bcs)
{ {
u_char dleetx[2] = {DLE,ETX}; u8 dleetx[2] = {DLE,ETX};
struct sk_buff *skb; struct sk_buff *skb;
if ((skb = dev_alloc_skb(2))) { if ((skb = dev_alloc_skb(2))) {
...@@ -487,7 +487,7 @@ insert_dle(unsigned char *dest, unsigned char *src, int count) { ...@@ -487,7 +487,7 @@ insert_dle(unsigned char *dest, unsigned char *src, int count) {
static inline void static inline void
isar_rcv_frame(struct IsdnCardState *cs, struct BCState *bcs) isar_rcv_frame(struct IsdnCardState *cs, struct BCState *bcs)
{ {
u_char *ptr; u8 *ptr;
struct sk_buff *skb; struct sk_buff *skb;
struct isar_reg *ireg = bcs->hw.isar.reg; struct isar_reg *ireg = bcs->hw.isar.reg;
...@@ -507,7 +507,7 @@ isar_rcv_frame(struct IsdnCardState *cs, struct BCState *bcs) ...@@ -507,7 +507,7 @@ isar_rcv_frame(struct IsdnCardState *cs, struct BCState *bcs)
case L1_MODE_TRANS: case L1_MODE_TRANS:
case L1_MODE_V32: case L1_MODE_V32:
if ((skb = dev_alloc_skb(ireg->clsb))) { if ((skb = dev_alloc_skb(ireg->clsb))) {
rcv_mbox(cs, ireg, (u_char *)skb_put(skb, ireg->clsb)); rcv_mbox(cs, ireg, (u8 *)skb_put(skb, ireg->clsb));
skb_queue_tail(&bcs->rqueue, skb); skb_queue_tail(&bcs->rqueue, skb);
sched_b_event(bcs, B_RCVBUFREADY); sched_b_event(bcs, B_RCVBUFREADY);
} else { } else {
...@@ -572,7 +572,7 @@ isar_rcv_frame(struct IsdnCardState *cs, struct BCState *bcs) ...@@ -572,7 +572,7 @@ isar_rcv_frame(struct IsdnCardState *cs, struct BCState *bcs)
debugl1(cs, "isar_rcv_frame: raw(%d) dle(%d)", debugl1(cs, "isar_rcv_frame: raw(%d) dle(%d)",
ireg->clsb, bcs->hw.isar.rcvidx); ireg->clsb, bcs->hw.isar.rcvidx);
if ((skb = dev_alloc_skb(bcs->hw.isar.rcvidx))) { if ((skb = dev_alloc_skb(bcs->hw.isar.rcvidx))) {
insert_dle((u_char *)skb_put(skb, bcs->hw.isar.rcvidx), insert_dle((u8 *)skb_put(skb, bcs->hw.isar.rcvidx),
bcs->hw.isar.rcvbuf, ireg->clsb); bcs->hw.isar.rcvbuf, ireg->clsb);
skb_queue_tail(&bcs->rqueue, skb); skb_queue_tail(&bcs->rqueue, skb);
sched_b_event(bcs, B_RCVBUFREADY); sched_b_event(bcs, B_RCVBUFREADY);
...@@ -630,7 +630,7 @@ isar_rcv_frame(struct IsdnCardState *cs, struct BCState *bcs) ...@@ -630,7 +630,7 @@ isar_rcv_frame(struct IsdnCardState *cs, struct BCState *bcs)
} else if (!(skb = dev_alloc_skb(bcs->hw.isar.rcvidx))) { } else if (!(skb = dev_alloc_skb(bcs->hw.isar.rcvidx))) {
printk(KERN_WARNING "ISAR: receive out of memory\n"); printk(KERN_WARNING "ISAR: receive out of memory\n");
} else { } else {
insert_dle((u_char *)skb_put(skb, len), insert_dle((u8 *)skb_put(skb, len),
bcs->hw.isar.rcvbuf, bcs->hw.isar.rcvbuf,
bcs->hw.isar.rcvidx); bcs->hw.isar.rcvidx);
skb_queue_tail(&bcs->rqueue, skb); skb_queue_tail(&bcs->rqueue, skb);
...@@ -665,8 +665,8 @@ isar_fill_fifo(struct BCState *bcs) ...@@ -665,8 +665,8 @@ isar_fill_fifo(struct BCState *bcs)
{ {
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
int count; int count;
u_char msb; u8 msb;
u_char *ptr; u8 *ptr;
if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO))
debugl1(cs, "isar_fill_fifo"); debugl1(cs, "isar_fill_fifo");
...@@ -737,7 +737,7 @@ isar_fill_fifo(struct BCState *bcs) ...@@ -737,7 +737,7 @@ isar_fill_fifo(struct BCState *bcs)
} }
inline inline
struct BCState *sel_bcs_isar(struct IsdnCardState *cs, u_char dpath) struct BCState *sel_bcs_isar(struct IsdnCardState *cs, u8 dpath)
{ {
if ((!dpath) || (dpath == 3)) if ((!dpath) || (dpath == 3))
return(NULL); return(NULL);
...@@ -780,7 +780,7 @@ send_frames(struct BCState *bcs) ...@@ -780,7 +780,7 @@ send_frames(struct BCState *bcs)
if (test_and_clear_bit(BC_FLG_DLEETX, &bcs->Flag)) { if (test_and_clear_bit(BC_FLG_DLEETX, &bcs->Flag)) {
if (test_and_clear_bit(BC_FLG_LASTDATA, &bcs->Flag)) { if (test_and_clear_bit(BC_FLG_LASTDATA, &bcs->Flag)) {
if (test_and_clear_bit(BC_FLG_NMD_DATA, &bcs->Flag)) { if (test_and_clear_bit(BC_FLG_NMD_DATA, &bcs->Flag)) {
u_char dummy = 0; u8 dummy = 0;
sendmsg(bcs->cs, SET_DPS(bcs->hw.isar.dpath) | sendmsg(bcs->cs, SET_DPS(bcs->hw.isar.dpath) |
ISAR_HIS_SDATA, 0x01, 1, &dummy); ISAR_HIS_SDATA, 0x01, 1, &dummy);
} }
...@@ -795,7 +795,7 @@ send_frames(struct BCState *bcs) ...@@ -795,7 +795,7 @@ send_frames(struct BCState *bcs)
} }
inline void inline void
check_send(struct IsdnCardState *cs, u_char rdm) check_send(struct IsdnCardState *cs, u8 rdm)
{ {
struct BCState *bcs; struct BCState *bcs;
...@@ -825,8 +825,8 @@ const char *dmrim[] = {"NO MOD", "NO DEF", "V32/V32b", "V22", "V21", ...@@ -825,8 +825,8 @@ const char *dmrim[] = {"NO MOD", "NO DEF", "V32/V32b", "V22", "V21",
static void static void
isar_pump_status_rsp(struct BCState *bcs, struct isar_reg *ireg) { isar_pump_status_rsp(struct BCState *bcs, struct isar_reg *ireg) {
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
u_char ril = ireg->par[0]; u8 ril = ireg->par[0];
u_char rim; u8 rim;
if (!test_and_clear_bit(ISAR_RATE_REQ, &bcs->hw.isar.reg->Flags)) if (!test_and_clear_bit(ISAR_RATE_REQ, &bcs->hw.isar.reg->Flags))
return; return;
...@@ -877,9 +877,9 @@ isar_pump_status_rsp(struct BCState *bcs, struct isar_reg *ireg) { ...@@ -877,9 +877,9 @@ isar_pump_status_rsp(struct BCState *bcs, struct isar_reg *ireg) {
} }
static void static void
isar_pump_statev_modem(struct BCState *bcs, u_char devt) { isar_pump_statev_modem(struct BCState *bcs, u8 devt) {
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
u_char dps = SET_DPS(bcs->hw.isar.dpath); u8 dps = SET_DPS(bcs->hw.isar.dpath);
switch(devt) { switch(devt) {
case PSEV_10MS_TIMER: case PSEV_10MS_TIMER:
...@@ -947,7 +947,7 @@ isar_pump_statev_modem(struct BCState *bcs, u_char devt) { ...@@ -947,7 +947,7 @@ isar_pump_statev_modem(struct BCState *bcs, u_char devt) {
} }
static inline void static inline void
ll_deliver_faxstat(struct BCState *bcs, u_char status) ll_deliver_faxstat(struct BCState *bcs, u8 status)
{ {
isdn_ctrl ic; isdn_ctrl ic;
struct Channel *chanp = (struct Channel *) bcs->st->lli.userdata; struct Channel *chanp = (struct Channel *) bcs->st->lli.userdata;
...@@ -962,10 +962,10 @@ ll_deliver_faxstat(struct BCState *bcs, u_char status) ...@@ -962,10 +962,10 @@ ll_deliver_faxstat(struct BCState *bcs, u_char status)
} }
static void static void
isar_pump_statev_fax(struct BCState *bcs, u_char devt) { isar_pump_statev_fax(struct BCState *bcs, u8 devt) {
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
u_char dps = SET_DPS(bcs->hw.isar.dpath); u8 dps = SET_DPS(bcs->hw.isar.dpath);
u_char p1; u8 p1;
switch(devt) { switch(devt) {
case PSEV_10MS_TIMER: case PSEV_10MS_TIMER:
...@@ -1188,7 +1188,7 @@ isar_int_main(struct IsdnCardState *cs) ...@@ -1188,7 +1188,7 @@ isar_int_main(struct IsdnCardState *cs)
break; break;
case ISAR_IIS_PSTEV: case ISAR_IIS_PSTEV:
if ((bcs = sel_bcs_isar(cs, ireg->iis >> 6))) { if ((bcs = sel_bcs_isar(cs, ireg->iis >> 6))) {
rcv_mbox(cs, ireg, (u_char *)ireg->par); rcv_mbox(cs, ireg, (u8 *)ireg->par);
if (bcs->mode == L1_MODE_V32) { if (bcs->mode == L1_MODE_V32) {
isar_pump_statev_modem(bcs, ireg->cmsb); isar_pump_statev_modem(bcs, ireg->cmsb);
} else if (bcs->mode == L1_MODE_FAX) { } else if (bcs->mode == L1_MODE_FAX) {
...@@ -1206,7 +1206,7 @@ isar_int_main(struct IsdnCardState *cs) ...@@ -1206,7 +1206,7 @@ isar_int_main(struct IsdnCardState *cs)
break; break;
case ISAR_IIS_PSTRSP: case ISAR_IIS_PSTRSP:
if ((bcs = sel_bcs_isar(cs, ireg->iis >> 6))) { if ((bcs = sel_bcs_isar(cs, ireg->iis >> 6))) {
rcv_mbox(cs, ireg, (u_char *)ireg->par); rcv_mbox(cs, ireg, (u8 *)ireg->par);
isar_pump_status_rsp(bcs, ireg); isar_pump_status_rsp(bcs, ireg);
} else { } else {
debugl1(cs, "isar spurious IIS_PSTRSP %x/%x/%x", debugl1(cs, "isar spurious IIS_PSTRSP %x/%x/%x",
...@@ -1217,14 +1217,14 @@ isar_int_main(struct IsdnCardState *cs) ...@@ -1217,14 +1217,14 @@ isar_int_main(struct IsdnCardState *cs)
case ISAR_IIS_DIAG: case ISAR_IIS_DIAG:
case ISAR_IIS_BSTRSP: case ISAR_IIS_BSTRSP:
case ISAR_IIS_IOM2RSP: case ISAR_IIS_IOM2RSP:
rcv_mbox(cs, ireg, (u_char *)ireg->par); rcv_mbox(cs, ireg, (u8 *)ireg->par);
if ((cs->debug & (L1_DEB_HSCX | L1_DEB_HSCX_FIFO)) if ((cs->debug & (L1_DEB_HSCX | L1_DEB_HSCX_FIFO))
== L1_DEB_HSCX) { == L1_DEB_HSCX) {
u_char *tp=debbuf; u8 *tp=debbuf;
tp += sprintf(debbuf, "msg iis(%x) msb(%x)", tp += sprintf(debbuf, "msg iis(%x) msb(%x)",
ireg->iis, ireg->cmsb); ireg->iis, ireg->cmsb);
QuickHex(tp, (u_char *)ireg->par, ireg->clsb); QuickHex(tp, (u8 *)ireg->par, ireg->clsb);
debugl1(cs, debbuf); debugl1(cs, debbuf);
} }
break; break;
...@@ -1257,8 +1257,8 @@ ftimer_handler(struct BCState *bcs) { ...@@ -1257,8 +1257,8 @@ ftimer_handler(struct BCState *bcs) {
static void static void
setup_pump(struct BCState *bcs) { setup_pump(struct BCState *bcs) {
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
u_char dps = SET_DPS(bcs->hw.isar.dpath); u8 dps = SET_DPS(bcs->hw.isar.dpath);
u_char ctrl, param[6]; u8 ctrl, param[6];
switch (bcs->mode) { switch (bcs->mode) {
case L1_MODE_NULL: case L1_MODE_NULL:
...@@ -1306,8 +1306,8 @@ setup_pump(struct BCState *bcs) { ...@@ -1306,8 +1306,8 @@ setup_pump(struct BCState *bcs) {
static void static void
setup_sart(struct BCState *bcs) { setup_sart(struct BCState *bcs) {
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
u_char dps = SET_DPS(bcs->hw.isar.dpath); u8 dps = SET_DPS(bcs->hw.isar.dpath);
u_char ctrl, param[2]; u8 ctrl, param[2];
switch (bcs->mode) { switch (bcs->mode) {
case L1_MODE_NULL: case L1_MODE_NULL:
...@@ -1340,8 +1340,8 @@ setup_sart(struct BCState *bcs) { ...@@ -1340,8 +1340,8 @@ setup_sart(struct BCState *bcs) {
static void static void
setup_iom2(struct BCState *bcs) { setup_iom2(struct BCState *bcs) {
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
u_char dps = SET_DPS(bcs->hw.isar.dpath); u8 dps = SET_DPS(bcs->hw.isar.dpath);
u_char cmsb = IOM_CTRL_ENA, msg[5] = {IOM_P1_TXD,0,0,0,0}; u8 cmsb = IOM_CTRL_ENA, msg[5] = {IOM_P1_TXD,0,0,0,0};
if (bcs->channel) if (bcs->channel)
msg[1] = msg[3] = 1; msg[1] = msg[3] = 1;
...@@ -1426,11 +1426,11 @@ modeisar(struct BCState *bcs, int mode, int bc) ...@@ -1426,11 +1426,11 @@ modeisar(struct BCState *bcs, int mode, int bc)
} }
static void static void
isar_pump_cmd(struct BCState *bcs, u_char cmd, u_char para) isar_pump_cmd(struct BCState *bcs, u8 cmd, u8 para)
{ {
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
u_char dps = SET_DPS(bcs->hw.isar.dpath); u8 dps = SET_DPS(bcs->hw.isar.dpath);
u_char ctrl = 0, nom = 0, p1 = 0; u8 ctrl = 0, nom = 0, p1 = 0;
switch(cmd) { switch(cmd) {
case ISDN_FAX_CLASS1_FTM: case ISDN_FAX_CLASS1_FTM:
...@@ -1533,7 +1533,7 @@ isar_pump_cmd(struct BCState *bcs, u_char cmd, u_char para) ...@@ -1533,7 +1533,7 @@ isar_pump_cmd(struct BCState *bcs, u_char cmd, u_char para)
void void
isar_setup(struct IsdnCardState *cs) isar_setup(struct IsdnCardState *cs)
{ {
u_char msg; u8 msg;
int i; int i;
/* Dpath 1, 2 */ /* Dpath 1, 2 */
...@@ -1726,7 +1726,7 @@ isar_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) { ...@@ -1726,7 +1726,7 @@ isar_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) {
ISDN_FEATURE_L2_FAX | ISDN_FEATURE_L2_FAX |
ISDN_FEATURE_L3_FCLASS1; ISDN_FEATURE_L3_FCLASS1;
memcpy(&adr, ic->parm.num, sizeof(ulong)); memcpy(&adr, ic->parm.num, sizeof(ulong));
if (isar_load_firmware(cs, (u_char *)adr)) if (isar_load_firmware(cs, (u8 *)adr))
return(1); return(1);
else else
ll_run(cs, features); ll_run(cs, features);
......
drivers/isdn/hisax/isdnl1.c
View file @ 9ca46b71
...@@ -366,7 +366,7 @@ init_bcstate(struct IsdnCardState *cs, ...@@ -366,7 +366,7 @@ init_bcstate(struct IsdnCardState *cs,
#ifdef L2FRAME_DEBUG /* psa */ #ifdef L2FRAME_DEBUG /* psa */
char * char *
l2cmd(u_char cmd) l2cmd(u8 cmd)
{ {
switch (cmd & ~0x10) { switch (cmd & ~0x10) {
case 1: case 1:
...@@ -400,7 +400,7 @@ l2cmd(u_char cmd) ...@@ -400,7 +400,7 @@ l2cmd(u_char cmd)
static char tmpdeb[32]; static char tmpdeb[32];
char * char *
l2frames(u_char * ptr) l2frames(u8 * ptr)
{ {
switch (ptr[2] & ~0x10) { switch (ptr[2] & ~0x10) {
case 1: case 1:
...@@ -432,7 +432,7 @@ l2frames(u_char * ptr) ...@@ -432,7 +432,7 @@ l2frames(u_char * ptr)
void void
Logl2Frame(struct IsdnCardState *cs, struct sk_buff *skb, char *buf, int dir) Logl2Frame(struct IsdnCardState *cs, struct sk_buff *skb, char *buf, int dir)
{ {
u_char *ptr; u8 *ptr;
ptr = skb->data; ptr = skb->data;
......
drivers/isdn/hisax/isdnl2.c
View file @ 9ca46b71
...@@ -192,9 +192,9 @@ l2addrsize(struct Layer2 *l2) ...@@ -192,9 +192,9 @@ l2addrsize(struct Layer2 *l2)
} }
static int static int
sethdraddr(struct Layer2 *l2, u_char * header, int rsp) sethdraddr(struct Layer2 *l2, u8 * header, int rsp)
{ {
u_char *ptr = header; u8 *ptr = header;
int crbit = rsp; int crbit = rsp;
if (test_bit(FLG_LAPD, &l2->flag)) { if (test_bit(FLG_LAPD, &l2->flag)) {
...@@ -224,31 +224,31 @@ enqueue_super(struct PStack *st, ...@@ -224,31 +224,31 @@ enqueue_super(struct PStack *st,
#define enqueue_ui(a, b) enqueue_super(a, b) #define enqueue_ui(a, b) enqueue_super(a, b)
inline int inline int
IsUI(u_char * data) IsUI(u8 * data)
{ {
return ((data[0] & 0xef) == UI); return ((data[0] & 0xef) == UI);
} }
inline int inline int
IsUA(u_char * data) IsUA(u8 * data)
{ {
return ((data[0] & 0xef) == UA); return ((data[0] & 0xef) == UA);
} }
inline int inline int
IsDM(u_char * data) IsDM(u8 * data)
{ {
return ((data[0] & 0xef) == DM); return ((data[0] & 0xef) == DM);
} }
inline int inline int
IsDISC(u_char * data) IsDISC(u8 * data)
{ {
return ((data[0] & 0xef) == DISC); return ((data[0] & 0xef) == DISC);
} }
inline int inline int
IsRR(u_char * data, struct PStack *st) IsRR(u8 * data, struct PStack *st)
{ {
if (test_bit(FLG_MOD128, &st->l2.flag)) if (test_bit(FLG_MOD128, &st->l2.flag))
return (data[0] == RR); return (data[0] == RR);
...@@ -257,9 +257,9 @@ IsRR(u_char * data, struct PStack *st) ...@@ -257,9 +257,9 @@ IsRR(u_char * data, struct PStack *st)
} }
inline int inline int
IsSFrame(u_char * data, struct PStack *st) IsSFrame(u8 * data, struct PStack *st)
{ {
register u_char d = *data; register u8 d = *data;
if (!test_bit(FLG_MOD128, &st->l2.flag)) if (!test_bit(FLG_MOD128, &st->l2.flag))
d &= 0xf; d &= 0xf;
...@@ -267,27 +267,27 @@ IsSFrame(u_char * data, struct PStack *st) ...@@ -267,27 +267,27 @@ IsSFrame(u_char * data, struct PStack *st)
} }
inline int inline int
IsSABME(u_char * data, struct PStack *st) IsSABME(u8 * data, struct PStack *st)
{ {
u_char d = data[0] & ~0x10; u8 d = data[0] & ~0x10;
return (test_bit(FLG_MOD128, &st->l2.flag) ? d == SABME : d == SABM); return (test_bit(FLG_MOD128, &st->l2.flag) ? d == SABME : d == SABM);
} }
inline int inline int
IsREJ(u_char * data, struct PStack *st) IsREJ(u8 * data, struct PStack *st)
{ {
return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == REJ : (data[0] & 0xf) == REJ); return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == REJ : (data[0] & 0xf) == REJ);
} }
inline int inline int
IsFRMR(u_char * data) IsFRMR(u8 * data)
{ {
return ((data[0] & 0xef) == FRMR); return ((data[0] & 0xef) == FRMR);
} }
inline int inline int
IsRNR(u_char * data, struct PStack *st) IsRNR(u8 * data, struct PStack *st)
{ {
return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == RNR : (data[0] & 0xf) == RNR); return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == RNR : (data[0] & 0xf) == RNR);
} }
...@@ -361,7 +361,7 @@ int ...@@ -361,7 +361,7 @@ int
FRMR_error(struct PStack *st, struct sk_buff *skb) FRMR_error(struct PStack *st, struct sk_buff *skb)
{ {
int headers = l2addrsize(&st->l2) + 1; int headers = l2addrsize(&st->l2) + 1;
u_char *datap = skb->data + headers; u8 *datap = skb->data + headers;
int rsp = *skb->data & 0x2; int rsp = *skb->data & 0x2;
if (test_bit(FLG_ORIG, &st->l2.flag)) if (test_bit(FLG_ORIG, &st->l2.flag))
...@@ -420,10 +420,10 @@ setva(struct PStack *st, unsigned int nr) ...@@ -420,10 +420,10 @@ setva(struct PStack *st, unsigned int nr)
} }
static void static void
send_uframe(struct PStack *st, u_char cmd, u_char cr) send_uframe(struct PStack *st, u8 cmd, u8 cr)
{ {
struct sk_buff *skb; struct sk_buff *skb;
u_char tmp[MAX_HEADER_LEN]; u8 tmp[MAX_HEADER_LEN];
int i; int i;
i = sethdraddr(&st->l2, tmp, cr); i = sethdraddr(&st->l2, tmp, cr);
...@@ -436,7 +436,7 @@ send_uframe(struct PStack *st, u_char cmd, u_char cr) ...@@ -436,7 +436,7 @@ send_uframe(struct PStack *st, u_char cmd, u_char cr)
enqueue_super(st, skb); enqueue_super(st, skb);
} }
inline u_char inline u8
get_PollFlag(struct PStack * st, struct sk_buff * skb) get_PollFlag(struct PStack * st, struct sk_buff * skb)
{ {
return (skb->data[l2addrsize(&(st->l2))] & 0x10); return (skb->data[l2addrsize(&(st->l2))] & 0x10);
...@@ -449,10 +449,10 @@ FreeSkb(struct sk_buff *skb) ...@@ -449,10 +449,10 @@ FreeSkb(struct sk_buff *skb)
} }
inline u_char inline u8
get_PollFlagFree(struct PStack *st, struct sk_buff *skb) get_PollFlagFree(struct PStack *st, struct sk_buff *skb)
{ {
u_char PF; u8 PF;
PF = get_PollFlag(st, skb); PF = get_PollFlag(st, skb);
FreeSkb(skb); FreeSkb(skb);
...@@ -505,7 +505,7 @@ static void ...@@ -505,7 +505,7 @@ static void
establishlink(struct FsmInst *fi) establishlink(struct FsmInst *fi)
{ {
struct PStack *st = fi->userdata; struct PStack *st = fi->userdata;
u_char cmd; u8 cmd;
clear_exception(&st->l2); clear_exception(&st->l2);
st->l2.rc = 0; st->l2.rc = 0;
...@@ -599,7 +599,7 @@ static void ...@@ -599,7 +599,7 @@ static void
tx_ui(struct PStack *st) tx_ui(struct PStack *st)
{ {
struct sk_buff *skb; struct sk_buff *skb;
u_char header[MAX_HEADER_LEN]; u8 header[MAX_HEADER_LEN];
int i; int i;
i = sethdraddr(&(st->l2), header, CMD); i = sethdraddr(&(st->l2), header, CMD);
...@@ -882,11 +882,11 @@ l2_st6_dm_release(struct FsmInst *fi, int event, void *arg) ...@@ -882,11 +882,11 @@ l2_st6_dm_release(struct FsmInst *fi, int event, void *arg)
} }
inline void inline void
enquiry_cr(struct PStack *st, u_char typ, u_char cr, u_char pf) enquiry_cr(struct PStack *st, u8 typ, u8 cr, u8 pf)
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct Layer2 *l2; struct Layer2 *l2;
u_char tmp[MAX_HEADER_LEN]; u8 tmp[MAX_HEADER_LEN];
int i; int i;
l2 = &st->l2; l2 = &st->l2;
...@@ -1250,7 +1250,7 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg) ...@@ -1250,7 +1250,7 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
struct PStack *st = fi->userdata; struct PStack *st = fi->userdata;
struct sk_buff *skb, *oskb; struct sk_buff *skb, *oskb;
struct Layer2 *l2 = &st->l2; struct Layer2 *l2 = &st->l2;
u_char header[MAX_HEADER_LEN]; u8 header[MAX_HEADER_LEN];
int i; int i;
int unsigned p1; int unsigned p1;
unsigned long flags; unsigned long flags;
...@@ -1631,7 +1631,7 @@ static void ...@@ -1631,7 +1631,7 @@ static void
isdnl2_l1l2(struct PStack *st, int pr, void *arg) isdnl2_l1l2(struct PStack *st, int pr, void *arg)
{ {
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
u_char *datap; u8 *datap;
int ret = 1, len; int ret = 1, len;
int c = 0; int c = 0;
......
drivers/isdn/hisax/isdnl3.c
View file @ 9ca46b71
...@@ -77,11 +77,11 @@ l3m_debug(struct FsmInst *fi, char *fmt, ...) ...@@ -77,11 +77,11 @@ l3m_debug(struct FsmInst *fi, char *fmt, ...)
va_end(args); va_end(args);
} }
u_char * u8 *
findie(u_char * p, int size, u_char ie, int wanted_set) findie(u8 * p, int size, u8 ie, int wanted_set)
{ {
int l, codeset, maincodeset; int l, codeset, maincodeset;
u_char *pend = p + size; u8 *pend = p + size;
/* skip protocol discriminator, callref and message type */ /* skip protocol discriminator, callref and message type */
p++; p++;
...@@ -123,7 +123,7 @@ findie(u_char * p, int size, u_char ie, int wanted_set) ...@@ -123,7 +123,7 @@ findie(u_char * p, int size, u_char ie, int wanted_set)
} }
int int
getcallref(u_char * p) getcallref(u8 * p)
{ {
int l, cr = 0; int l, cr = 0;
......
drivers/isdn/hisax/isdnl3.h
View file @ 9ca46b71
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
struct stateentry { struct stateentry {
int state; int state;
int primitive; int primitive;
void (*rout) (struct l3_process *, u_char, void *); void (*rout) (struct l3_process *, u8, void *);
}; };
#define l3_debug(st, fmt, args...) HiSax_putstatus(st->l1.hardware, "l3 ", fmt, ## args) #define l3_debug(st, fmt, args...) HiSax_putstatus(st->l1.hardware, "l3 ", fmt, ## args)
......
drivers/isdn/hisax/isurf.c
View file @ 9ca46b71
...@@ -35,20 +35,20 @@ static const char *ISurf_revision = "$Revision: 1.10.6.2 $"; ...@@ -35,20 +35,20 @@ static const char *ISurf_revision = "$Revision: 1.10.6.2 $";
#define ISURF_IOMEM_SIZE 0x400 #define ISURF_IOMEM_SIZE 0x400
/* Interface functions */ /* Interface functions */
static u_char static u8
ReadISAC(struct IsdnCardState *cs, u_char offset) ReadISAC(struct IsdnCardState *cs, u8 offset)
{ {
return (readb(cs->hw.isurf.isac + offset)); return (readb(cs->hw.isurf.isac + offset));
} }
static void static void
WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
writeb(value, cs->hw.isurf.isac + offset); mb(); writeb(value, cs->hw.isurf.isac + offset); mb();
} }
static void static void
ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
register int i; register int i;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
...@@ -56,7 +56,7 @@ ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ...@@ -56,7 +56,7 @@ ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size)
} }
static void static void
WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
register int i; register int i;
for (i = 0; i < size; i++){ for (i = 0; i < size; i++){
...@@ -77,14 +77,14 @@ static struct dc_hw_ops isac_ops = { ...@@ -77,14 +77,14 @@ static struct dc_hw_ops isac_ops = {
* mode = 2 access with IRQ off and using last offset * mode = 2 access with IRQ off and using last offset
*/ */
static u_char static u8
ReadISAR(struct IsdnCardState *cs, int mode, u_char offset) ReadISAR(struct IsdnCardState *cs, int mode, u8 offset)
{ {
return(readb(cs->hw.isurf.isar + offset)); return(readb(cs->hw.isurf.isar + offset));
} }
static void static void
WriteISAR(struct IsdnCardState *cs, int mode, u_char offset, u_char value) WriteISAR(struct IsdnCardState *cs, int mode, u8 offset, u8 value)
{ {
writeb(value, cs->hw.isurf.isar + offset);mb(); writeb(value, cs->hw.isurf.isar + offset);mb();
} }
...@@ -98,7 +98,7 @@ static void ...@@ -98,7 +98,7 @@ static void
isurf_interrupt(int intno, void *dev_id, struct pt_regs *regs) isurf_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val; u8 val;
int cnt = 5; int cnt = 5;
spin_lock(&cs->lock); spin_lock(&cs->lock);
...@@ -141,7 +141,7 @@ release_io_isurf(struct IsdnCardState *cs) ...@@ -141,7 +141,7 @@ release_io_isurf(struct IsdnCardState *cs)
} }
static void static void
reset_isurf(struct IsdnCardState *cs, u_char chips) reset_isurf(struct IsdnCardState *cs, u8 chips)
{ {
printk(KERN_INFO "ISurf: resetting card\n"); printk(KERN_INFO "ISurf: resetting card\n");
......
drivers/isdn/hisax/ix1_micro.c
View file @ 9ca46b71
...@@ -89,26 +89,26 @@ writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int siz ...@@ -89,26 +89,26 @@ writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int siz
/* Interface functions */ /* Interface functions */
static u_char static u8
ReadISAC(struct IsdnCardState *cs, u_char offset) ReadISAC(struct IsdnCardState *cs, u8 offset)
{ {
return readreg(cs, cs->hw.ix1.isac, offset); return readreg(cs, cs->hw.ix1.isac, offset);
} }
static void static void
WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value)
{ {
writereg(cs, cs->hw.ix1.isac, offset, value); writereg(cs, cs->hw.ix1.isac, offset, value);
} }
static void static void
ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
readfifo(cs, cs->hw.ix1.isac, 0, data, size); readfifo(cs, cs->hw.ix1.isac, 0, data, size);
} }
static void static void
WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size)
{ {
writefifo(cs, cs->hw.ix1.isac, 0, data, size); writefifo(cs, cs->hw.ix1.isac, 0, data, size);
} }
...@@ -120,14 +120,14 @@ static struct dc_hw_ops isac_ops = { ...@@ -120,14 +120,14 @@ static struct dc_hw_ops isac_ops = {
.write_fifo = WriteISACfifo, .write_fifo = WriteISACfifo,
}; };
static u_char static u8
ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) ReadHSCX(struct IsdnCardState *cs, int hscx, u8 offset)
{ {
return readreg(cs, cs->hw.ix1.hscx, offset + (hscx ? 0x40 : 0)); return readreg(cs, cs->hw.ix1.hscx, offset + (hscx ? 0x40 : 0));
} }
static void static void
WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) WriteHSCX(struct IsdnCardState *cs, int hscx, u8 offset, u8 value)
{ {
writereg(cs, cs->hw.ix1.hscx, offset + (hscx ? 0x40 : 0), value); writereg(cs, cs->hw.ix1.hscx, offset + (hscx ? 0x40 : 0), value);
} }
...@@ -154,7 +154,7 @@ static void ...@@ -154,7 +154,7 @@ static void
ix1micro_interrupt(int intno, void *dev_id, struct pt_regs *regs) ix1micro_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val; u8 val;
spin_lock(&cs->lock); spin_lock(&cs->lock);
val = readreg(cs, cs->hw.ix1.hscx, HSCX_ISTA + 0x40); val = readreg(cs, cs->hw.ix1.hscx, HSCX_ISTA + 0x40);
......
drivers/isdn/hisax/jade.c
View file @ 9ca46b71
...@@ -60,11 +60,11 @@ JadeVersion(struct IsdnCardState *cs, char *s) ...@@ -60,11 +60,11 @@ JadeVersion(struct IsdnCardState *cs, char *s)
/* Write to indirect accessible jade register set */ /* Write to indirect accessible jade register set */
static void static void
jade_write_indirect(struct IsdnCardState *cs, u_char reg, u_char value) jade_write_indirect(struct IsdnCardState *cs, u8 reg, u8 value)
{ {
int to = 50; int to = 50;
unsigned long flags; unsigned long flags;
u_char ret; u8 ret;
spin_lock_irqsave(&jade_lock, flags); spin_lock_irqsave(&jade_lock, flags);
/* Write the data */ /* Write the data */
jade_write_reg(cs, -1, COMM_JADE+1, value); jade_write_reg(cs, -1, COMM_JADE+1, value);
......
drivers/isdn/hisax/jade_irq.c
View file @ 9ca46b71
...@@ -32,7 +32,7 @@ waitforXFW(struct IsdnCardState *cs, int jade) ...@@ -32,7 +32,7 @@ waitforXFW(struct IsdnCardState *cs, int jade)
} }
static inline void static inline void
WriteJADECMDR(struct IsdnCardState *cs, int jade, int reg, u_char data) WriteJADECMDR(struct IsdnCardState *cs, int jade, int reg, u8 data)
{ {
unsigned long flags; unsigned long flags;
...@@ -47,7 +47,7 @@ WriteJADECMDR(struct IsdnCardState *cs, int jade, int reg, u_char data) ...@@ -47,7 +47,7 @@ WriteJADECMDR(struct IsdnCardState *cs, int jade, int reg, u_char data)
static void static void
jade_empty_fifo(struct BCState *bcs, int count) jade_empty_fifo(struct BCState *bcs, int count)
{ {
u_char *ptr; u8 *ptr;
struct IsdnCardState *cs = bcs->cs; struct IsdnCardState *cs = bcs->cs;
if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO))
...@@ -95,9 +95,9 @@ jade_fill_fifo(struct BCState *bcs) ...@@ -95,9 +95,9 @@ jade_fill_fifo(struct BCState *bcs)
static inline void static inline void
jade_interrupt(struct IsdnCardState *cs, u_char val, u_char jade) jade_interrupt(struct IsdnCardState *cs, u8 val, u8 jade)
{ {
u_char r; u8 r;
struct BCState *bcs = cs->bcs + jade; struct BCState *bcs = cs->bcs + jade;
struct sk_buff *skb; struct sk_buff *skb;
int fifo_size = 32; int fifo_size = 32;
...@@ -165,7 +165,7 @@ reset_xmit(struct BCState *bcs) ...@@ -165,7 +165,7 @@ reset_xmit(struct BCState *bcs)
} }
static inline void static inline void
jade_int_main(struct IsdnCardState *cs, u_char val, int jade) jade_int_main(struct IsdnCardState *cs, u8 val, int jade)
{ {
struct BCState *bcs; struct BCState *bcs;
bcs = cs->bcs + jade; bcs = cs->bcs + jade;
......
drivers/isdn/hisax/l3_1tr6.c
View file @ 9ca46b71
...@@ -28,10 +28,10 @@ const char *l3_1tr6_revision = "$Revision: 2.13.6.2 $"; ...@@ -28,10 +28,10 @@ const char *l3_1tr6_revision = "$Revision: 2.13.6.2 $";
*ptr++ = mty *ptr++ = mty
static void static void
l3_1TR6_message(struct l3_process *pc, u_char mt, u_char pd) l3_1TR6_message(struct l3_process *pc, u8 mt, u8 pd)
{ {
struct sk_buff *skb; struct sk_buff *skb;
u_char *p; u8 *p;
if (!(skb = l3_alloc_skb(4))) if (!(skb = l3_alloc_skb(4)))
return; return;
...@@ -41,7 +41,7 @@ l3_1TR6_message(struct l3_process *pc, u_char mt, u_char pd) ...@@ -41,7 +41,7 @@ l3_1TR6_message(struct l3_process *pc, u_char mt, u_char pd)
} }
static void static void
l3_1tr6_release_req(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_release_req(struct l3_process *pc, u8 pr, void *arg)
{ {
StopAllL3Timer(pc); StopAllL3Timer(pc);
newl3state(pc, 19); newl3state(pc, 19);
...@@ -50,7 +50,7 @@ l3_1tr6_release_req(struct l3_process *pc, u_char pr, void *arg) ...@@ -50,7 +50,7 @@ l3_1tr6_release_req(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_invalid(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_invalid(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
...@@ -59,7 +59,7 @@ l3_1tr6_invalid(struct l3_process *pc, u_char pr, void *arg) ...@@ -59,7 +59,7 @@ l3_1tr6_invalid(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_error(struct l3_process *pc, u_char *msg, struct sk_buff *skb) l3_1tr6_error(struct l3_process *pc, u8 *msg, struct sk_buff *skb)
{ {
dev_kfree_skb(skb); dev_kfree_skb(skb);
if (pc->st->l3.debug & L3_DEB_WARN) if (pc->st->l3.debug & L3_DEB_WARN)
...@@ -68,14 +68,14 @@ l3_1tr6_error(struct l3_process *pc, u_char *msg, struct sk_buff *skb) ...@@ -68,14 +68,14 @@ l3_1tr6_error(struct l3_process *pc, u_char *msg, struct sk_buff *skb)
} }
static void static void
l3_1tr6_setup_req(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_setup_req(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb; struct sk_buff *skb;
u_char tmp[128]; u8 tmp[128];
u_char *p = tmp; u8 *p = tmp;
u_char *teln; u8 *teln;
u_char *eaz; u8 *eaz;
u_char channel = 0; u8 channel = 0;
int l; int l;
MsgHead(p, pc->callref, MT_N1_SETUP, PROTO_DIS_N1); MsgHead(p, pc->callref, MT_N1_SETUP, PROTO_DIS_N1);
...@@ -157,9 +157,9 @@ l3_1tr6_setup_req(struct l3_process *pc, u_char pr, void *arg) ...@@ -157,9 +157,9 @@ l3_1tr6_setup_req(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_setup(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_setup(struct l3_process *pc, u8 pr, void *arg)
{ {
u_char *p; u8 *p;
int bcfound = 0; int bcfound = 0;
char tmp[80]; char tmp[80];
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
...@@ -228,9 +228,9 @@ l3_1tr6_setup(struct l3_process *pc, u_char pr, void *arg) ...@@ -228,9 +228,9 @@ l3_1tr6_setup(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_setup_ack(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_setup_ack(struct l3_process *pc, u8 pr, void *arg)
{ {
u_char *p; u8 *p;
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
L3DelTimer(&pc->timer); L3DelTimer(&pc->timer);
...@@ -256,9 +256,9 @@ l3_1tr6_setup_ack(struct l3_process *pc, u_char pr, void *arg) ...@@ -256,9 +256,9 @@ l3_1tr6_setup_ack(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_call_sent(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_call_sent(struct l3_process *pc, u8 pr, void *arg)
{ {
u_char *p; u8 *p;
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
L3DelTimer(&pc->timer); L3DelTimer(&pc->timer);
...@@ -288,7 +288,7 @@ l3_1tr6_call_sent(struct l3_process *pc, u_char pr, void *arg) ...@@ -288,7 +288,7 @@ l3_1tr6_call_sent(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_alert(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_alert(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
...@@ -299,9 +299,9 @@ l3_1tr6_alert(struct l3_process *pc, u_char pr, void *arg) ...@@ -299,9 +299,9 @@ l3_1tr6_alert(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_info(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_info(struct l3_process *pc, u8 pr, void *arg)
{ {
u_char *p; u8 *p;
int i, tmpcharge = 0; int i, tmpcharge = 0;
char a_charge[8], tmp[32]; char a_charge[8], tmp[32];
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
...@@ -328,7 +328,7 @@ l3_1tr6_info(struct l3_process *pc, u_char pr, void *arg) ...@@ -328,7 +328,7 @@ l3_1tr6_info(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_info_s2(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_info_s2(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
...@@ -336,7 +336,7 @@ l3_1tr6_info_s2(struct l3_process *pc, u_char pr, void *arg) ...@@ -336,7 +336,7 @@ l3_1tr6_info_s2(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_connect(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_connect(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
...@@ -352,10 +352,10 @@ l3_1tr6_connect(struct l3_process *pc, u_char pr, void *arg) ...@@ -352,10 +352,10 @@ l3_1tr6_connect(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_rel(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_rel(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
u_char *p; u8 *p;
p = skb->data; p = skb->data;
if ((p = findie(p, skb->len, WE0_cause, 0))) { if ((p = findie(p, skb->len, WE0_cause, 0))) {
...@@ -383,7 +383,7 @@ l3_1tr6_rel(struct l3_process *pc, u_char pr, void *arg) ...@@ -383,7 +383,7 @@ l3_1tr6_rel(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_rel_ack(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_rel_ack(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
...@@ -396,10 +396,10 @@ l3_1tr6_rel_ack(struct l3_process *pc, u_char pr, void *arg) ...@@ -396,10 +396,10 @@ l3_1tr6_rel_ack(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_disc(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_disc(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
u_char *p; u8 *p;
int i, tmpcharge = 0; int i, tmpcharge = 0;
char a_charge[8], tmp[32]; char a_charge[8], tmp[32];
...@@ -451,7 +451,7 @@ l3_1tr6_disc(struct l3_process *pc, u_char pr, void *arg) ...@@ -451,7 +451,7 @@ l3_1tr6_disc(struct l3_process *pc, u_char pr, void *arg)
static void static void
l3_1tr6_connect_ack(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_connect_ack(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb = arg; struct sk_buff *skb = arg;
...@@ -467,18 +467,18 @@ l3_1tr6_connect_ack(struct l3_process *pc, u_char pr, void *arg) ...@@ -467,18 +467,18 @@ l3_1tr6_connect_ack(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_alert_req(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_alert_req(struct l3_process *pc, u8 pr, void *arg)
{ {
newl3state(pc, 7); newl3state(pc, 7);
l3_1TR6_message(pc, MT_N1_ALERT, PROTO_DIS_N1); l3_1TR6_message(pc, MT_N1_ALERT, PROTO_DIS_N1);
} }
static void static void
l3_1tr6_setup_rsp(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_setup_rsp(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb; struct sk_buff *skb;
u_char tmp[24]; u8 tmp[24];
u_char *p = tmp; u8 *p = tmp;
int l; int l;
MsgHead(p, pc->callref, MT_N1_CONN, PROTO_DIS_N1); MsgHead(p, pc->callref, MT_N1_CONN, PROTO_DIS_N1);
...@@ -508,20 +508,20 @@ l3_1tr6_setup_rsp(struct l3_process *pc, u_char pr, void *arg) ...@@ -508,20 +508,20 @@ l3_1tr6_setup_rsp(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_reset(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_reset(struct l3_process *pc, u8 pr, void *arg)
{ {
release_l3_process(pc); release_l3_process(pc);
} }
static void static void
l3_1tr6_disconnect_req(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_disconnect_req(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb; struct sk_buff *skb;
u_char tmp[16]; u8 tmp[16];
u_char *p = tmp; u8 *p = tmp;
int l; int l;
u_char cause = 0x10; u8 cause = 0x10;
u_char clen = 1; u8 clen = 1;
if (pc->para.cause > 0) if (pc->para.cause > 0)
cause = pc->para.cause; cause = pc->para.cause;
...@@ -553,7 +553,7 @@ l3_1tr6_disconnect_req(struct l3_process *pc, u_char pr, void *arg) ...@@ -553,7 +553,7 @@ l3_1tr6_disconnect_req(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_t303(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_t303(struct l3_process *pc, u8 pr, void *arg)
{ {
if (pc->N303 > 0) { if (pc->N303 > 0) {
pc->N303--; pc->N303--;
...@@ -567,7 +567,7 @@ l3_1tr6_t303(struct l3_process *pc, u_char pr, void *arg) ...@@ -567,7 +567,7 @@ l3_1tr6_t303(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_t304(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_t304(struct l3_process *pc, u8 pr, void *arg)
{ {
L3DelTimer(&pc->timer); L3DelTimer(&pc->timer);
pc->para.cause = 0xE6; pc->para.cause = 0xE6;
...@@ -576,14 +576,14 @@ l3_1tr6_t304(struct l3_process *pc, u_char pr, void *arg) ...@@ -576,14 +576,14 @@ l3_1tr6_t304(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_t305(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_t305(struct l3_process *pc, u8 pr, void *arg)
{ {
struct sk_buff *skb; struct sk_buff *skb;
u_char tmp[16]; u8 tmp[16];
u_char *p = tmp; u8 *p = tmp;
int l; int l;
u_char cause = 0x90; u8 cause = 0x90;
u_char clen = 1; u8 clen = 1;
L3DelTimer(&pc->timer); L3DelTimer(&pc->timer);
if (pc->para.cause != NO_CAUSE) if (pc->para.cause != NO_CAUSE)
...@@ -612,7 +612,7 @@ l3_1tr6_t305(struct l3_process *pc, u_char pr, void *arg) ...@@ -612,7 +612,7 @@ l3_1tr6_t305(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_t310(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_t310(struct l3_process *pc, u8 pr, void *arg)
{ {
L3DelTimer(&pc->timer); L3DelTimer(&pc->timer);
pc->para.cause = 0xE6; pc->para.cause = 0xE6;
...@@ -621,7 +621,7 @@ l3_1tr6_t310(struct l3_process *pc, u_char pr, void *arg) ...@@ -621,7 +621,7 @@ l3_1tr6_t310(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_t313(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_t313(struct l3_process *pc, u8 pr, void *arg)
{ {
L3DelTimer(&pc->timer); L3DelTimer(&pc->timer);
pc->para.cause = 0xE6; pc->para.cause = 0xE6;
...@@ -630,7 +630,7 @@ l3_1tr6_t313(struct l3_process *pc, u_char pr, void *arg) ...@@ -630,7 +630,7 @@ l3_1tr6_t313(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_t308_1(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_t308_1(struct l3_process *pc, u8 pr, void *arg)
{ {
L3DelTimer(&pc->timer); L3DelTimer(&pc->timer);
l3_1TR6_message(pc, MT_N1_REL, PROTO_DIS_N1); l3_1TR6_message(pc, MT_N1_REL, PROTO_DIS_N1);
...@@ -639,7 +639,7 @@ l3_1tr6_t308_1(struct l3_process *pc, u_char pr, void *arg) ...@@ -639,7 +639,7 @@ l3_1tr6_t308_1(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_t308_2(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_t308_2(struct l3_process *pc, u8 pr, void *arg)
{ {
L3DelTimer(&pc->timer); L3DelTimer(&pc->timer);
L3L4(pc->st, CC_RELEASE_ERR, pc); L3L4(pc->st, CC_RELEASE_ERR, pc);
...@@ -647,7 +647,7 @@ l3_1tr6_t308_2(struct l3_process *pc, u_char pr, void *arg) ...@@ -647,7 +647,7 @@ l3_1tr6_t308_2(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_dl_reset(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_dl_reset(struct l3_process *pc, u8 pr, void *arg)
{ {
pc->para.cause = CAUSE_LocalProcErr; pc->para.cause = CAUSE_LocalProcErr;
l3_1tr6_disconnect_req(pc, pr, NULL); l3_1tr6_disconnect_req(pc, pr, NULL);
...@@ -655,7 +655,7 @@ l3_1tr6_dl_reset(struct l3_process *pc, u_char pr, void *arg) ...@@ -655,7 +655,7 @@ l3_1tr6_dl_reset(struct l3_process *pc, u_char pr, void *arg)
} }
static void static void
l3_1tr6_dl_release(struct l3_process *pc, u_char pr, void *arg) l3_1tr6_dl_release(struct l3_process *pc, u8 pr, void *arg)
{ {
newl3state(pc, 0); newl3state(pc, 0);
pc->para.cause = 0x1b; /* Destination out of order */ pc->para.cause = 0x1b; /* Destination out of order */
......
drivers/isdn/hisax/l3dss1.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/l3dss1.h
View file @ 9ca46b71
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
typedef struct typedef struct
{ unsigned char invoke_id; /* used invoke id in remote ops, 0 = not active */ { unsigned char invoke_id; /* used invoke id in remote ops, 0 = not active */
ulong ll_id; /* remebered ll id */ ulong ll_id; /* remebered ll id */
u_char remote_operation; /* handled remote operation, 0 = not active */ u8 remote_operation; /* handled remote operation, 0 = not active */
int proc; /* rememered procedure */ int proc; /* rememered procedure */
ulong remote_result; /* result of remote operation for statcallb */ ulong remote_result; /* result of remote operation for statcallb */
char uus1_data[35]; /* data send during alerting or disconnect */ char uus1_data[35]; /* data send during alerting or disconnect */
......
drivers/isdn/hisax/l3ni1.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/l3ni1.h
View file @ 9ca46b71
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
typedef struct typedef struct
{ unsigned char invoke_id; /* used invoke id in remote ops, 0 = not active */ { unsigned char invoke_id; /* used invoke id in remote ops, 0 = not active */
ulong ll_id; /* remebered ll id */ ulong ll_id; /* remebered ll id */
u_char remote_operation; /* handled remote operation, 0 = not active */ u8 remote_operation; /* handled remote operation, 0 = not active */
int proc; /* rememered procedure */ int proc; /* rememered procedure */
ulong remote_result; /* result of remote operation for statcallb */ ulong remote_result; /* result of remote operation for statcallb */
char uus1_data[35]; /* data send during alerting or disconnect */ char uus1_data[35]; /* data send during alerting or disconnect */
......
drivers/isdn/hisax/mic.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/netjet.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/netjet.h
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/niccy.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/nj_s.c
View file @ 9ca46b71
...@@ -21,7 +21,7 @@ static void ...@@ -21,7 +21,7 @@ static void
netjet_s_interrupt(int intno, void *dev_id, struct pt_regs *regs) netjet_s_interrupt(int intno, void *dev_id, struct pt_regs *regs)
{ {
struct IsdnCardState *cs = dev_id; struct IsdnCardState *cs = dev_id;
u_char val, sval; u8 val, sval;
spin_lock(&cs->lock); spin_lock(&cs->lock);
if (!((sval = bytein(cs->hw.njet.base + NETJET_IRQSTAT1)) & if (!((sval = bytein(cs->hw.njet.base + NETJET_IRQSTAT1)) &
......
drivers/isdn/hisax/nj_u.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/q931.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/rawhdlc.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/rawhdlc.h
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/s0box.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/saphir.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/sedlbauer.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/sedlbauer_cs.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/sportster.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/st5481.h
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/st5481_b.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/st5481_usb.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/tei.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/teleint.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/teles0.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/teles3.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/telespci.c
View file @ 9ca46b71
This diff is collapsed.
drivers/isdn/hisax/w6692.c
View file @ 9ca46b71
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7