Attachment #213603 for bug #245763

View | Details | Raw Unified | Return to bug 245763
Collapse All | Expand All

Lines 842-848 Link Here

(-)sys/netgraph/bluetooth/hci/ng_hci_cmds.c (-2 / +2 lines)
842	case NG_HCI_OCF_LE_RAND:	842	case NG_HCI_OCF_LE_RAND:
843	case NG_HCI_OCF_LE_LONG_TERM_KEY_REQUEST_REPLY:	843	case NG_HCI_OCF_LE_LONG_TERM_KEY_REQUEST_REPLY:
844	case NG_HCI_OCF_LE_LONG_TERM_KEY_REQUEST_NEGATIVE_REPLY:	844	case NG_HCI_OCF_LE_LONG_TERM_KEY_REQUEST_NEGATIVE_REPLY:
845	case NG_HCI_OCF_LE_READ_SUPPORTED_STATUS:	845	case NG_HCI_OCF_LE_READ_SUPPORTED_STATES:
846	case NG_HCI_OCF_LE_RECEIVER_TEST:	846	case NG_HCI_OCF_LE_RECEIVER_TEST:
847	case NG_HCI_OCF_LE_TRANSMITTER_TEST:	847	case NG_HCI_OCF_LE_TRANSMITTER_TEST:
848	case NG_HCI_OCF_LE_TEST_END:	848	case NG_HCI_OCF_LE_TEST_END:
Lines 913-919 Link Here
913	case NG_HCI_OCF_LE_RAND:	913	case NG_HCI_OCF_LE_RAND:
914	case NG_HCI_OCF_LE_LONG_TERM_KEY_REQUEST_REPLY:	914	case NG_HCI_OCF_LE_LONG_TERM_KEY_REQUEST_REPLY:
915	case NG_HCI_OCF_LE_LONG_TERM_KEY_REQUEST_NEGATIVE_REPLY:	915	case NG_HCI_OCF_LE_LONG_TERM_KEY_REQUEST_NEGATIVE_REPLY:
916	case NG_HCI_OCF_LE_READ_SUPPORTED_STATUS:	916	case NG_HCI_OCF_LE_READ_SUPPORTED_STATES:
917	case NG_HCI_OCF_LE_RECEIVER_TEST:	917	case NG_HCI_OCF_LE_RECEIVER_TEST:
918	case NG_HCI_OCF_LE_TRANSMITTER_TEST:	918	case NG_HCI_OCF_LE_TRANSMITTER_TEST:
919	case NG_HCI_OCF_LE_TEST_END:	919	case NG_HCI_OCF_LE_TEST_END:




}__attribute__ ((packed)) ng_hci_le_long_term_key_request_negative_reply_rp;


#define NG_HCI_OCF_LE_READ_SUPPORTED_STATES		0x001c
/*No command parameter*/
typedef struct {
	u_int8_t status;
	u_int64_t le_states;
}__attribute__ ((packed)) ng_hci_le_read_supported_states_rp;

#define NG_HCI_OCF_LE_RECEIVER_TEST			0x001d
typedef struct{




static int le_set_scan_enable(int s, int argc, char *argv[]);
static int parse_param(int argc, char *argv[], char *buf, int *len);
static int le_set_scan_response(int s, int argc, char *argv[]);
static int le_read_supported_states(int s, int argc, char *argv[]);
static int le_read_local_supported_features(int s, int argc ,char *argv[]);
static int set_le_event_mask(int s, uint64_t mask);
static int set_event_mask(int s, uint64_t mask);

}

static int
le_read_supported_states(int s, int argc, char *argv[])
{
	ng_hci_le_read_supported_states_rp rp;
	int e;
	int n = sizeof(rp);

	if (hci_simple_request(s, NG_HCI_OPCODE(
					NG_HCI_OGF_LE,
					NG_HCI_OCF_LE_READ_SUPPORTED_STATES),
			       		(void *)&rp, &n) == ERROR)
		return (ERROR);

	if (rp.status != 0x00) {
		fprintf(stdout, "Status: %s [%#02x]\n", 
			hci_status2str(rp.status), rp.status);
		return (FAILED);
	}

	fprintf(stdout, "LE States: %jx\n", rp.le_states);
	
	return (OK); 
}

