@@ -1,4 +1,4 @@
-/* $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.
@@ -33,7 +33,7 @@
 
 #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>
@@ -49,47 +49,46 @@
 #include <unistd.h>
 #include <util.h>
 
-int main(int, char *[]);
-void badarg(const char *);
-void badparam(const char *);
-void badval(const char *, const char *);
-void usage(void);
-int set_unit(unsigned long);
-void config_unit(void);
-void print_val(const char *, const char **, int);
-void print_info(int);
-void print_stats(void);
-void print_class(const char *, uint8_t *);
-void print_class0(void);
-void print_voice(int);
-void tag(const char *);
-void print_features0(uint8_t *);
-void print_features1(uint8_t *);
-void print_result(int, struct bt_devinquiry *);
-void do_inquiry(void);
+__dead static void badarg(const char *);
+__dead static void badparam(const char *);
+__dead static void badval(const char *, const char *);
+__dead static void usage(void);
+static int set_unit(unsigned long);
+static void config_unit(void);
+static void print_val(const char *, const char **, int);
+static void print_info(int);
+static void print_stats(void);
+static void print_class(const char *, uint8_t *);
+static void print_class0(void);
+static void print_voice(int);
+static void tag(const char *);
+static void print_features0(uint8_t *);
+static void print_features1(uint8_t *);
+static void print_result(int, struct bt_devinquiry *);
+static void do_inquiry(void);
 
-void hci_req(uint16_t, uint8_t , void *, size_t, void *, size_t);
-void save_value(uint16_t, void *, size_t);
-void load_value(uint16_t, void *, size_t);
+static void hci_req(uint16_t, uint8_t , void *, size_t, void *, size_t);
+static void save_value(uint16_t, void *, size_t);
+static 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;
-struct btreq btr;
+static int hci;
+static struct btreq btr;
 
 /* command line flags */
-int verbose = 0;	/* more info */
-int lflag = 0;		/* list devices */
-int sflag = 0;		/* get/zero stats */
+static int verbose = 0;	/* more info */
+static int lflag = 0;		/* list devices */
+static int sflag = 0;		/* get/zero stats */
 
 /* device up/down (flag) */
-int opt_enable = 0;
-int opt_reset = 0;
+static int opt_enable = 0;
+static int opt_reset = 0;
 #define FLAGS_FMT	"\20"			\
 			"\001UP"		\
 			"\002RUNNING"		\
@@ -105,60 +104,60 @@
 			""
 
 /* 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;
-int opt_iscan = 0;
+static int opt_pscan = 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;
-int opt_hold = 0;
-int opt_sniff = 0;
-int opt_park = 0;
+static int opt_switch = 0;
+static int opt_hold = 0;
+static int opt_sniff = 0;
+static int opt_park = 0;
 
 /* class of device (hex value) */
-int opt_class = 0;
-uint32_t class;
+static int opt_class = 0;
+static uint32_t class;
 
 /* packet type mask (hex value) */
-int opt_ptype = 0;
-uint32_t ptype;
+static int opt_ptype = 0;
+static uint32_t ptype;
 
 /* unit name (string) */
-int opt_name = 0;
-char name[MAX_STR_SIZE];
+static int opt_name = 0;
+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) */
-int opt_imode = 0;			/* inquiry mode */
-int opt_inquiry = 0;
+static int opt_rssi = 0;			/* inquiry_with_rssi (obsolete flag) */
+static int opt_imode = 0;			/* inquiry mode */
+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;
-uint32_t voice;
+static int opt_voice = 0;
+static uint32_t voice;
 
 /* Page Timeout */
-int opt_pto = 0;
-uint32_t pto;
+static int opt_pto = 0;
+static uint32_t pto;
 
 /* set SCO mtu */
-int opt_scomtu;
-uint32_t scomtu;
+static int opt_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;
@@ -323,7 +322,7 @@
 	return EXIT_SUCCESS;
 }
 
-void
+static void
 badparam(const char *param)
 {
 
@@ -331,7 +330,7 @@
 	exit(EXIT_FAILURE);
 }
 
-void
+static void
 badarg(const char *param)
 {
 
@@ -339,7 +338,7 @@
 	exit(EXIT_FAILURE);
 }
 
-void
+static void
 badval(const char *param, const char *value)
 {
 
@@ -347,7 +346,7 @@
 	exit(EXIT_FAILURE);
 }
 
-void
+static void
 usage(void)
 {
 
@@ -359,7 +358,7 @@
 /*
  * pretty printing feature
  */
-void
+static void
 tag(const char *f)
 {
 
@@ -383,7 +382,7 @@
 /*
  * 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)
 {
@@ -409,7 +408,7 @@
  * 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];
@@ -421,7 +420,7 @@
  * 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];
@@ -430,7 +429,7 @@
 	memcpy(rbuf, buf + 1, rlen);
 }
 
-int
+static int
 set_unit(unsigned long cmd)
 {
 
@@ -457,7 +456,7 @@
 /*
  * apply configuration parameters to unit
  */
-void
+static void
 config_unit(void)
 {
 
@@ -606,7 +605,7 @@
 /*
  * print value from NULL terminated array given index
  */
-void
+static void
 print_val(const char *hdr, const char **argv, int idx)
 {
 	int i = 0;
@@ -620,7 +619,7 @@
 /*
  * Print info for Bluetooth Device with varying verbosity levels
  */
-void
+static void
 print_info(int level)
 {
 	uint8_t version, val, buf[MAX_STR_SIZE];
@@ -745,7 +744,7 @@
 	tag(NULL);
 }
 
-void
+static void
 print_stats(void)
 {
 
@@ -772,7 +771,7 @@
 		btr.btr_stats.err_rx, btr.btr_stats.err_tx);
 }
 
-void
+static void
 print_features0(uint8_t *f)
 {
 
@@ -853,7 +852,7 @@
 	if (*f & HCI_LMP_EXTENDED_FEATURES) tag("<extended features>");
 }
 
-void
+static void
 print_features1(uint8_t *f)
 {
 
@@ -861,7 +860,7 @@
 	if (*f & HCI_LMP_SSP)		    tag("<secure simple pairing>");
 }
 
-void
+static void
 print_class(const char *str, uint8_t *uclass)
 {
 
@@ -876,7 +875,7 @@
 	tag(NULL);
 }
 
-void
+static void
 print_class0(void)
 {
 
@@ -1013,7 +1012,7 @@
 	if (class & __BIT(23))	tag("<Information>");
 }
 
-void
+static void
 print_voice(int level)
 {
 	printf("\tvoice: [0x%4.4x]\n", voice);
@@ -1049,7 +1048,7 @@
 	printf("\n");
 }
 
-void
+static void
 print_result(int num, struct bt_devinquiry *r)
 {
 	hci_remote_name_req_cp ncp;
@@ -1082,7 +1081,7 @@
 	printf("\n");
 }
 
-void
+static void
 do_inquiry(void)
 {
 	struct bt_devinquiry *result;