patch-2.4.20 linux-2.4.20/drivers/net/irda/nsc-ircc.c
Next file: linux-2.4.20/drivers/net/irda/smc-ircc.c
Previous file: linux-2.4.20/drivers/net/irda/mcp2120.c
Back to the patch index
Back to the overall index
- Lines: 479
- Date:
Thu Nov 28 15:53:13 2002
- Orig file:
linux-2.4.19/drivers/net/irda/nsc-ircc.c
- Orig date:
Mon Feb 25 11:37:59 2002
diff -urN linux-2.4.19/drivers/net/irda/nsc-ircc.c linux-2.4.20/drivers/net/irda/nsc-ircc.c
@@ -88,10 +88,14 @@
/* These are the known NSC chips */
static nsc_chip_t chips[] = {
+/* Name, {cfg registers}, chip id index reg, chip id expected value, revision mask */
{ "PC87108", { 0x150, 0x398, 0xea }, 0x05, 0x10, 0xf0,
nsc_ircc_probe_108, nsc_ircc_init_108 },
{ "PC87338", { 0x398, 0x15c, 0x2e }, 0x08, 0xb0, 0xf8,
nsc_ircc_probe_338, nsc_ircc_init_338 },
+ /* Contributed by Kevin Thayer - OmniBook 6100 */
+ { "PC87338?", { 0x2e, 0x15c, 0x398 }, 0x08, 0x00, 0xf8,
+ nsc_ircc_probe_338, nsc_ircc_init_338 },
{ NULL }
};
@@ -161,8 +165,8 @@
/* Probe for all the NSC chipsets we know about */
for (chip=chips; chip->name ; chip++) {
- IRDA_DEBUG(2, __FUNCTION__"(), Probing for %s ...\n",
- chip->name);
+ IRDA_DEBUG(2, "%s(), Probing for %s ...\n",
+ __FUNCTION__, chip->name);
/* Try all config registers for this chip */
for (cfg=0; cfg<3; cfg++) {
@@ -179,8 +183,8 @@
/* Read index register */
reg = inb(cfg_base);
if (reg == 0xff) {
- IRDA_DEBUG(2, __FUNCTION__
- "() no chip at 0x%03x\n", cfg_base);
+ IRDA_DEBUG(2, "%s() no chip at 0x%03x\n",
+ __FUNCTION__, cfg_base);
continue;
}
@@ -188,9 +192,8 @@
outb(chip->cid_index, cfg_base);
id = inb(cfg_base+1);
if ((id & chip->cid_mask) == chip->cid_value) {
- IRDA_DEBUG(2, __FUNCTION__
- "() Found %s chip, revision=%d\n",
- chip->name, id & ~chip->cid_mask);
+ IRDA_DEBUG(2, "%s() Found %s chip, revision=%d\n",
+ __FUNCTION__, chip->name, id & ~chip->cid_mask);
/*
* If the user supplies the base address, then
* we init the chip, if not we probe the values
@@ -205,8 +208,7 @@
ret = 0;
i++;
} else {
- IRDA_DEBUG(2, __FUNCTION__
- "(), Wrong chip id=0x%02x\n", id);
+ IRDA_DEBUG(2, "%s(), Wrong chip id=0x%02x\n", __FUNCTION__, id);
}
}
@@ -249,7 +251,7 @@
void *ret;
int err;
- IRDA_DEBUG(2, __FUNCTION__ "()\n");
+ IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
MESSAGE("%s, Found chip at base=0x%03x\n", driver_name,
info->cfg_base);
@@ -262,8 +264,8 @@
/* Allocate new instance of the driver */
self = kmalloc(sizeof(struct nsc_ircc_cb), GFP_KERNEL);
if (self == NULL) {
- ERROR(__FUNCTION__ "(), can't allocate memory for "
- "control block!\n");
+ ERROR("%s(), can't allocate memory for "
+ "control block!\n", __FUNCTION__);
return -ENOMEM;
}
memset(self, 0, sizeof(struct nsc_ircc_cb));
@@ -284,8 +286,8 @@
/* Reserve the ioports that we need */
ret = request_region(self->io.fir_base, self->io.fir_ext, driver_name);
if (!ret) {
- WARNING(__FUNCTION__ "(), can't get iobase of 0x%03x\n",
- self->io.fir_base);
+ WARNING("%s(), can't get iobase of 0x%03x\n",
+ __FUNCTION__, self->io.fir_base);
dev_self[i] = NULL;
kfree(self);
return -ENODEV;
@@ -335,7 +337,7 @@
self->tx_fifo.tail = self->tx_buff.head;
if (!(dev = dev_alloc("irda%d", &err))) {
- ERROR(__FUNCTION__ "(), dev_alloc() failed!\n");
+ ERROR("%s(), dev_alloc() failed!\n", __FUNCTION__);
return -ENOMEM;
}
@@ -354,7 +356,7 @@
err = register_netdevice(dev);
rtnl_unlock();
if (err) {
- ERROR(__FUNCTION__ "(), register_netdev() failed!\n");
+ ERROR("%s(), register_netdev() failed!\n", __FUNCTION__);
return -1;
}
MESSAGE("IrDA: Registered device %s\n", dev->name);
@@ -391,7 +393,7 @@
{
int iobase;
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
@@ -405,8 +407,8 @@
}
/* Release the PORT that this driver is using */
- IRDA_DEBUG(4, __FUNCTION__ "(), Releasing Region %03x\n",
- self->io.fir_base);
+ IRDA_DEBUG(4, "%s(), Releasing Region %03x\n",
+ __FUNCTION__, self->io.fir_base);
release_region(self->io.fir_base, self->io.fir_ext);
if (self->tx_buff.head)
@@ -443,7 +445,7 @@
case 0x2e8: outb(0x15, cfg_base+1); break;
case 0x3f8: outb(0x16, cfg_base+1); break;
case 0x2f8: outb(0x17, cfg_base+1); break;
- default: ERROR(__FUNCTION__ "(), invalid base_address");
+ default: ERROR("%s(), invalid base_address", __FUNCTION__);
}
/* Control Signal Routing Register (CSRT) */
@@ -455,7 +457,7 @@
case 9: temp = 0x05; break;
case 11: temp = 0x06; break;
case 15: temp = 0x07; break;
- default: ERROR(__FUNCTION__ "(), invalid irq");
+ default: ERROR("%s(), invalid irq", __FUNCTION__);
}
outb(1, cfg_base);
@@ -463,7 +465,7 @@
case 0: outb(0x08+temp, cfg_base+1); break;
case 1: outb(0x10+temp, cfg_base+1); break;
case 3: outb(0x18+temp, cfg_base+1); break;
- default: ERROR(__FUNCTION__ "(), invalid dma");
+ default: ERROR("%s(), invalid dma", __FUNCTION__);
}
outb(2, cfg_base); /* Mode Control Register (MCTL) */
@@ -502,8 +504,8 @@
break;
}
info->sir_base = info->fir_base;
- IRDA_DEBUG(2, __FUNCTION__ "(), probing fir_base=0x%03x\n",
- info->fir_base);
+ IRDA_DEBUG(2, "%s(), probing fir_base=0x%03x\n",
+ __FUNCTION__, info->fir_base);
/* Read control signals routing register (CSRT) */
outb(CFG_CSRT, cfg_base);
@@ -535,7 +537,7 @@
info->irq = 15;
break;
}
- IRDA_DEBUG(2, __FUNCTION__ "(), probing irq=%d\n", info->irq);
+ IRDA_DEBUG(2, "%s(), probing irq=%d\n", __FUNCTION__, info->irq);
/* Currently we only read Rx DMA but it will also be used for Tx */
switch ((reg >> 3) & 0x03) {
@@ -552,7 +554,7 @@
info->dma = 3;
break;
}
- IRDA_DEBUG(2, __FUNCTION__ "(), probing dma=%d\n", info->dma);
+ IRDA_DEBUG(2, "%s(), probing dma=%d\n", __FUNCTION__, info->dma);
/* Read mode control register (MCTL) */
outb(CFG_MCTL, cfg_base);
@@ -698,6 +700,9 @@
switch_bank(iobase, BANK3);
version = inb(iobase+MID);
+ IRDA_DEBUG(2, __FUNCTION__ "() Driver %s Found chip version %02x\n",
+ driver_name, version);
+
/* Should be 0x2? */
if (0x20 != (version & 0xf0)) {
ERROR("%s, Wrong chip version %02x\n", driver_name, version);
@@ -798,39 +803,39 @@
switch (dongle_id) {
case 0x00: /* same as */
case 0x01: /* Differential serial interface */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s not defined by irda yet\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x02: /* same as */
case 0x03: /* Reserved */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s not defined by irda yet\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x04: /* Sharp RY5HD01 */
break;
case 0x05: /* Reserved, but this is what the Thinkpad reports */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s not defined by irda yet\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x06: /* Single-ended serial interface */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s not defined by irda yet\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x07: /* Consumer-IR only */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s is not for IrDA mode\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s is not for IrDA mode\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x08: /* HP HSDL-2300, HP HSDL-3600/HSDL-3610 */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x09: /* IBM31T1100 or Temic TFDS6000/TFDS6500 */
outb(0x28, iobase+7); /* Set irsl[0-2] as output */
break;
case 0x0A: /* same as */
case 0x0B: /* Reserved */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s not defined by irda yet\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x0C: /* same as */
case 0x0D: /* HP HSDL-1100/HSDL-2100 */
@@ -844,15 +849,15 @@
outb(0x28, iobase+7); /* Set irsl[0-2] as output */
break;
case 0x0F: /* No dongle connected */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s\n",
+ __FUNCTION__, dongle_types[dongle_id]);
switch_bank(iobase, BANK0);
outb(0x62, iobase+MCR);
break;
default:
- IRDA_DEBUG(0, __FUNCTION__ "(), invalid dongle_id %#x",
- dongle_id);
+ IRDA_DEBUG(0, "%s(), invalid dongle_id %#x",
+ __FUNCTION__, dongle_id);
}
/* IRCFG1: IRSL1 and 2 are set to IrDA mode */
@@ -884,31 +889,31 @@
switch (dongle_id) {
case 0x00: /* same as */
case 0x01: /* Differential serial interface */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s not defined by irda yet\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x02: /* same as */
case 0x03: /* Reserved */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s not defined by irda yet\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x04: /* Sharp RY5HD01 */
break;
case 0x05: /* Reserved */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s not defined by irda yet\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x06: /* Single-ended serial interface */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s not defined by irda yet\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x07: /* Consumer-IR only */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s is not for IrDA mode\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s is not for IrDA mode\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x08: /* HP HSDL-2300, HP HSDL-3600/HSDL-3610 */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s\n",
+ __FUNCTION__, dongle_types[dongle_id]);
outb(0x00, iobase+4);
if (speed > 115200)
outb(0x01, iobase+4);
@@ -927,8 +932,8 @@
break;
case 0x0A: /* same as */
case 0x0B: /* Reserved */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s not defined by irda yet\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s not defined by irda yet\n",
+ __FUNCTION__, dongle_types[dongle_id]);
break;
case 0x0C: /* same as */
case 0x0D: /* HP HSDL-1100/HSDL-2100 */
@@ -936,14 +941,14 @@
case 0x0E: /* Supports SIR Mode only */
break;
case 0x0F: /* No dongle connected */
- IRDA_DEBUG(0, __FUNCTION__ "(), %s is not for IrDA mode\n",
- dongle_types[dongle_id]);
+ IRDA_DEBUG(0, "%s(), %s is not for IrDA mode\n",
+ __FUNCTION__, dongle_types[dongle_id]);
switch_bank(iobase, BANK0);
outb(0x62, iobase+MCR);
break;
default:
- IRDA_DEBUG(0, __FUNCTION__ "(), invalid data_rate\n");
+ IRDA_DEBUG(0, "%s(), invalid data_rate\n", __FUNCTION__);
}
/* Restore bank register */
outb(bank, iobase+BSR);
@@ -962,7 +967,7 @@
int iobase;
__u8 bank;
- IRDA_DEBUG(2, __FUNCTION__ "(), speed=%d\n", speed);
+ IRDA_DEBUG(2, "%s(), speed=%d\n", __FUNCTION__, speed);
ASSERT(self != NULL, return;);
@@ -995,20 +1000,20 @@
outb(inb(iobase+4) | 0x04, iobase+4);
mcr = MCR_MIR;
- IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 576000\n");
+ IRDA_DEBUG(0, "%s(), handling baud of 576000\n", __FUNCTION__);
break;
case 1152000:
mcr = MCR_MIR;
- IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 1152000\n");
+ IRDA_DEBUG(0, "%s(), handling baud of 1152000\n", __FUNCTION__);
break;
case 4000000:
mcr = MCR_FIR;
- IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 4000000\n");
+ IRDA_DEBUG(0, "%s(), handling baud of 4000000\n", __FUNCTION__);
break;
default:
mcr = MCR_FIR;
- IRDA_DEBUG(0, __FUNCTION__ "(), unknown baud rate of %d\n",
- speed);
+ IRDA_DEBUG(0, "%s(), unknown baud rate of %d\n",
+ __FUNCTION__, speed);
break;
}
@@ -1271,15 +1276,14 @@
int actual = 0;
__u8 bank;
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
/* Save current bank */
bank = inb(iobase+BSR);
switch_bank(iobase, BANK0);
if (!(inb_p(iobase+LSR) & LSR_TXEMP)) {
- IRDA_DEBUG(4, __FUNCTION__
- "(), warning, FIFO not empty yet!\n");
+ IRDA_DEBUG(4, "%s(), warning, FIFO not empty yet!\n", __FUNCTION__);
/* FIFO may still be filled to the Tx interrupt threshold */
fifo_size -= 17;
@@ -1291,8 +1295,8 @@
outb(buf[actual++], iobase+TXD);
}
- IRDA_DEBUG(4, __FUNCTION__ "(), fifo_size %d ; %d sent of %d\n",
- fifo_size, actual, len);
+ IRDA_DEBUG(4, "%s(), fifo_size %d ; %d sent of %d\n",
+ __FUNCTION__, fifo_size, actual, len);
/* Restore bank */
outb(bank, iobase+BSR);
@@ -1313,7 +1317,7 @@
__u8 bank;
int ret = TRUE;
- IRDA_DEBUG(2, __FUNCTION__ "()\n");
+ IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
iobase = self->io.fir_base;
@@ -1449,7 +1453,7 @@
len = inb(iobase+RFLFL) | ((inb(iobase+RFLFH) & 0x1f) << 8);
if (st_fifo->tail >= MAX_RX_WINDOW) {
- IRDA_DEBUG(0, __FUNCTION__ "(), window is full!\n");
+ IRDA_DEBUG(0, "%s(), window is full!\n", __FUNCTION__);
continue;
}
@@ -1539,8 +1543,8 @@
skb = dev_alloc_skb(len+1);
if (skb == NULL) {
- WARNING(__FUNCTION__ "(), memory squeeze, "
- "dropping frame.\n");
+ WARNING("%s(), memory squeeze, "
+ "dropping frame.\n", __FUNCTION__);
self->stats.rx_dropped++;
/* Restore bank register */
@@ -1636,7 +1640,7 @@
if (eir & EIR_TXEMP_EV) {
/* Check if we need to change the speed? */
if (self->new_speed) {
- IRDA_DEBUG(2, __FUNCTION__ "(), Changing speed!\n");
+ IRDA_DEBUG(2, "%s(), Changing speed!\n", __FUNCTION__);
nsc_ircc_change_speed(self, self->new_speed);
self->new_speed = 0;
@@ -1815,7 +1819,7 @@
*/
static int nsc_ircc_net_init(struct net_device *dev)
{
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
/* Setup to be a normal IrDA network device driver */
irda_device_setup(dev);
@@ -1838,7 +1842,7 @@
char hwname[32];
__u8 bank;
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(dev != NULL, return -1;);
self = (struct nsc_ircc_cb *) dev->priv;
@@ -1902,7 +1906,7 @@
int iobase;
__u8 bank;
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(dev != NULL, return -1;);
@@ -1958,7 +1962,7 @@
ASSERT(self != NULL, return -1;);
- IRDA_DEBUG(2, __FUNCTION__ "(), %s, (cmd=0x%X)\n", dev->name, cmd);
+ IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev->name, cmd);
/* Disable interrupts & save flags */
save_flags(flags);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)