svn commit: r246140 - user/adrian/ath_radar_stuff/src/spectral_fft

[Adrian Chadd]

Author: adrian
Date: Thu Jan 31 00:02:49 2013
New Revision: 246140
URL: http://svnweb.freebsd.org/changeset/base/246140

Log:
  stop hard-coding the operating mode and interface type.

Modified:
  user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c
  user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.c
  user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.h

Modified: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c
==============================================================================
--- user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c	Thu Jan 31 00:02:36 2013	(r246139)
+++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c	Thu Jan 31 00:02:49 2013	(r246140)
@@ -236,19 +236,8 @@ void graphics_main(struct fft_app *fap)
 
 void usage(int argc, char *argv[])
 {
-	fprintf(stderr, "Usage: %s [scanfile]\n", argv[0]);
-	fprintf(stderr, "\n");
-	fprintf(stderr, "scanfile is generated by the spectral analyzer feature\n");
-	fprintf(stderr, "of your wifi card. If you have a AR92xx or AR93xx based\n");
-	fprintf(stderr, "card, try:\n");
-	fprintf(stderr, "\n");
-	fprintf(stderr, "ifconfig wlan0 up\n");
-	fprintf(stderr, "iw dev wlan0 scan spec-scan\n");
-	fprintf(stderr, "cat /sys/kernel/debug/ieee80211/phy0/ath9k/spectral_scan > /tmp/fft_results\n");
-	fprintf(stderr, "%s /tmp/fft_results\n", argv[0]);
-	fprintf(stderr, "\n");
-	fprintf(stderr, "(NOTE: maybe debugfs must be mounted first: mount -t debugfs none /sys/kernel/debug/ )\n");
-	fprintf(stderr, "\n");
+	fprintf(stderr, "Usage: %s <ar9280> <file|if> <filename|interface>\n",
+	    argv[0]);
 
 }
 
@@ -273,7 +262,7 @@ int main(int argc, char *argv[])
 	int ret;
 	struct fft_app *fap;
 
-	if (argc < 2) {
+	if (argc < 4) {
 		usage(argc, argv);
 		return -1;
 	}
@@ -312,7 +301,7 @@ int main(int argc, char *argv[])
 		exit(127);
 
 	/* Fetch data */
-	ret = read_scandata_freebsd(argv[1], NULL);
+	ret = read_scandata_freebsd(argv[1], argv[2], argv[3]);
 	if (ret < 0) {
 		fprintf(stderr, "Couldn't read scanfile ...\n");
 		usage(argc, argv);

Modified: user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.c
==============================================================================
--- user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.c	Thu Jan 31 00:02:36 2013	(r246139)
+++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.c	Thu Jan 31 00:02:49 2013	(r246140)
@@ -260,9 +260,9 @@ open_device(const char *dev_str, const c
 }
 
 int
-read_scandata_freebsd(char *fname, struct scanresult **result)
+read_scandata_freebsd(char *chip, char *mode, char *fname)
 {
 
-	(void) open_device("wlan0", "ar9280", "if");
+	(void) open_device(fname, chip, mode);
 	return (0);
 }

Modified: user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.h
==============================================================================
--- user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.h	Thu Jan 31 00:02:36 2013	(r246139)
+++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.h	Thu Jan 31 00:02:49 2013	(r246140)
@@ -4,6 +4,6 @@
 typedef	void (* scandata_cb)(struct radar_entry *re, void *cbdata);
 
 extern	void set_scandata_callback(scandata_cb cb, void *cbdata);
-extern	int read_scandata_freebsd(char *fname, struct scanresult **result);
+extern	int read_scandata_freebsd(char *chip, char *mode, char *fname);
 
 #endif