From: Myles Watson Date: Fri, 2 Dec 2016 20:44:57 +0000 (-0800) Subject: Fix formatting of config files X-Git-Tag: android-x86-8.1-r1~196^2~67^2~156^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dde03b2b53a5ebf5b1a27f6bf11b2a2cf5833782;p=android-x86%2Fsystem-bt.git Fix formatting of config files Revert "Apply clang-format to the rest of the tree" for .conf files Change-Id: If3f4a06bd8ebceedf1911b77afb29605fbeb92ef Test: mma -j32 --- diff --git a/conf/bt_did.conf b/conf/bt_did.conf index 2027c6546..631cc6df3 100644 --- a/conf/bt_did.conf +++ b/conf/bt_did.conf @@ -1,92 +1,85 @@ -#Device ID(DID) configuration +# Device ID (DID) configuration [DID1] -#Primary Record - true or false(default) -#There can be only one primary record - primaryRecord = true +# Primary Record - true or false (default) +# There can be only one primary record +primaryRecord = true -#Vendor ID '0xFFFF' indicates no Device ID Service Record is present in the \ - device -# 0x000F = Broadcom Corporation(default) +# Vendor ID '0xFFFF' indicates no Device ID Service Record is present in the device +# 0x000F = Broadcom Corporation (default) #vendorId = 0x000F -#Vendor ID Source -# 0x0001 = Bluetooth SIG assigned Device ID Vendor ID value(default) +# Vendor ID Source +# 0x0001 = Bluetooth SIG assigned Device ID Vendor ID value (default) # 0x0002 = USB Implementer's Forum assigned Device ID Vendor ID value #vendorIdSource = 0x0001 -#Product ID& Product Version -#Per spec DID v1 .3 0xJJMN for version is interpreted as JJ.M.N -#JJ : major version number, M : minor version number, \ - N : sub - minor version number -#For example : 1200, v14 .3.6 - productId = 0x1200 version = 0x1436 +# Product ID & Product Version +# Per spec DID v1.3 0xJJMN for version is interpreted as JJ.M.N +# JJ: major version number, M: minor version number, N: sub-minor version number +# For example: 1200, v14.3.6 +productId = 0x1200 +version = 0x1436 -#Optional attributes +# Optional attributes #clientExecutableURL = #serviceDescription = #documentationURL = -#== == == == == == == == == == == == == == == == == == == == == == == == == == \ - == == == == == == == == == == == == == == == == == == == == == == = # -#Device ID(DID) configuration - [DID2] +#=================================================================================================# +# Device ID (DID) configuration +[DID2] -#Primary Record - true or false(default) -#There can be only one primary record +# Primary Record - true or false (default) +# There can be only one primary record #primaryRecord = false -#Vendor ID '0xFFFF' indicates no Device ID Service Record is present in the \ - device -# 0x000F = Broadcom Corporation(default) +# Vendor ID '0xFFFF' indicates no Device ID Service Record is present in the device +# 0x000F = Broadcom Corporation (default) #vendorId = 0x000F -#Vendor ID Source -# 0x0001 = Bluetooth SIG assigned Device ID Vendor ID value(default) +# Vendor ID Source +# 0x0001 = Bluetooth SIG assigned Device ID Vendor ID value (default) # 0x0002 = USB Implementer's Forum assigned Device ID Vendor ID value #vendorIdSource = 0x0001 -#Product ID& Product Version -#Per spec DID v1 .3 0xJJMN for version is interpreted as JJ.M.N -#JJ : major version number, M : minor version number, \ - N : sub - minor version number -#Default : 0x0000, v00 .0.0 +# Product ID & Product Version +# Per spec DID v1.3 0xJJMN for version is interpreted as JJ.M.N +# JJ: major version number, M: minor version number, N: sub-minor version number +# Default: 0x0000, v00.0.0 #productId = 0x0000 #version = 0x0000 -#Optional attributes +# Optional attributes #clientExecutableURL = #serviceDescription = #documentationURL = -#== == == == == == == == == == == == == == == == == == == == == == == == == == \ - == == == == == == == == == == == == == == == == == == == == == == = # -#Device ID(DID) configuration - [DID3] +#=================================================================================================# +# Device ID (DID) configuration +[DID3] -#Primary Record - true or false(default) -#There can be only one primary record +# Primary Record - true or false (default) +# There can be only one primary record #primaryRecord = false -#Vendor ID '0xFFFF' indicates no Device ID Service Record is present in the \ - device -# 0x000F = Broadcom Corporation(default) +# Vendor ID '0xFFFF' indicates no Device ID Service Record is present in the device +# 0x000F = Broadcom Corporation (default) #vendorId = 0x000F -#Vendor ID Source -# 0x0001 = Bluetooth SIG assigned Device ID Vendor ID value(default) +# Vendor ID Source +# 0x0001 = Bluetooth SIG assigned Device ID Vendor ID value (default) # 0x0002 = USB Implementer's Forum assigned Device ID Vendor ID value #vendorIdSource = 0x0001 -#Product ID& Product Version -#Per spec DID v1 .3 0xJJMN for version is interpreted as JJ.M.N -#JJ : major version number, M : minor version number, \ - N : sub - minor version number -#Default : 0x0000, v00 .0.0 +# Product ID & Product Version +# Per spec DID v1.3 0xJJMN for version is interpreted as JJ.M.N +# JJ: major version number, M: minor version number, N: sub-minor version number +# Default: 0x0000, v00.0.0 #productId = 0x0000 #version = 0x0000 -#Optional attributes +# Optional attributes #clientExecutableURL = #serviceDescription = #documentationURL = diff --git a/conf/bt_stack.conf b/conf/bt_stack.conf index a8e3ce4e1..6654943c2 100644 --- a/conf/bt_stack.conf +++ b/conf/bt_stack.conf @@ -1,37 +1,50 @@ -#Enable BtSnoop logging function -#valid value : true, false -BtSnoopLogOutput = false +# Enable BtSnoop logging function +# valid value : true, false +BtSnoopLogOutput=false -#BtSnoop log output file - BtSnoopFileName = / data / misc / bluetooth / logs / - btsnoop_hci.log +# BtSnoop log output file +BtSnoopFileName=/data/misc/bluetooth/logs/btsnoop_hci.log -#Preserve existing BtSnoop log before overwriting - BtSnoopSaveLog = false +# Preserve existing BtSnoop log before overwriting +BtSnoopSaveLog=false -#Enable trace level reconfiguration function -#Must be present before any TRC_ trace level settings - TraceConf = true +# Enable trace level reconfiguration function +# Must be present before any TRC_ trace level settings +TraceConf=true -#Trace level configuration -#BT_TRACE_LEVEL_NONE 0(No trace messages to be generated) -#BT_TRACE_LEVEL_ERROR 1(Error condition trace messages) -#BT_TRACE_LEVEL_WARNING 2(Warning condition trace messages) -#BT_TRACE_LEVEL_API 3(API traces) -#BT_TRACE_LEVEL_EVENT 4(Debug messages for events) -#BT_TRACE_LEVEL_DEBUG 5(Full debug messages) -#BT_TRACE_LEVEL_VERBOSE 6(Verbose messages) - \ - Currently supported for TRC_BTAPP only. - TRC_BTM = 2 TRC_HCI = 2 TRC_L2CAP = 2 TRC_RFCOMM = 2 TRC_OBEX = 2 TRC_AVCT = - 2 TRC_AVDT = 2 TRC_AVRC = 2 TRC_AVDT_SCB = 2 TRC_AVDT_CCB = 2 TRC_A2D = - 2 TRC_SDP = 2 TRC_GATT = 2 TRC_SMP = 2 TRC_BTAPP = 2 TRC_BTIF = - 2 TRC_GAP = 2 TRC_BNEP = 2 TRC_PAN = 2 +# Trace level configuration +# BT_TRACE_LEVEL_NONE 0 ( No trace messages to be generated ) +# BT_TRACE_LEVEL_ERROR 1 ( Error condition trace messages ) +# BT_TRACE_LEVEL_WARNING 2 ( Warning condition trace messages ) +# BT_TRACE_LEVEL_API 3 ( API traces ) +# BT_TRACE_LEVEL_EVENT 4 ( Debug messages for events ) +# BT_TRACE_LEVEL_DEBUG 5 ( Full debug messages ) +# BT_TRACE_LEVEL_VERBOSE 6 ( Verbose messages ) - Currently supported for TRC_BTAPP only. +TRC_BTM=2 +TRC_HCI=2 +TRC_L2CAP=2 +TRC_RFCOMM=2 +TRC_OBEX=2 +TRC_AVCT=2 +TRC_AVDT=2 +TRC_AVRC=2 +TRC_AVDT_SCB=2 +TRC_AVDT_CCB=2 +TRC_A2D=2 +TRC_SDP=2 +TRC_GATT=2 +TRC_SMP=2 +TRC_BTAPP=2 +TRC_BTIF=2 +TRC_GAP=2 +TRC_BNEP=2 +TRC_PAN=2 -#This is Log configuration for new C++ code using LOG() macros. -#See libchrome / base / logging.h for description on how to configure your logs. -#sample configuration: -#LoggingV = --v = 0 -#LoggingVModule = --vmodule = * / btm/*=1,btm_ble_multi*=2,btif_*=1 +# This is Log configuration for new C++ code using LOG() macros. +# See libchrome/base/logging.h for description on how to configure your logs. +# sample configuration: +#LoggingV=--v=0 +#LoggingVModule=--vmodule=*/btm/*=1,btm_ble_multi*=2,btif_*=1 # PTS testing helpers