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

[Mats F. <ma...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bcsp_datagram.c 1.4             1.5=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Use one function for all sync-msg


The diff of the modified file(s):

--- bcsp_datagram.c	2001/05/18 16:03:51	1.4
+++ bcsp_datagram.c	2001/05/25 14:09:17	1.5
@@ -53,11 +53,6 @@
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-#define SYNC     0xEDEDDCDA
-#define SYNC_RSP 0xEEEFAFAC
-#define CONF     0xEDACEFAD
-#define CONF_RSP 0xD0D0ADDE
-
 #if DATAGRAM_DEBUG
 #define D(fmt...) printk("DATAGRAM:  " fmt)
 #define PRINTPKT(data, len) print_data(NULL, data, len)
@@ -121,39 +116,29 @@
=20=09
 	sync_string =3D le32_to_cpu(get_unaligned((u32 *)bcsp->payload));
=20
-	if (sync_string =3D=3D SYNC) {
+	switch (sync_string) {
+	case SYNC:=09
 		D(__FUNCTION__ ": Found SYNC\n");
-		send_sync_rsp();=09=09
+		bcsp_send_sync(SYNC_RSP);=09=09
 		return TRUE;
-	} else if (sync_string =3D=3D CONF) {
+	case SYNC_RSP:
+		D(__FUNCTION__": Found SYNC_RSP\n");
+		bcsp_send_sync(CONF);
+		break;
+	case CONF:
 		D(__FUNCTION__ ": Found CONF\n");
-		send_conf_rsp();
+		bcsp_send_sync(CONF_RSP);
 		return TRUE;
-	} else {
+	case CONF_RSP:
+		D(__FUNCTION__": Found CONF_RSP\n");
+		break;
+	default:
 		return FALSE;
 	}
 }
=20
 s32
-bcsp_send_sync(void)
-{
-	return send_sync_pkt(SYNC);
-}
-
-s32
-send_sync_rsp(void)
-{
-	return send_sync_pkt(SYNC_RSP);
-}
-
-s32
-send_conf_rsp(void)
-{
-	return send_sync_pkt(CONF_RSP);
-}
-
-s32
-send_sync_pkt(u32 type)
+bcsp_send_sync(u32 type)
 {
 	struct bcsp bcsp;
 	u32 payload =3D cpu_to_le32(type);