bluetooth/btstack/l2cap/l2sap.cpp
branchRCL_3
changeset 22 786b94c6f0a4
parent 8 2b6718f05bdb
equal deleted inserted replaced
21:14e240312f6f 22:786b94c6f0a4
   433 			}
   433 			}
   434 
   434 
   435 		case KL2CAPUpdateChannelConfig:
   435 		case KL2CAPUpdateChannelConfig:
   436 			{
   436 			{
   437 			const TL2CapConfig apiConf = *reinterpret_cast<const TL2CapConfig*>(aOption.Ptr());
   437 			const TL2CapConfig apiConf = *reinterpret_cast<const TL2CapConfig*>(aOption.Ptr());
   438 			return iL2CapSAPSignalHandler->UpdateChannelConfig(apiConf);
   438             return UpdateChannelConfig(apiConf);
   439 			}
   439 			}
   440 			
   440 			
   441 		// Can't set these
   441 		// Can't set these
   442 		default:
   442 		default:
   443 			return KErrNotSupported;
   443 			return KErrNotSupported;
  1082 	const TL2CapFecNegotiator& fec = aConfig.FecNegotiator();
  1082 	const TL2CapFecNegotiator& fec = aConfig.FecNegotiator();
  1083 	TL2CapDataControllerConfig* dataConfig = new TL2CapDataControllerConfig(fec.DataControllerConfig());
  1083 	TL2CapDataControllerConfig* dataConfig = new TL2CapDataControllerConfig(fec.DataControllerConfig());
  1084 
  1084 
  1085 	if(dataConfig)
  1085 	if(dataConfig)
  1086 		{
  1086 		{
       
  1087 		// if UpdateChannelConfig was called before iL2CapDataQueue was created we update the priority now
       
  1088 		if (iChannelPriority != 0)
       
  1089 			{
       
  1090 			dataConfig->SetChannelPriority(iChannelPriority);
       
  1091 			}
  1087 		TRAP(rerr, iL2CapDataQueue = CL2CapSDUQueue::NewL(*this,
  1092 		TRAP(rerr, iL2CapDataQueue = CL2CapSDUQueue::NewL(*this,
  1088 		                                                  aLocalPort,
  1093 		                                                  aLocalPort,
  1089 		                                                  aRemotePort,
  1094 		                                                  aRemotePort,
  1090 		                                                  aMuxer,
  1095 		                                                  aMuxer,
  1091 					                       				  fec.OutgoingMaximumPDUSize(),
  1096 					                       				  fec.OutgoingMaximumPDUSize(),