head 1.5; access; symbols pkgsrc-2014Q4:1.4.0.22 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.20 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.18 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.16 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.14 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.12 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.10 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.8 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.4 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.2 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.3.0.2 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.1.1.1.0.10 pkgsrc-2011Q4-base:1.1.1.1 pkgsrc-2011Q3:1.1.1.1.0.8 pkgsrc-2011Q3-base:1.1.1.1 pkgsrc-2011Q2:1.1.1.1.0.6 pkgsrc-2011Q2-base:1.1.1.1 pkgsrc-2011Q1:1.1.1.1.0.4 pkgsrc-2011Q1-base:1.1.1.1 pkgsrc-2010Q4:1.1.1.1.0.2 pkgsrc-2010Q4-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2014.12.30.08.39.13; author plunky; state dead; branches; next 1.4; commitid xDe1iwc4jmyyC24y; 1.4 date 2012.05.21.07.01.32; author plunky; state Exp; branches; next 1.3; 1.3 date 2012.03.19.12.09.00; author plunky; state Exp; branches; next 1.2; 1.2 date 2012.02.15.09.30.23; author plunky; state Exp; branches; next 1.1; 1.1 date 2010.12.19.20.20.42; author plunky; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2010.12.19.20.20.42; author plunky; state Exp; branches 1.1.1.1.8.1 1.1.1.1.10.1; next ; 1.1.1.1.8.1 date 2014.12.27.10.45.25; author plunky; state dead; branches; next 1.1.1.1.8.2; commitid Zhdxw2THSI8SpF3y; 1.1.1.1.8.2 date 2014.12.27.11.59.22; author plunky; state Exp; branches; next ; commitid k1YWkRBu6qN8PF3y; 1.1.1.1.10.1 date 2012.02.15.09.17.17; author plunky; state Exp; branches; next 1.1.1.1.10.2; 1.1.1.1.10.2 date 2012.02.15.09.26.54; author plunky; state Exp; branches; next ; desc @@ 1.5 log @update to latest upstream version. Major changes include hcidump has now been merged with the main BlueZ distribution, so the version number reflects that release hcidump is moved from sbin to bin (and man section 8 -> 1) TCP/IP server mode was removed parsing added for SAP and SMP profiles, and A2MP signals @ text @$NetBSD: patch-ac,v 1.4 2012/05/21 07:01:32 plunky Exp $ --- lib/hci.h.orig 2012-02-29 18:23:20.000000000 +0000 +++ lib/hci.h @@@@ -39,6 +39,7 @@@@ extern "C" { #define HCI_MAX_EVENT_SIZE 260 #define HCI_MAX_FRAME_SIZE (HCI_MAX_ACL_SIZE + 4) +#if 0 /* HCI dev events */ #define HCI_DEV_REG 1 #define HCI_DEV_UNREG 2 @@@@ -55,11 +56,13 @@@@ extern "C" { #define HCI_RS232 4 #define HCI_PCI 5 #define HCI_SDIO 6 +#endif /* HCI controller types */ #define HCI_BREDR 0x00 #define HCI_AMP 0x01 +#if 0 /* HCI device flags */ enum { HCI_UP, @@@@ -107,6 +110,7 @@@@ enum { #define HCIUNBLOCKADDR _IOW('H', 231, int) #define HCIINQUIRY _IOR('H', 240, int) +#endif #ifndef __NO_HCI_DEFS @@@@ -2262,6 +2266,7 @@@@ typedef struct { #endif /* _NO_HCI_DEFS */ +#if 0 /* HCI Socket options */ #define HCI_DATA_DIR 1 #define HCI_FILTER 2 @@@@ -2374,6 +2379,12 @@@@ struct hci_inquiry_req { uint8_t num_rsp; }; #define IREQ_CACHE_FLUSH 0x0001 +#else +#define HCI_CMSG_DIR SCM_HCI_DIRECTION +#define HCI_CMSG_TSTAMP SCM_TIMESTAMP +#define HCI_DEV_NONE NULL +#define HCI_DATA_DIR SO_HCI_DIRECTION +#endif #ifdef __cplusplus } @ 1.4 log @update to BlueZ hcidump 2.4 This release adds support for A2MP, L2CAP create/move channel, SAP and additional AVRCP decoding. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2012/03/19 12:09:00 plunky Exp $ @ 1.3 log @adjust this build so that it doesn't need to make a .a library, to avoid breakage on pkgbulk build which does not provide the same level of mk support as a NetBSD host @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2012/02/15 09:30:23 plunky Exp $ d13 15 a27 1 @@@@ -107,6 +108,7 @@@@ enum { d35 1 a35 1 @@@@ -2262,6 +2264,7 @@@@ typedef struct { d43 1 a43 1 @@@@ -2374,6 +2377,12 @@@@ struct hci_inquiry_req { @ 1.2 log @update to BlueZ HCIdump 2.2, changes are basically increased parsing for L2CAP packets, new parsing for AVCTP and AVRCP protocols, some endian bugfixes and the archive now contains the files needed from bluez-libs so we don't need to get that separately. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1.1.1 2010/12/19 20:20:42 plunky Exp $ d3 1 a3 1 --- lib/hci.h.orig 2011-12-22 00:18:58.000000000 +0000 d21 1 a21 1 @@@@ -2252,6 +2254,7 @@@@ typedef struct { d29 1 a29 1 @@@@ -2363,6 +2366,12 @@@@ struct hci_inquiry_req { @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- bluetooth/hci.h.orig 2010-09-30 08:53:08.000000000 +0000 +++ bluetooth/hci.h d13 1 a13 1 @@@@ -101,6 +102,7 @@@@ enum { d21 1 a21 1 @@@@ -2232,6 +2234,7 @@@@ typedef struct { d29 1 a29 1 @@@@ -2339,6 +2342,12 @@@@ struct hci_inquiry_req { @ 1.1.1.1 log @HCIdump reads raw HCI data coming from and going to a Bluetooth device and prints to screen commands, events and data in a human-readable form. Optionally, the dump can be written to a file rather than parsed, and the dump file can be parsed in a subsequent moment. This is a patched standalone version not requiring bluez-libs, suitable for use with the netbt Bluetooth stack [originating] in NetBSD. -- the sysutils/hcidump package (which this will replace) is a descendent of a previous version of the bluez-hcidump package. @ text @@ 1.1.1.1.8.1 log @there is a later version already in pkgsrc as sysutils/netbt-hcidump @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1.1.1 2010/12/19 20:20:42 plunky Exp $ @ 1.1.1.1.8.2 log @re-add these files. (previous commit my mistake, wrong tag) @ text @@ 1.1.1.1.10.1 log @update to BlueZ HCIdump 2.2, changes are basically increased parsing for L2CAP packets, new parsing for AVCTP and AVRCP protocols, some endian bugfixes and the archive now contains the files needed from bluez-libs so we don't need to get that separately. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1.1.1 2010/12/19 20:20:42 plunky Exp $ d3 2 a4 2 --- lib/hci.h.orig 2011-12-22 00:18:58.000000000 +0000 +++ lib/hci.h d13 1 a13 1 @@@@ -107,6 +108,7 @@@@ enum { d21 1 a21 1 @@@@ -2252,6 +2254,7 @@@@ typedef struct { d29 1 a29 1 @@@@ -2363,6 +2366,12 @@@@ struct hci_inquiry_req { @ 1.1.1.1.10.2 log @revert previous (sorry, was supposed to be on HEAD) @ text @d3 2 a4 2 --- bluetooth/hci.h.orig 2010-09-30 08:53:08.000000000 +0000 +++ bluetooth/hci.h d13 1 a13 1 @@@@ -101,6 +102,7 @@@@ enum { d21 1 a21 1 @@@@ -2232,6 +2234,7 @@@@ typedef struct { d29 1 a29 1 @@@@ -2339,6 +2342,12 @@@@ struct hci_inquiry_req { @