static int

	  &le_read_local_supported_features,
  },
  {
	  "le_read_supported_states",
	  "le_read_supported_states\n"
	  "read supported status"	  
	  ,
	  &le_read_supported_states,
  },
  {
	  "le_set_scan_response",

Return to bug 245763

Lines 1673-1684 Link Here

(-)sys/netgraph/bluetooth/include/ng_hci.h (-3 / +3 lines)
1673	}__attribute__ ((packed)) ng_hci_le_long_term_key_request_negative_reply_rp;	1673	}__attribute__ ((packed)) ng_hci_le_long_term_key_request_negative_reply_rp;
1674		1674
1675		1675
1676	#define NG_HCI_OCF_LE_READ_SUPPORTED_STATUS 0x001c	1676	#define NG_HCI_OCF_LE_READ_SUPPORTED_STATES 0x001c
1677	/No command parameter/	1677	/No command parameter/
1678	typedef struct {	1678	typedef struct {
1679	u_int8_t status;	1679	u_int8_t status;
1680	u_int64_t le_status;	1680	u_int64_t le_states;
1681	}__attribute__ ((packed)) ng_hci_le_read_supported_status_rp;	1681	}__attribute__ ((packed)) ng_hci_le_read_supported_states_rp;
1682		1682
1683	#define NG_HCI_OCF_LE_RECEIVER_TEST 0x001d	1683	#define NG_HCI_OCF_LE_RECEIVER_TEST 0x001d
1684	typedef struct{	1684	typedef struct{

Lines 52-58 Link Here

(-)usr.sbin/bluetooth/hccontrol/le.c (-12 / +18 lines)
52	static int le_set_scan_enable(int s, int argc, char *argv[]);	52	static int le_set_scan_enable(int s, int argc, char *argv[]);
53	static int parse_param(int argc, char argv[], char buf, int *len);	53	static int parse_param(int argc, char argv[], char buf, int *len);
54	static int le_set_scan_response(int s, int argc, char *argv[]);	54	static int le_set_scan_response(int s, int argc, char *argv[]);
55	static int le_read_supported_status(int s, int argc, char *argv[]);	55	static int le_read_supported_states(int s, int argc, char *argv[]);
56	static int le_read_local_supported_features(int s, int argc ,char *argv[]);	56	static int le_read_local_supported_features(int s, int argc ,char *argv[]);
57	static int set_le_event_mask(int s, uint64_t mask);	57	static int set_le_event_mask(int s, uint64_t mask);
58	static int set_event_mask(int s, uint64_t mask);	58	static int set_event_mask(int s, uint64_t mask);
Lines 259-278 Link Here
259	}	259	}
260		260
261	static int	261	static int
262	le_read_supported_status(int s, int argc, char *argv[])	262	le_read_supported_states(int s, int argc, char *argv[])
263	{	263	{
264	ng_hci_le_read_supported_status_rp rp;	264	ng_hci_le_read_supported_states_rp rp;
265	int e;
266	int n = sizeof(rp);	265	int n = sizeof(rp);
267		266
268	e = hci_simple_request(s, NG_HCI_OPCODE(	267	if (hci_simple_request(s, NG_HCI_OPCODE(
269	NG_HCI_OGF_LE,	268	NG_HCI_OGF_LE,
270	NG_HCI_OCF_LE_READ_SUPPORTED_STATUS),	269	NG_HCI_OCF_LE_READ_SUPPORTED_STATES),
271	(void *)&rp, &n);	270	(void *)&rp, &n) == ERROR)
		271	return (ERROR);
272		272
273	printf("LE_STATUS: %d %d %jx\n", e, rp.status, (uintmax_t)rp.le_status);	273	if (rp.status != 0x00) {
		274	fprintf(stdout, "Status: %s [%#02x]\n",
		275	hci_status2str(rp.status), rp.status);
		276	return (FAILED);
		277	}
274		278
275	return 0;	279	fprintf(stdout, "LE States: %jx\n", rp.le_states);
		280
		281	return (OK);
276	}	282	}
277		283
278	static int	284	static int
Lines 347-357 Link Here
347	&le_read_local_supported_features,	353	&le_read_local_supported_features,
348	},	354	},
349	{	355	{
350	"le_read_supported_status",	356	"le_read_supported_states",
351	"le_read_supported_status\n"	357	"le_read_supported_states\n"
352	"read supported status"	358	"read supported status"
353	,	359	,
354	&le_read_supported_status,	360	&le_read_supported_states,
355	},	361	},
356	{	362	{
357	"le_set_scan_response",	363	"le_set_scan_response",