CVS: The file 'linux/drivers/char/bluetooth/bcsp_datagram.c' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in linux/drivers/char/bluetooth:

Name             Old version  New version  Tag  Comment
----             -----------  -----------  ---  -------
bcsp_datagram.c  1.12         1.13=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20

The accompanying log:

* Send a CONF_RSP packet when a CONF packet is received.
* Do not use concatenation with __FUNCTION__ (it is deprecated).


The diff of the modified file(s):

--- bcsp_datagram.c	2002/08/01 16:19:28	1.12
+++ bcsp_datagram.c	2003/05/15 13:27:45	1.13
@@ -2,7 +2,7 @@
  * bcsp_datagram.c -- Implementation of the Datagram layer in the BCSP
  *                    protocol stack
  *
- * Copyright (C) 2001  Axis Communications AB
+ * Copyright (C) 2001, 2002, 2003  Axis Communications AB
  *
  * Author: Mats Friden <Mat...@ax...>
  *
@@ -109,13 +109,13 @@ bcsp_datagram_receive(struct bcsp *bcsp)
 	if (!bcsp_datagram_initiated)
 		return 0;            /* FIXME: Should this be an error code? */
=20
+	D("%s: Datagram packet received:\n", __FUNCTION__);
+	PRINTPKT(bcsp->payload, bcsp->payload_length);
+
 	if (handle_sync_pkt(bcsp)) {
 		return 0;
 	}
=20
-	D(__FUNCTION__ ": Datagram packet received:\n");
-	PRINTPKT(bcsp->payload, bcsp->payload_length);
-=09
 	return 0;
 }
=20
@@ -146,25 +146,27 @@ handle_sync_pkt(struct bcsp *bcsp)
 	sync_string =3D le32_to_cpu(get_unaligned((u32 *)bcsp->payload));
=20
 	switch (sync_string) {
-
 	case SYNC:=09
-		D(__FUNCTION__ ": Found SYNC\n");
-		D(__FUNCTION__ ": Send SYNC_RSP\n");
+		D("%s: Found SYNC\n", __FUNCTION__);
+		D("%s: Send SYNC_RSP\n", __FUNCTION__);
 		bcsp_send_sync(SYNC_RSP);
 		return TRUE;
=20
 	case SYNC_RSP:
-		D(__FUNCTION__": Found SYNC_RSP\n");
+		D("%s: Found SYNC_RSP\n", __FUNCTION__);
 		bcsp_syncronized();
 		return TRUE;
=20
 	case CONF: /* this should always be done */
-		D(__FUNCTION__ ": Found CONF, silent discard\n");
+		D("%s: Found CONF\n", __FUNCTION__);
+		D("%s: Send CONF_RSP\n", __FUNCTION__);
+		bcsp_send_sync(CONF_RSP);
 		return TRUE;
=20
 	case CONF_RSP:
-		D(__FUNCTION__": Found CONF_RSP\n");
+		D("%s: Found CONF_RSP\n", __FUNCTION__);
 		return TRUE;
+
 	default:
 		return FALSE;
 	}