Date: Fri, 22 Jul 2011 09:34:31 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r224266 - in head/tools/tools/ath: . athradar Message-ID: <201107220934.p6M9YVhl008332@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Fri Jul 22 09:34:31 2011 New Revision: 224266 URL: http://svn.freebsd.org/changeset/base/224266 Log: Add athradar, an implementation of the radar parameter diagnostic API. This is a reimplementation from scratch. Approved by: re (kib) Added: head/tools/tools/ath/athradar/ head/tools/tools/ath/athradar/Makefile (contents, props changed) head/tools/tools/ath/athradar/athradar.c (contents, props changed) Modified: head/tools/tools/ath/Makefile Modified: head/tools/tools/ath/Makefile ============================================================================== --- head/tools/tools/ath/Makefile Fri Jul 22 06:47:09 2011 (r224265) +++ head/tools/tools/ath/Makefile Fri Jul 22 09:34:31 2011 (r224266) @@ -2,5 +2,6 @@ SUBDIR= arcode athdebug athdecode athkey athpoke athprom athrd athregs SUBDIR+= athstats ath_ee_v14_print ath_prom_read ath_ee_v4k_print +SUBDIR+= athradar .include <bsd.subdir.mk> Added: head/tools/tools/ath/athradar/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/ath/athradar/Makefile Fri Jul 22 09:34:31 2011 (r224266) @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PROG= athradar + +.include <../Makefile.inc> + +SRCS= athradar.c +SRCS+= opt_ah.h +CLEANFILES+= opt_ah.h + +opt_ah.h: + echo "#define AH_DEBUG 1" > opt_ah.h + echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h + echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h + +.include <bsd.prog.mk> Added: head/tools/tools/ath/athradar/athradar.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/ath/athradar/athradar.c Fri Jul 22 09:34:31 2011 (r224266) @@ -0,0 +1,287 @@ +/* + * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd. + * + * 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 + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS 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. + * + * $FreeBSD$ + */ + +#include "diag.h" + +#include "ah.h" +#include "ah_internal.h" + +#ifndef ATH_DEFAULT +#define ATH_DEFAULT "ath0" +#endif + +#include <getopt.h> +#include <errno.h> +#include <err.h> +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <unistd.h> + +struct radarhandler { + struct ath_diag atd; + int s; + struct ifreq ifr; + int ah_devid; +}; + +int +radar_opendev(struct radarhandler *radar, const char *devid) +{ + HAL_REVS revs; + + radar->s = socket(AF_INET, SOCK_DGRAM, 0); + if (radar->s < 0) { + warn("socket"); + return 0; + } + + strncpy(radar->atd.ad_name, devid, sizeof (radar->atd.ad_name)); + + /* Get the hardware revision, just to verify things are working */ + radar->atd.ad_id = HAL_DIAG_REVS; + radar->atd.ad_out_data = (caddr_t) &revs; + radar->atd.ad_out_size = sizeof(revs); + if (ioctl(radar->s, SIOCGATHDIAG, &radar->atd) < 0) { + warn(radar->atd.ad_name); + return 0; + } + radar->ah_devid = revs.ah_devid; + return 1; +} + +void +radar_closedev(struct radarhandler *radar) +{ + close(radar->s); + radar->s = -1; +} + +void +radarset(struct radarhandler *radar, int op, u_int32_t param) +{ + HAL_PHYERR_PARAM pe; + + pe.pe_firpwr = HAL_PHYERR_PARAM_NOVAL; + pe.pe_rrssi = HAL_PHYERR_PARAM_NOVAL; + pe.pe_height = HAL_PHYERR_PARAM_NOVAL; + pe.pe_prssi = HAL_PHYERR_PARAM_NOVAL; + pe.pe_inband = HAL_PHYERR_PARAM_NOVAL; + pe.pe_enabled = HAL_PHYERR_PARAM_NOVAL; + + pe.pe_relpwr = HAL_PHYERR_PARAM_NOVAL; + pe.pe_relstep = HAL_PHYERR_PARAM_NOVAL; + pe.pe_maxlen = HAL_PHYERR_PARAM_NOVAL; + pe.pe_usefir128 = HAL_PHYERR_PARAM_NOVAL; + pe.pe_blockradar = HAL_PHYERR_PARAM_NOVAL; + pe.pe_enmaxrssi = HAL_PHYERR_PARAM_NOVAL; + + pe.pe_extchannel = HAL_PHYERR_PARAM_NOVAL; + + switch (op) { + case DFS_PARAM_ENABLE: + pe.pe_enabled = param; + break; + case DFS_PARAM_FIRPWR: + pe.pe_firpwr = param; + break; + case DFS_PARAM_RRSSI: + pe.pe_rrssi = param; + break; + case DFS_PARAM_HEIGHT: + pe.pe_height = param; + break; + case DFS_PARAM_PRSSI: + pe.pe_prssi = param; + break; + case DFS_PARAM_INBAND: + pe.pe_inband = param; + break; + case DFS_PARAM_RELPWR: + pe.pe_relpwr = param; + break; + case DFS_PARAM_RELSTEP: + pe.pe_relstep = param; + break; + case DFS_PARAM_MAXLEN: + pe.pe_maxlen = param; + break; + case DFS_PARAM_USEFIR128: + pe.pe_usefir128 = param; + break; + case DFS_PARAM_BLOCKRADAR: + pe.pe_blockradar = param; + break; + case DFS_PARAM_MAXRSSI_EN: + pe.pe_enmaxrssi = param; + break; + case DFS_PARAM_EN_EXTCH: + pe.pe_extchannel = param; + break; + } + radar->atd.ad_id = DFS_SET_THRESH | ATH_DIAG_IN; + radar->atd.ad_out_data = NULL; + radar->atd.ad_out_size = 0; + radar->atd.ad_in_data = (caddr_t) &pe; + radar->atd.ad_in_size = sizeof(HAL_PHYERR_PARAM); + if (ioctl(radar->s, SIOCGATHPHYERR, &radar->atd) < 0) + err(1, radar->atd.ad_name); +} + +static void +radar_get(struct radarhandler *radar) +{ + HAL_PHYERR_PARAM pe; + + radar->atd.ad_id = DFS_GET_THRESH | ATH_DIAG_DYN; + memset(&pe, 0, sizeof(pe)); + + radar->atd.ad_in_data = NULL; + radar->atd.ad_in_size = 0; + radar->atd.ad_out_data = (caddr_t) &pe; + radar->atd.ad_out_size = sizeof(pe); + + if (ioctl(radar->s, SIOCGATHPHYERR, &radar->atd) < 0) + err(1, radar->atd.ad_name); + + printf("Radar parameters (raw):\n"); + printf(" pe_enabled: %d\n", pe.pe_enabled); + printf(" pe_firpwr: %d\n", pe.pe_firpwr); + printf(" pe_rrssi: %d\n", pe.pe_rrssi); + printf(" pe_height: %d\n", pe.pe_height); + printf(" pe_prssi: %d\n", pe.pe_prssi); + printf(" pe_inband: %d\n", pe.pe_inband); + printf(" pe_relpwr: %d\n", pe.pe_relpwr); + printf(" pe_relstep: %d\n", pe.pe_relstep); + printf(" pe_maxlen: %d\n", pe.pe_maxlen); + printf(" pe_usefir128: %d\n", pe.pe_usefir128); + printf(" pe_blockradar: %d\n", pe.pe_blockradar); + printf(" pe_enmaxrssi: %d\n", pe.pe_enmaxrssi); + printf(" pe_extchannel: %d\n", pe.pe_extchannel); +} + +static int +radar_set_param(struct radarhandler *radar, const char *param, const char *val) +{ + int v; + + v = atoi(val); + + if (strcmp(param, "firpwr") == 0) { + radarset(radar, DFS_PARAM_FIRPWR, v); + } else if (strcmp(param, "rrssi") == 0) { + radarset(radar, DFS_PARAM_RRSSI, v); + } else if (strcmp(param, "height") == 0) { + radarset(radar, DFS_PARAM_HEIGHT, v); + } else if (strcmp(param, "prssi") == 0) { + radarset(radar, DFS_PARAM_PRSSI, v); + } else if (strcmp(param, "inband") == 0) { + radarset(radar, DFS_PARAM_INBAND, v); + } else if (strcmp(param, "relpwr") == 0) { + radarset(radar, DFS_PARAM_RELPWR, v); + } else if (strcmp(param, "relstep") == 0) { + radarset(radar, DFS_PARAM_RELSTEP, v); + } else if (strcmp(param, "maxlen") == 0) { + radarset(radar, DFS_PARAM_MAXLEN, v); + } else if (strcmp(param, "extchannel") == 0) { + radarset(radar, DFS_PARAM_EN_EXTCH, v); + } else { + return 0; + } + + return 1; +} + +void +usage(const char *progname) +{ + printf("Usage:\n"); + printf("\t%s: [-i <interface>] <cmd> (<arg>)\n", progname); + printf("\t%s: [-h]\n", progname); + printf("\n"); + printf("Valid commands:\n"); + printf("\tget:\t\tGet current radar parameters\n"); + printf("\tset <param> <value>:\t\tSet radar parameter\n"); +} + +int +main(int argc, char *argv[]) +{ + struct radarhandler radar; + const char *devname = ATH_DEFAULT; + const char *progname = argv[0]; + + memset(&radar, 0, sizeof(radar)); + + /* Parse command line options */ + if (argc >= 2 && strcmp(argv[1], "-h") == 0) { + usage(progname); + exit(0); + } + if (argc >= 2 && strcmp(argv[1], "-?") == 0) { + usage(progname); + exit(0); + } + + if (argc >= 2 && strcmp(argv[1], "-i") == 0) { + if (argc == 2) { + usage(progname); + exit(127); + } + devname = argv[2]; + argc -= 2; argv += 2; + } + + /* At this point we require at least one command */ + if (argc == 1) { + usage(progname); + exit(127); + } + + if (radar_opendev(&radar, devname) == 0) + exit(127); + + if (strcasecmp(argv[1], "get") == 0) { + radar_get(&radar); + } else if (strcasecmp(argv[1], "set") == 0) { + if (argc < 4) { + usage(progname); + exit(127); + } + if (radar_set_param(&radar, argv[2], argv[3]) == 0) { + usage(progname); + exit(127); + } + } else { + usage(progname); + exit(127); + } + + /* wrap up */ + radar_closedev(&radar); + exit(0); +}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107220934.p6M9YVhl008332>