diff -r 4b81101308c6 -r 4e80e1b997a8 bthci/bthci2/CommandsEvents/generator/Commands.txt
--- a/bthci/bthci2/CommandsEvents/generator/Commands.txt	Mon May 03 13:34:38 2010 +0300
+++ b/bthci/bthci2/CommandsEvents/generator/Commands.txt	Mon Jul 12 07:03:47 2010 +0300
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of the License "Eclipse Public License v1.0"
@@ -12,7 +12,6 @@
 #
 # Description:
 #
-
 # Bluetooth HCI Commands to be generated
 # Syntax is documented below. ("[]" brackets are used for grouping with regexp wildcards, and wildcard operators will only directly follow a ']')
 #
@@ -42,7 +41,7 @@
 PeriodicInquiryMode(1,False,True): MaxPeriodLength (2), MinPeriodLength (2), LAP (3), InquiryLength (1), NumResponses (1)
 ExitPeriodicInquiryMode(1,False,True):
 CreateACLConnection(1,True,False,Match,ConnectionCompleteEvent,True,False,BDADDR): BDADDR (6), PacketType (2), PageScanRepetitionMode (1), Reserved (1), ClockOffset (2), AllowRoleSwitch (1)
-Disconnect(1,True,False,Match,DisconnectionCompleteEvent,True,False): ConnectionHandle (2), Reason (1)
+Disconnect(1,True,False,Match,DisconnectionCompleteEvent,True,False,ConnectionHandle): ConnectionHandle (2), Reason (1)
 CreateConnectionCancel(1,False,True): BDADDR (6)
 AcceptConnectionRequest(1,True,False,Match,ConnectionCompleteEvent,True,False,BDADDR): BDADDR (6), Role (1)
 RejectConnectionRequest(1,True,False,Match,ConnectionCompleteEvent,True,False,BDADDR): BDADDR (6), Reason (1)
@@ -83,7 +82,7 @@
 ExitParkMode(1,True,False,Match,ModeChangeEvent,True,False,ConnectionHandle): ConnectionHandle (2)
 QOSSetup(1,True,False,Match,QOSSetupCompleteEvent,True,False): ConnectionHandle (2), Flags (1), ServiceType (1), TokenRate (4), PeakBandwidth (4), Latency (4), DelayVariation (4)
 RoleDiscovery(1,False,True): ConnectionHandle (2)
-SwitchRole(1,True,False,Match,RoleChangeEvent,True,False): BDADDR (6), Role (1)
+SwitchRole(1,True,False,Match,RoleChangeEvent,True,False,BDADDR): BDADDR (6), Role (1)
 ReadLinkPolicySettings(1,False,True): ConnectionHandle (2)
 WriteLinkPolicySettings(1,False,True): ConnectionHandle (2), LinkPolicySettings (2)
 ReadDefaultLinkPolicySettings(1,False,True):