patch-2.3.24 linux/drivers/net/irda/uircc.c

• Lines: 261
• Date: Mon Oct 25 20:49:42 1999
• Orig file: v2.3.23/linux/drivers/net/irda/uircc.c
• Orig date: Mon Oct 4 15:49:29 1999

diff -u --recursive --new-file v2.3.23/linux/drivers/net/irda/uircc.c linux/drivers/net/irda/uircc.c
@@ -113,7 +113,7 @@
 {
 	int i;
 
-        DEBUG(4, __FUNCTION__ "()\n");
+        IRDA_DEBUG(4, __FUNCTION__ "()\n");
 
 	for (i=0; i < 4; i++) {
 		if (dev_self[i])
@@ -135,7 +135,7 @@
 	struct irda_device *idev;
 	int ret;
 
-	DEBUG(4, __FUNCTION__ "()\n");
+	IRDA_DEBUG(4, __FUNCTION__ "()\n");
 
 	if ((uircc_probe(iobase, iobase2, irq, dma)) == -1)
 		return -1;
@@ -168,14 +168,14 @@
 	/* Lock the port that we need */
 	ret = check_region(idev->io.iobase, idev->io.io_ext);
 	if (ret < 0) { 
-		DEBUG(0, __FUNCTION__ "(), can't get iobase of 0x%03x\n",
+		IRDA_DEBUG(0, __FUNCTION__ "(), can't get iobase of 0x%03x\n",
 		      idev->io.iobase);
 		/* uircc_cleanup( self->idev);  */
 		return -ENODEV;
 	}
 	ret = check_region(idev->io.iobase2, idev->io.io_ext2);
 	if (ret < 0) { 
-		DEBUG(0, __FUNCTION__ "(), can't get iobase of 0x%03x\n",
+		IRDA_DEBUG(0, __FUNCTION__ "(), can't get iobase of 0x%03x\n",
 		      idev->io.iobase2);
 		/* uircc_cleanup( self->idev);  */
 		return -ENODEV;
@@ -235,7 +235,7 @@
 	int iobase;
 	int status;
 
-	DEBUG(4, __FUNCTION__ "()\n");
+	IRDA_DEBUG(4, __FUNCTION__ "()\n");
 
 	ASSERT(idev != NULL, return -1;);
 	ASSERT(idev->magic == IRDA_DEVICE_MAGIC, return -1;);
@@ -252,11 +252,11 @@
 	irport_stop(idev, idev->io.iobase2);
 
 	/* Release the PORT that this driver is using */
-	DEBUG(4, __FUNCTION__ "(), Releasing Region %03x\n", idev->io.iobase);
+	IRDA_DEBUG(4, __FUNCTION__ "(), Releasing Region %03x\n", idev->io.iobase);
 	release_region(idev->io.iobase, idev->io.io_ext);
 
 	if (idev->io.iobase2) {
-		DEBUG(4, __FUNCTION__ "(), Releasing Region %03x\n", 
+		IRDA_DEBUG(4, __FUNCTION__ "(), Releasing Region %03x\n", 
 		      idev->io.iobase2);
 		release_region(idev->io.iobase2, idev->io.io_ext2);
 	}
@@ -278,13 +278,13 @@
 {
 	int version;
 	
-	DEBUG(4, __FUNCTION__ "()\n");
+	IRDA_DEBUG(4, __FUNCTION__ "()\n");
 
 	/* read the chip version, should be 0x03 */
 	version = inb(iobase+UIRCC_SR8);
 
 	if (version != 0x03) {
-		DEBUG(0, __FUNCTION__ "(), Wrong chip version");	
+		IRDA_DEBUG(0, __FUNCTION__ "(), Wrong chip version");	
 		return -1;
 	}
         printk(KERN_INFO "Sharp UIRCC IrDA driver loaded. Version: 0x%02x\n",
@@ -298,7 +298,7 @@
 	outb(0, iobase+UIRCC_CR11);
 	outb(0, iobase+UIRCC_CR9);
 
-	DEBUG(0, __FUNCTION__ "(), sr15=%#x\n", inb(iobase+UIRCC_SR15));
+	IRDA_DEBUG(0, __FUNCTION__ "(), sr15=%#x\n", inb(iobase+UIRCC_SR15));
 
 	/* Enable DMA single mode */
 	outb(UIRCC_CR1_RX_DMA|UIRCC_CR1_TX_DMA|UIRCC_CR1_MUST_SET, 
@@ -325,7 +325,7 @@
 	int modem = UIRCC_CR10_SIR;
 	int status;
 
-	DEBUG(0, __FUNCTION__ "()\n");
+	IRDA_DEBUG(0, __FUNCTION__ "()\n");
 
 	/* Just test the high speed stuff */
 	/*speed = 4000000;*/
@@ -358,11 +358,11 @@
 		break;
 	case 576000:		
 		
-		DEBUG(0, __FUNCTION__ "(), handling baud of 576000\n");
+		IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 576000\n");
 		break;
 	case 1152000:
 
-		DEBUG(0, __FUNCTION__ "(), handling baud of 1152000\n");
+		IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 1152000\n");
 		break;
 	case 4000000:
 		irport_stop(idev, idev->io.iobase2);
@@ -371,7 +371,7 @@
 		uircc_toshiba_cmd(&status, 0xffff, 0x001b, 0x0001);
 
 		modem = UIRCC_CR10_FIR;
-		DEBUG(0, __FUNCTION__ "(), handling baud of 4000000\n");
+		IRDA_DEBUG(0, __FUNCTION__ "(), handling baud of 4000000\n");
 
 		/* Set self pole address */
 		//outb(0xfe, iobase+UIRCC_CR8);
@@ -379,7 +379,7 @@
 	 	/* outb(0x10, iobase+UIRCC_CR11); */
 		break;
 	default:
-		DEBUG( 0, __FUNCTION__ "(), unknown baud rate of %d\n", speed);
+		IRDA_DEBUG( 0, __FUNCTION__ "(), unknown baud rate of %d\n", speed);
 		break;
 	}
 
@@ -419,7 +419,7 @@
 
 	iobase = idev->io.iobase;
 
-	DEBUG(4, __FUNCTION__ "(%ld), skb->len=%d\n", jiffies, (int) skb->len);
+	IRDA_DEBUG(4, __FUNCTION__ "(%ld), skb->len=%d\n", jiffies, (int) skb->len);
 	
 	/* Reset carrier latch */
 	/*outb(0x02, iobase+UIRCC_CR0);*/
@@ -429,7 +429,7 @@
 		return irport_hard_xmit(skb, dev);
 	}
 	
-	DEBUG(0, __FUNCTION__ "(), sr0=%#x, sr1=%#x, sr2=%#x, sr3=%#x, sr10=%#x, sr11=%#x\n",
+	IRDA_DEBUG(0, __FUNCTION__ "(), sr0=%#x, sr1=%#x, sr2=%#x, sr3=%#x, sr10=%#x, sr11=%#x\n",
 	      inb(iobase+UIRCC_SR0), inb(iobase+UIRCC_SR3),
 	      inb(iobase+UIRCC_SR2), inb(iobase+UIRCC_SR3), 
 	      inb(iobase+UIRCC_SR10), inb(iobase+UIRCC_SR11));
@@ -473,7 +473,7 @@
 {
 	struct uircc_cb *self;
 
-	DEBUG(4, __FUNCTION__ "()\n");
+	IRDA_DEBUG(4, __FUNCTION__ "()\n");
 
 	ASSERT(idev != NULL, return;);
 	ASSERT(idev->magic == IRDA_DEVICE_MAGIC, return;);
@@ -519,7 +519,7 @@
 	int iobase;
 	int len;
 
-	DEBUG(4, __FUNCTION__ "()\n");
+	IRDA_DEBUG(4, __FUNCTION__ "()\n");
 
 	ASSERT(idev != NULL, return;);
 	ASSERT(idev->magic == IRDA_DEVICE_MAGIC, return;);
@@ -535,7 +535,7 @@
 	len  = inb(iobase+UIRCC_SR4);      /* Low byte */
 	len |= inb(iobase+UIRCC_SR5) << 8; /* High byte */
 
-	DEBUG(4, __FUNCTION__ "(), sent %d bytes\n", len);
+	IRDA_DEBUG(4, __FUNCTION__ "(), sent %d bytes\n", len);
 
 	/* Disable transmit */
 	self->cr3 &= ~UIRCC_CR3_XMIT_EN;
@@ -576,7 +576,7 @@
 	ASSERT(idev != NULL, return -1;);
 	ASSERT(idev->magic == IRDA_DEVICE_MAGIC, return -1;);
 
-	DEBUG(4, __FUNCTION__ "\n");
+	IRDA_DEBUG(4, __FUNCTION__ "\n");
 
 	self = idev->priv;
 	iobase= idev->io.iobase;
@@ -614,7 +614,7 @@
 	self->cr3 = (UIRCC_CR3_RECV_EN|UIRCC_CR3_RX_CRC_EN);
 	outb(self->cr3, iobase+UIRCC_CR3);
 #endif
-	DEBUG(4, __FUNCTION__ "(), cr3=%#x\n", self->cr3);
+	IRDA_DEBUG(4, __FUNCTION__ "(), cr3=%#x\n", self->cr3);
 	
 	/* Address check? */
 
@@ -636,11 +636,11 @@
 
 	self = idev->priv;
 
-	DEBUG(0, __FUNCTION__ "()\n");
+	IRDA_DEBUG(0, __FUNCTION__ "()\n");
 
 	/* Check for CRC or framing error */
 	if (inb(iobase+UIRCC_SR0) & UIRCC_SR0_RX_CRCFRM) {
-		DEBUG(0, __FUNCTION__ "(), CRC or FRAME error\n");
+		IRDA_DEBUG(0, __FUNCTION__ "(), CRC or FRAME error\n");
 		return -1;
 	}
 
@@ -651,7 +651,7 @@
 	len = inb(iobase+UIRCC_SR4);       /* Low byte */
 	len |= inb(iobase+UIRCC_SR5) << 8; /* High byte */
 
-	DEBUG(0, __FUNCTION__ "(), len=%d\n", len);
+	IRDA_DEBUG(0, __FUNCTION__ "(), len=%d\n", len);
 
 	/* Receiving disable */
 	self->cr3 &= ~UIRCC_CR3_RECV_EN;
@@ -716,12 +716,12 @@
 	/* Read interrupt status */
 	sr3 = inb( iobase+UIRCC_SR3); 
 	if (!sr3) {
-		DEBUG(4,"**\n");
+		IRDA_DEBUG(4,"**\n");
 		return;
 	}
 	idev->netdev.interrupt = 1;
 
-	DEBUG(4, __FUNCTION__ "(), sr3=%#x, sr2=%#x, sr10=%#x\n", 
+	IRDA_DEBUG(4, __FUNCTION__ "(), sr3=%#x, sr2=%#x, sr10=%#x\n", 
 	      inb( iobase+UIRCC_SR3), inb( iobase+UIRCC_SR2), 
 	      inb( iobase+UIRCC_SR10));
 
@@ -750,7 +750,7 @@
 		     iobase+UIRCC_CR11);
 		break;
 	default:
-		DEBUG(0, __FUNCTION__ "(), unknown interrupt status=%#x\n",
+		IRDA_DEBUG(0, __FUNCTION__ "(), unknown interrupt status=%#x\n",
 		      sr3);
 		break;
 	}	
@@ -800,7 +800,7 @@
  */
 static int uircc_net_init( struct net_device *dev)
 {
-	DEBUG( 4, __FUNCTION__ "()\n");
+	IRDA_DEBUG( 4, __FUNCTION__ "()\n");
 
 	/* Setup to be a normal IrDA network device driver */
 	irda_device_setup(dev);
@@ -822,7 +822,7 @@
 	struct irda_device *idev;
 	int iobase;
 	
-	DEBUG( 4, __FUNCTION__ "()\n");
+	IRDA_DEBUG( 4, __FUNCTION__ "()\n");
 	
 	ASSERT(dev != NULL, return -1;);
 	idev = (struct irda_device *) dev->priv;
@@ -866,7 +866,7 @@
 	struct irda_device *idev;
 	int iobase;
 
-	DEBUG(4, __FUNCTION__ "()\n");
+	IRDA_DEBUG(4, __FUNCTION__ "()\n");
 	
 	ASSERT(dev != NULL, return -1;);
 	idev = (struct irda_device *) dev->priv;