 @@ -1,14 +1,14 @@
-/* $NetBSD: btconfig.c,v 1.24 2010/11/28 20:37:24 plunky Exp $ */
+/* $NetBSD: btconfig.c,v 1.25 2011/08/27 22:22:01 joerg Exp $ */
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Iain Hibbert for Itronix Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -23,152 +23,151 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2006 Itronix, Inc.  All rights reserved.");
-__RCSID("$NetBSD: btconfig.c,v 1.24 2010/11/28 20:37:24 plunky Exp $");
+__RCSID("$NetBSD: btconfig.c,v 1.25 2011/08/27 22:22:01 joerg Exp $");
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <bluetooth.h>
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <util.h>
-int main(int, char *[]);
+__dead static void badarg(const char *);
-void badarg(const char *);
+__dead static void badparam(const char *);
-void badparam(const char *);
+__dead static void badval(const char *, const char *);
-void badval(const char *, const char *);
+__dead static void usage(void);
-void usage(void);
+static int set_unit(unsigned long);
-int set_unit(unsigned long);
+static void config_unit(void);
-void config_unit(void);
+static void print_val(const char *, const char **, int);
-void print_val(const char *, const char **, int);
+static void print_info(int);
-void print_info(int);
+static void print_stats(void);
-void print_stats(void);
+static void print_class(const char *, uint8_t *);
-void print_class(const char *, uint8_t *);
+static void print_class0(void);
-void print_class0(void);
+static void print_voice(int);
-void print_voice(int);
+static void tag(const char *);
-void tag(const char *);
+static void print_features0(uint8_t *);
-void print_features0(uint8_t *);
+static void print_features1(uint8_t *);
-void print_features1(uint8_t *);
+static void print_result(int, struct bt_devinquiry *);
-void print_result(int, struct bt_devinquiry *);
+static void do_inquiry(void);
 void do_inquiry(void);
 static void hci_req(uint16_t, uint8_t , void *, size_t, void *, size_t);
-void hci_req(uint16_t, uint8_t , void *, size_t, void *, size_t);
+static void save_value(uint16_t, void *, size_t);
-void save_value(uint16_t, void *, size_t);
+static void load_value(uint16_t, void *, size_t);
 void load_value(uint16_t, void *, size_t);
 #define MAX_STR_SIZE	0xff
 /* print width */
-int width = 0;
+static int width = 0;
 #define MAX_WIDTH	70
 /* global variables */
-int hci;
+static int hci;
-struct btreq btr;
+static struct btreq btr;
 /* command line flags */
-int verbose = 0;	/* more info */
+static int verbose = 0;	/* more info */
-int lflag = 0;		/* list devices */
+static int lflag = 0;		/* list devices */
-int sflag = 0;		/* get/zero stats */
+static int sflag = 0;		/* get/zero stats */
 /* device up/down (flag) */
-int opt_enable = 0;
+static int opt_enable = 0;
-int opt_reset = 0;
+static int opt_reset = 0;
 #define FLAGS_FMT	"\20"			\
 			"\001UP"		\
 			"\002RUNNING"		\
 			"\003XMIT_CMD"		\
 			"\004XMIT_ACL"		\
 			"\005XMIT_SCO"		\
 			"\006INIT_BDADDR"	\
 			"\007INIT_BUFFER_SIZE"	\
 			"\010INIT_FEATURES"	\
 			"\011POWER_UP_NOOP"	\
 			"\012INIT_COMMANDS"	\
 			"\013MASTER"		\
 			""
 /* authorisation (flag) */
-int opt_auth = 0;
+static int opt_auth = 0;
 /* encryption (flag) */
-int opt_encrypt = 0;
+static int opt_encrypt = 0;
 /* scan enable options (flags) */
-int opt_pscan = 0;
+static int opt_pscan = 0;
-int opt_iscan = 0;
+static int opt_iscan = 0;
 /* master role option */
-int opt_master = 0;
+static int opt_master = 0;
 /* link policy options (flags) */
