patch-2.3.26 linux/net/irda/ircomm/ircomm_event.c

• Lines: 87
• Date: Tue Nov 2 17:07:55 1999
• Orig file: v2.3.25/linux/net/irda/ircomm/ircomm_event.c
• Orig date: Mon Oct 4 15:49:30 1999

diff -u --recursive --new-file v2.3.25/linux/net/irda/ircomm/ircomm_event.c linux/net/irda/ircomm/ircomm_event.c
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Sun Jun  6 20:33:11 1999
- * Modified at:   Thu Sep  2 10:09:25 1999
+ * Modified at:   Sat Oct 30 13:05:23 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1999 Dag Brattli, All Rights Reserved.
@@ -50,7 +50,6 @@
 static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, 
 			     struct sk_buff *skb, struct ircomm_info *info);
 
-
 char *ircomm_state[] = {
 	"IRCOMM_IDLE",
 	"IRCOMM_WAITI",
@@ -108,8 +107,8 @@
 		ircomm_connect_indication(self, skb, info);
 		break;
 	default:
-		DEBUG(4, __FUNCTION__"(), unknown event: %s\n",
-		      ircomm_event[event]);
+		IRDA_DEBUG(4, __FUNCTION__"(), unknown event: %s\n",
+			   ircomm_event[event]);
 		return -EINVAL;
 	}
 	return ret;
@@ -138,8 +137,8 @@
 		ircomm_disconnect_indication(self, skb, info);
 		break;
 	default:
-		DEBUG(0, __FUNCTION__"(), unknown event: %s\n",
-		      ircomm_event[event]);
+		IRDA_DEBUG(0, __FUNCTION__"(), unknown event: %s\n",
+			   ircomm_event[event]);
 		ret = -EINVAL;
 	}
 	return ret;
@@ -171,8 +170,8 @@
 		ircomm_disconnect_indication(self, skb, info);
 		break;
 	default:
-		DEBUG(0, __FUNCTION__ "(), unknown event = %s\n",
-		      ircomm_event[event]);
+		IRDA_DEBUG(0, __FUNCTION__ "(), unknown event = %s\n",
+			   ircomm_event[event]);
 		ret = -EINVAL;
 	}
 	return ret;
@@ -213,14 +212,13 @@
 		ret = self->issue.disconnect_request(self, skb, info);
 		break;
 	default:
-		DEBUG(0, __FUNCTION__ "(), unknown event = %s\n",
-		      ircomm_event[event]);
+		IRDA_DEBUG(0, __FUNCTION__ "(), unknown event = %s\n",
+			   ircomm_event[event]);
 		ret = -EINVAL;
 	}
 	return ret;
 }
 
-
 /*
  * Function ircomm_do_event (self, event, skb)
  *
@@ -230,8 +228,8 @@
 int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event,
 		    struct sk_buff *skb, struct ircomm_info *info) 
 {
-	DEBUG(4, __FUNCTION__": state=%s, event=%s\n",
-	      ircomm_state[self->state], ircomm_event[event]);
+	IRDA_DEBUG(4, __FUNCTION__": state=%s, event=%s\n",
+		   ircomm_state[self->state], ircomm_event[event]);
 
 	return (*state[self->state])(self, event, skb, info);
 }
@@ -246,6 +244,6 @@
 {
 	self->state = state;
 	
-	DEBUG(4, __FUNCTION__": next state=%s, service type=%d\n", 
-	      ircomm_state[self->state], self->service_type);
+	IRDA_DEBUG(4, __FUNCTION__": next state=%s, service type=%d\n", 
+		   ircomm_state[self->state], self->service_type);
 }