Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/26 20:36:33+01:00 handhelds.org!zecke
BlueZ Builds:
	-Do not use the dbus pin helper in dbus less builds

BKrev: 4221dabaik-7BmpmIMlHMRcxQawRaw

diff --git a/packages/bluez-utils/bluez-utils-dbus/hcid.conf b/packages/bluez-utils/bluez-utils-dbus/hcid.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/bluez-utils/files/hcid.conf b/packages/bluez-utils/files/hcid.conf
index e69de29..6a1e06f 100644 (file)
--- a/packages/bluez-utils/files/hcid.conf
+++ b/packages/bluez-utils/files/hcid.conf
@@ -0,0 +1,72 @@
+#
+# HCI daemon configuration file.
+#
+# $Id$
+#
+
+# HCId options
+options {
+       # Automatically initialize new devices
+       autoinit yes;
+
+       # Security Manager mode
+       #   none - Security manager disabled
+       #   auto - Use local PIN for incoming connections
+       #   user - Always ask user for a PIN
+       #
+       security auto;
+
+       # Pairing mode
+       #   none  - Pairing disabled
+       #   multi - Allow pairing with already paired devices
+       #   once  - Pair once and deny successive attempts
+       pairing multi;
+
+       # PIN helper
+       pin_helper /usr/bin/bluepin;
+
+       # D-Bus PIN helper
+       # dbus_pin_helper;
+}
+
+# Default settings for HCI devices
+device {
+       # Local device name
+       #   %d - device id
+       #   %h - host name
+       name "%h";
+
+       # Local device class
+       class 0x120112;
+
+       # Default packet type
+       #pkt_type DH1,DM1,HV1;
+
+       # Inquiry and Page scan
+       iscan enable; pscan enable;
+
+       # Default link mode
+       #   none   - no specific policy 
+       #   accept - always accept incoming connections
+       #   master - become master on incoming connections,
+       #            deny role switch on outgoing connections
+       #
+       #lm accept,master;
+       #
+       lm accept;
+
+       # Default link policy
+       #   none    - no specific policy
+       #   rswitch - allow role switch
+       #   hold    - allow hold mode
+       #   sniff   - allow sniff mode
+       #   park    - allow park mode
+       #
+       #lp hold,sniff;
+       #
+       lp rswitch,hold,sniff,park;
+
+       # Authentication and Encryption
+       #auth enable;
+       encrypt enable;
+}