-int opt_switch = 0;
+static int opt_switch = 0;
-int opt_hold = 0;
+static int opt_hold = 0;
-int opt_sniff = 0;
+static int opt_sniff = 0;
-int opt_park = 0;
+static int opt_park = 0;
 /* class of device (hex value) */
-int opt_class = 0;
+static int opt_class = 0;
-uint32_t class;
+static uint32_t class;
 /* packet type mask (hex value) */
-int opt_ptype = 0;
+static int opt_ptype = 0;
-uint32_t ptype;
+static uint32_t ptype;
 /* unit name (string) */
-int opt_name = 0;
+static int opt_name = 0;
-char name[MAX_STR_SIZE];
+static char name[MAX_STR_SIZE];
 /* pin type */
-int opt_pin = 0;
+static int opt_pin = 0;
 /* Inquiry */
-int opt_rssi = 0;			/* inquiry_with_rssi (obsolete flag) */
+static int opt_rssi = 0;			/* inquiry_with_rssi (obsolete flag) */
-int opt_imode = 0;			/* inquiry mode */
+static int opt_imode = 0;			/* inquiry mode */
-int opt_inquiry = 0;
+static int opt_inquiry = 0;
 #define INQUIRY_LENGTH		10	/* seconds */
 #define INQUIRY_MAX_RESPONSES	10
-const char *imodes[] = { "std", "rssi", "ext", NULL };
+static const char *imodes[] = { "std", "rssi", "ext", NULL };
 /* Voice Settings */
-int opt_voice = 0;
+static int opt_voice = 0;
-uint32_t voice;
+static uint32_t voice;
 /* Page Timeout */
-int opt_pto = 0;
+static int opt_pto = 0;
-uint32_t pto;
+static uint32_t pto;
 /* set SCO mtu */
-int opt_scomtu;
+static int opt_scomtu;
-uint32_t scomtu;
+static uint32_t scomtu;
-struct parameter {
+static struct parameter {
 	const char	*name;
 	enum { P_SET, P_CLR, P_STR, P_HEX, P_NUM, P_VAL } type;
 	int		*opt;
 	void		*val;
 } parameters[] = {
 	{ "up",		P_SET,	&opt_enable,	NULL	},
 	{ "enable",	P_SET,	&opt_enable,	NULL	},
 	{ "down",	P_CLR,	&opt_enable,	NULL	},
 	{ "disable",	P_CLR,	&opt_enable,	NULL	},
 	{ "name",	P_STR,	&opt_name,	name	},
 	{ "pscan",	P_SET,	&opt_pscan,	NULL	},
 	{ "-pscan",	P_CLR,	&opt_pscan,	NULL	},
 	{ "iscan",	P_SET,	&opt_iscan,	NULL	},
 @@ -313,161 +312,161 @@ main(int ac, char *av[])
 			av++, ac--;
+		}
 		config_unit();
 		print_info(verbose);
 		print_stats();
 		do_inquiry();
+	}
 	close(hci);
 	return EXIT_SUCCESS;
+}
-void
+static void
 badparam(const char *param)
+{
 	fprintf(stderr, "unknown parameter '%s'\n", param);
 	exit(EXIT_FAILURE);
+}
-void
+static void
 badarg(const char *param)
+{
 	fprintf(stderr, "parameter '%s' needs argument\n", param);
 	exit(EXIT_FAILURE);
+}
-void
+static void
 badval(const char *param, const char *value)
+{
 	fprintf(stderr, "bad value '%s' for parameter '%s'\n", value, param);
 	exit(EXIT_FAILURE);
+}
-void
+static void
 usage(void)
+{
 	fprintf(stderr, "usage:	%s [-svz] [device [parameters]]\n", getprogname());
 	fprintf(stderr, "	%s -l\n", getprogname());
 	exit(EXIT_FAILURE);
+}
 /*
  * pretty printing feature
  */
-void
+static void
 tag(const char *f)
+{
 	if (f == NULL) {
 		if (width > 0)
 			printf("\n");
 		width = 0;
 	} else {
 		width += printf("%*s%s",
 				(width == 0 ? (lflag ? 0 : 8) : 1),
 				"", f);
 		if (width > MAX_WIDTH) {
 			printf("\n");
 			width = 0;
+		}
+	}
+}
 /*
  * basic HCI request wrapper with error check
  */
