Hi Arun,
patch doesn't not apply. Please rebase and send the patch series again.
On Wed, Feb 23, 2011 at 7:07 AM, Arun Kumar SINGH
<arunkr.singh@xxxxxxxxxxxxxx> wrote:
> From fd4e7d6f3b9b33c7b75f7da5600c6fc0fb947b06 Mon Sep 17 00:00:00 2001
> From: ArunKumarSingh <arunkr.singh@xxxxxxxxxxxxxx>
> Date: Wed, 23 Feb 2011 11:24:58 +0530
> Subject: [PATCH] Commands to add device to White-list
>
> ---
> Âlib/hci.c    |  29 +++++++++++++++++++++++++++++
> Âlib/hci.h    |  Â5 +++++
> Âlib/hci_lib.h  |  Â1 +
> Âtools/hcitool.c | Â 47 +++++++++++++++++++++++++++++++++++++++++++++++
> Â4 files changed, 82 insertions(+), 0 deletions(-)
> Âmode change 100644 => 100755 lib/hci.c
> Âmode change 100644 => 100755 lib/hci.h
> Âmode change 100644 => 100755 lib/hci_lib.h
> Âmode change 100644 => 100755 tools/hcitool.c
>
> diff --git a/lib/hci.c b/lib/hci.c
> old mode 100644
> new mode 100755
> index 048fda4..a85f193
> --- a/lib/hci.c
> +++ b/lib/hci.c
> @@ -1291,6 +1291,35 @@ int hci_disconnect(int dd, uint16_t handle, uint8_t reason, int to)
> Â Â Â Âreturn 0;
> Â}
>
> +int hci_le_add_to_white_list(int dd, const bdaddr_t *bdaddr, uint8_t type)
use the enum that you added instead of uint8_t
> +{
> + Â Â Â struct hci_request rq;
> + Â Â Â le_add_device_to_white_list_cp cp;
> + Â Â Â uint8_t status;
> +
> + Â Â Â memset(&cp, 0, sizeof(cp));
> + Â Â Â cp.bdaddr_type = type;
> + Â Â Â bacpy(&cp.bdaddr, bdaddr);
> +
> + Â Â Â memset(&rq, 0, sizeof(rq));
> + Â Â Â rq.ogf = OGF_LE_CTL;
> + Â Â Â rq.ocf = OCF_LE_ADD_DEVICE_TO_WHITE_LIST;
> + Â Â Â rq.cparam = &cp;
> + Â Â Â rq.clen = LE_ADD_DEVICE_TO_WHITE_LIST_CP_SIZE;
> + Â Â Â rq.rparam = &status;
> + Â Â Â rq.rlen = 1;
> +
> + Â Â Â if (hci_send_req(dd, &rq, 1000) < 0)
> + Â Â Â Â Â Â Â return -1;
Pass the timeout as parameter to this function to follow the same
standard of the other hci_* functions
> +
> + Â Â Â if (status) {
> + Â Â Â Â Â Â Â errno = EIO;
> + Â Â Â Â Â Â Â return -1;
> + Â Â Â }
> +
> + Â Â Â return 0;
> +}
> +
> Âint hci_read_local_name(int dd, int len, char *name, int to)
> Â{
> Â Â Â Âread_local_name_rp rp;
> diff --git a/lib/hci.h b/lib/hci.h
> old mode 100644
> new mode 100755
> index 9b5388b..06d0b35
> --- a/lib/hci.h
> +++ b/lib/hci.h
> @@ -1523,6 +1523,11 @@ typedef struct {
>
> Â#define OCF_LE_CREATE_CONN_CANCEL Â Â Â Â Â Â Â0x000E
>
> +typedef enum {
> + Â Â Â LE_PUBLIC_DEVICE_ADDR = 0x00,
> + Â Â Â LE_RANDOM_DEVICE_ADDR = 0x01,
> +}le_device_addr_type;
In BlueZ we use "device" to refer to remote devices and "adapter" to
represent the local adapter. If the same constant will be used in
other hci commands related to the local adapter you could simply call
it le_address_type. One example is cmd_lecc() which uses a hardcode
value to "own address type".
BR,
Claudio
> +
> Â#define OCF_LE_READ_WHITE_LIST_SIZE Â Â Â Â Â Â0x000F
> Âtypedef struct {
>    Âuint8_t     status;
> diff --git a/lib/hci_lib.h b/lib/hci_lib.h
> old mode 100644
> new mode 100755
> index b63a2a4..7127d70
> --- a/lib/hci_lib.h
> +++ b/lib/hci_lib.h
> @@ -127,6 +127,7 @@ int hci_le_create_conn(int dd, uint16_t interval, uint16_t window,
> Â Â Â Â Â Â Â Âuint16_t latency, uint16_t supervision_timeout,
> Â Â Â Â Â Â Â Âuint16_t min_ce_length, uint16_t max_ce_length,
> Â Â Â Â Â Â Â Âuint16_t *handle, int to);
> +int hci_le_add_to_white_list(int dd, const bdaddr_t *bdaddr, uint8_t type);
>
> Âint hci_for_each_dev(int flag, int(*func)(int dd, int dev_id, long arg), long arg);
> Âint hci_get_route(bdaddr_t *bdaddr);
> diff --git a/tools/hcitool.c b/tools/hcitool.c
> old mode 100644
> new mode 100755
> index d7a82cc..b5109b8
> --- a/tools/hcitool.c
> +++ b/tools/hcitool.c
> @@ -2487,6 +2487,52 @@ static void cmd_lecc(int dev_id, int argc, char **argv)
> Â Â Â Âhci_close_dev(dd);
> Â}
>
> +static struct option leaddwl_options[] = {
> + Â Â Â { "help", Â Â Â 0, 0, 'h' },
> + Â Â Â { 0, 0, 0, 0 }
> +};
> +
> +static const char *leaddwl_help =
> + Â Â Â "Usage:\n"
> + Â Â Â "\tleaddwl\n";
> +
> +static void cmd_leaddwl(int dev_id, int argc, char **argv)
> +{
> + Â Â Â int err, opt, dd;
> + Â Â Â bdaddr_t bdaddr;
> + Â Â Â le_device_addr_type bdaddr_type;
> +
> + Â Â Â for_each_opt(opt, leaddwl_options, NULL) {
> + Â Â Â Â Â Â Â switch (opt) {
> + Â Â Â Â Â Â Â default:
> + Â Â Â Â Â Â Â Â Â Â Â printf("%s", leaddwl_help);
> + Â Â Â Â Â Â Â Â Â Â Â return;
> + Â Â Â Â Â Â Â }
> + Â Â Â }
> +
> + Â Â Â helper_arg(1, 1, &argc, &argv, leaddwl_help);
> +
> + Â Â Â if (dev_id < 0)
> + Â Â Â Â Â Â Â dev_id = hci_get_route(NULL);
> +
> + Â Â Â dd = hci_open_dev(dev_id);
> + Â Â Â if (dd < 0) {
> + Â Â Â Â Â Â Â perror("Could not open device");
> + Â Â Â Â Â Â Â exit(1);
> + Â Â Â }
> +
> + Â Â Â str2ba(argv[0], &bdaddr);
> + Â Â Â bdaddr_type = LE_PUBLIC_DEVICE_ADDR;
> +
> + Â Â Â err = hci_le_add_to_white_list(dd, &bdaddr, bdaddr_type);
> + Â Â Â hci_close_dev(dd);
> +
> + Â Â Â if (err < 0) {
> + Â Â Â Â Â Â Â perror("Cant add to white list");
> + Â Â Â Â Â Â Â exit(1);
> + Â Â Â }
> +}
> +
> Âstatic struct option ledc_options[] = {
> Â Â Â Â{ "help", Â Â Â 0, 0, 'h' },
> Â Â Â Â{ 0, 0, 0, 0 }
> @@ -2563,6 +2609,7 @@ static struct {
> Â Â Â Â{ "clkoff", cmd_clkoff, "Read clock offset" Â Â Â Â Â Â Â Â Â Â},
> Â Â Â Â{ "clock", Âcmd_clock, Â"Read local or remote clock" Â Â Â Â Â },
> Â Â Â Â{ "lescan", cmd_lescan, "Start LE scan" Â Â Â Â Â Â Â Â Â Â Â Â},
> + Â Â Â { "leaddwl", cmd_leaddwl, "Add this device to white list" Â Â Â Â Â},
> Â Â Â Â{ "lecc", Â cmd_lecc, Â "Create a LE Connection", Â Â Â Â Â Â Â},
> Â Â Â Â{ "ledc", Â cmd_ledc, Â "Disconnect a LE Connection", Â Â Â Â Â},
> Â Â Â Â{ NULL, NULL, 0 }
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at Âhttp://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