-void
+static void
 hci_req(uint16_t opcode, uint8_t event, void *cbuf, size_t clen,
     void *rbuf, size_t rlen)
+{
 	struct bt_devreq req;
 	req.opcode = opcode;
 	req.event = event;
 	req.cparam = cbuf;
 	req.clen = clen;
 	req.rparam = rbuf;
 	req.rlen = rlen;
 	if (bt_devreq(hci, &req, 10) == -1)
 		err(EXIT_FAILURE, "cmd (%02x|%03x)",
 		    HCI_OGF(opcode), HCI_OCF(opcode));
 	if (event == 0 && rlen > 0 && ((uint8_t *)rbuf)[0] != 0)
 		errx(EXIT_FAILURE, "cmd (%02x|%03x): status 0x%02x",
 		    HCI_OGF(opcode), HCI_OCF(opcode), ((uint8_t *)rbuf)[0]);
+}
 /*
  * write value to device with opcode.
  * provide a small response buffer so that the status can be checked
  */
-void
+static void
 save_value(uint16_t opcode, void *cbuf, size_t clen)
+{
 	uint8_t buf[1];
 	hci_req(opcode, 0, cbuf, clen, buf, sizeof(buf));
+}
 /*
  * read value from device with opcode.
  * use our own buffer and only return the value from the response packet
  */
-void
+static void
 load_value(uint16_t opcode, void *rbuf, size_t rlen)
+{
 	uint8_t buf[UINT8_MAX];
 	hci_req(opcode, 0, NULL, 0, buf, sizeof(buf));
 	memcpy(rbuf, buf + 1, rlen);
+}
-int
+static int
 set_unit(unsigned long cmd)
+{
 	if (ioctl(hci, cmd, &btr) == -1)
 		return -1;
 	if (btr.btr_flags & BTF_UP) {
 		struct sockaddr_bt sa;
 		sa.bt_len = sizeof(sa);
 		sa.bt_family = AF_BLUETOOTH;
 		bdaddr_copy(&sa.bt_bdaddr, &btr.btr_bdaddr);
 		if (bind(hci, (struct sockaddr *)&sa, sizeof(sa)) < 0)
 			err(EXIT_FAILURE, "bind");
 		if (connect(hci, (struct sockaddr *)&sa, sizeof(sa)) < 0)
 			err(EXIT_FAILURE, "connect");
+	}
 	return 0;
+}
 /*
  * apply configuration parameters to unit
  */
-void
+static void
 config_unit(void)
+{
 	if (opt_enable) {
 		if (opt_enable > 0)
 			btr.btr_flags |= BTF_UP;
 		else
 			btr.btr_flags &= ~BTF_UP;
 		if (ioctl(hci, SIOCSBTFLAGS, &btr) < 0)
 			err(EXIT_FAILURE, "SIOCSBTFLAGS");
 		if (set_unit(SIOCGBTINFO) < 0)
 @@ -596,41 +595,41 @@ config_unit(void)
 	if (opt_imode | opt_rssi) {
 		uint8_t val = (opt_rssi > 0 ? 1 : 0);
 		if (opt_imode)
 			val = opt_imode - 1;
 		save_value(HCI_CMD_WRITE_INQUIRY_MODE, &val, sizeof(val));
+	}
+}
 /*
  * print value from NULL terminated array given index
  */
-void
+static void
 print_val(const char *hdr, const char **argv, int idx)
+{
 	int i = 0;
 	while (i < idx && *argv != NULL)
 		i++, argv++;
 	printf("\t%s: %s\n", hdr, *argv == NULL ? "unknown" : *argv);
+}
 /*
  * Print info for Bluetooth Device with varying verbosity levels
  */
-void
+static void
 print_info(int level)
+{
 	uint8_t version, val, buf[MAX_STR_SIZE];
 	if (lflag) {
 		tag(btr.btr_name);
 		return;
+	}
 	if (level-- < 1)
 		return;
 	snprintb((char *)buf, MAX_STR_SIZE, FLAGS_FMT, btr.btr_flags);
 @@ -735,54 +734,54 @@ print_info(int level)
 	if (level-- < 1)
 		return;
 	if (ioctl(hci, SIOCGBTFEAT, &btr) < 0)
 		err(EXIT_FAILURE, "SIOCGBTFEAT");
 	width = printf("\tfeatures:");
 	print_features0(btr.btr_features0);
 	print_features1(btr.btr_features1);
 	tag(NULL);
+}
-void
+static void
 print_stats(void)
+{
 	if (sflag == 0)
 		return;
 	if (sflag == 1) {
 		if (ioctl(hci, SIOCGBTSTATS, &btr) < 0)
 			err(EXIT_FAILURE, "SIOCGBTSTATS");
 	} else  {
 		if (ioctl(hci, SIOCZBTSTATS, &btr) < 0)
 			err(EXIT_FAILURE, "SIOCZBTSTATS");
+	}
 	printf( "\tTotal bytes sent %d, recieved %d\n"
 		"\tCommands sent %d, Events received %d\n"
 		"\tACL data packets sent %d, received %d\n"
 		"\tSCO data packets sent %d, received %d\n"
 		"\tInput errors %d, Output errors %d\n",
 		btr.btr_stats.byte_tx, btr.btr_stats.byte_rx,
 		btr.btr_stats.cmd_tx, btr.btr_stats.evt_rx,
 		btr.btr_stats.acl_tx, btr.btr_stats.acl_rx,
 		btr.btr_stats.sco_tx, btr.btr_stats.sco_rx,
 		btr.btr_stats.err_rx, btr.btr_stats.err_tx);
+}
-void
+static void
 print_features0(uint8_t *f)
+{
 	/* ------------------- byte 0 --------------------*/
 	if (*f & HCI_LMP_3SLOT)		    tag("<3 slot>");
 	if (*f & HCI_LMP_5SLOT)		    tag("<5 slot>");
 	if (*f & HCI_LMP_ENCRYPTION)	    tag("<encryption>");
 	if (*f & HCI_LMP_SLOT_OFFSET)	    tag("<slot offset>");
 	if (*f & HCI_LMP_TIMIACCURACY)	    tag("<timing accuracy>");
 	if (*f & HCI_LMP_ROLE_SWITCH)	    tag("<role switch>");
 	if (*f & HCI_LMP_HOLD_MODE)	    tag("<hold mode>");
 	if (*f & HCI_LMP_SNIFF_MODE)	    tag("<sniff mode>");
 	f++;
 @@ -843,50 +842,50 @@ print_features0(uint8_t *f)
 	if (*f & HCI_LMP_SIMPLE_PAIRING)    tag("<secure simple pairing>");
 	if (*f & HCI_LMP_ENCAPSULATED_PDU)  tag("<encapsulated PDU>");
 	if (*f & HCI_LMP_ERRDATA_REPORTING) tag("<errdata reporting>");
 	if (*f & HCI_LMP_NOFLUSH_PB_FLAG)   tag("<no flush PB flag>");
 	f++;
 	/* ------------------- byte 7 --------------------*/
 	if (*f & HCI_LMP_LINK_SUPERVISION_TO)tag("<link supervision timeout changed>");
 	if (*f & HCI_LMP_INQ_RSP_TX_POWER)  tag("<inquiry rsp TX power level>");
 	if (*f & HCI_LMP_ENHANCED_POWER_CONTROL)tag("<enhanced power control>");
 	if (*f & HCI_LMP_EXTENDED_FEATURES) tag("<extended features>");
+}
-void
+static void
 print_features1(uint8_t *f)
+{
 	/* ------------------- byte 0 --------------------*/
 	if (*f & HCI_LMP_SSP)		    tag("<secure simple pairing>");
+}
-void
+static void
 print_class(const char *str, uint8_t *uclass)
+{
 	class = (uclass[2] << 16) | (uclass[1] << 8) | uclass[0];
 	width = printf("%s [0x%06x]", str, class);
 	switch(__SHIFTOUT(class, __BITS(0, 1))) {
 	case 0:	print_class0();		break;
 	default:			break;
+	}
 	tag(NULL);
+}
-void
+static void
 print_class0(void)
+{
 	switch (__SHIFTOUT(class, __BITS(8, 12))) {
 	case 1:	/* Computer */
 		switch (__SHIFTOUT(class, __BITS(2, 7))) {
 		case 1: tag("Desktop workstation");		break;
 		case 2: tag("Server-class computer");		break;
 		case 3: tag("Laptop");				break;
 		case 4: tag("Handheld PC/PDA");			break;
 		case 5: tag("Palm Sized PC/PDA");		break;
 		case 6: tag("Wearable computer");		break;
 		default: tag("Computer");			break;
 @@ -1003,27 +1002,27 @@ print_class0(void)
+	}
 	if (class & __BIT(13))	tag("<Limited Discoverable>");
 	if (class & __BIT(16))	tag("<Positioning>");
 	if (class & __BIT(17))	tag("<Networking>");
 	if (class & __BIT(18))	tag("<Rendering>");
 	if (class & __BIT(19))	tag("<Capturing>");
 	if (class & __BIT(20))	tag("<Object Transfer>");
 	if (class & __BIT(21))	tag("<Audio>");
 	if (class & __BIT(22))	tag("<Telephony>");
 	if (class & __BIT(23))	tag("<Information>");
+}
-void
+static void
 print_voice(int level)
+{
 	printf("\tvoice: [0x%4.4x]\n", voice);
 	if (level == 0)
 		return;
 	printf("\t\tInput Coding: ");
 	switch ((voice & 0x0300) >> 8) {
 	case 0x00:	printf("Linear PCM [%d-bit, pos %d]",
 			(voice & 0x0020 ? 16 : 8),
 			(voice & 0x001c) >> 2);		break;
 	case 0x01:	printf("u-Law");		break;
 @@ -1039,27 +1038,27 @@ print_voice(int level)
+	}
 	printf("\n\t\tAir Coding: ");
 	switch (voice & 0x0003) {
 	case 0x00:	printf("CVSD");			break;
 	case 0x01:	printf("u-Law");		break;
 	case 0x02:	printf("A-Law");		break;
 	case 0x03:	printf("Transparent");		break;
+	}
 	printf("\n");
+}
-void
+static void
 print_result(int num, struct bt_devinquiry *r)
+{
 	hci_remote_name_req_cp ncp;
 	hci_remote_name_req_compl_ep nep;
 	struct hostent *hp;
 	printf("%3d: bdaddr %s", num, bt_ntoa(&r->bdaddr, NULL));
 	hp = bt_gethostbyaddr((const char *)&r->bdaddr, sizeof(bdaddr_t), AF_BLUETOOTH);
 	if (hp != NULL)
 		printf(" (%s)", hp->h_name);
 	printf("\n");
 @@ -1072,27 +1071,27 @@ print_result(int num, struct bt_devinqui
 	hci_req(HCI_CMD_REMOTE_NAME_REQ,
 		HCI_EVENT_REMOTE_NAME_REQ_COMPL,
 		&ncp, sizeof(ncp),
 		&nep, sizeof(nep));
 	printf("   : name \"%s\"\n", nep.name);
 	print_class("   : class", r->dev_class);
 	printf("   : page scan rep mode 0x%02x\n", r->pscan_rep_mode);
 	printf("   : clock offset %d\n", le16toh(r->clock_offset));
 	printf("   : rssi %d\n", r->rssi);
 	printf("\n");
+}
-void
+static void
 do_inquiry(void)
+{
 	struct bt_devinquiry *result;
 	int i, num;
 	if (opt_inquiry == 0)
 		return;
 	printf("Device Discovery from device: %s ...", btr.btr_name);
 	fflush(stdout);
 	num = bt_devinquiry(btr.btr_name, INQUIRY_LENGTH,
 	    INQUIRY_MAX_RESPONSES, &result);