Merge tag 'upstream/0.7.4'

Upstream version 0.7.4

1 files changed, 18 insertions, 4 deletions

diff --git a/wavemon.h b/wavemon.h
index ad0b488..db1e08a 100644
--- a/wavemon.h
+++ b/wavemon.h
@@ -33,13 +33,13 @@
 #include <ctype.h>
 #include <math.h>
 #include <stdbool.h>
-
 #include <ncurses.h>
 
 #include "llist.h"
 
 #define CFNAME	".wavemonrc"
-/*
+
+/**
  * Minimum screen dimensions.
  * The number of lines depends on the size requirements of scr_info(). The
  * number of columns comes from the menubar length (10 items of length 6
@@ -100,6 +100,19 @@ static inline void threshold_action(enum threshold_action action)
 }
 
 /*
+ * Symbolic names for scan sort order comparison.
+ */
+enum scan_sort_order {
+	SO_CHAN,
+	SO_CHAN_REV,
+	SO_SIGNAL,
+	SO_OPEN,
+	SO_CHAN_SIG,
+	SO_OPEN_SIG,
+	SO_OPEN_CH_SI
+};
+
+/*
  * Global in-memory representation of current wavemon configuration state
  */
 extern struct wavemon_conf {
@@ -124,7 +137,8 @@ extern struct wavemon_conf {
 		override_bounds;	/* override autodetection */
 
 	/* Enumerated values */
-	int	lthreshold_action,	/* disabled|beep|flash|beep+flash */
+	int	scan_sort_order,	/* channel|signal|open|chan/sig ... */
+		lthreshold_action,	/* disabled|beep|flash|beep+flash */
 		hthreshold_action,	/* disabled|beep|flash|beep+flash */
 		startup_scr;		/* info|histogram|aplist */
 } conf;
@@ -257,7 +271,7 @@ static inline int cp_from_scale(float value, const char *cscale, bool reverse)
  *	Wireless interfaces
  */
 extern const char *conf_ifname(void);
-extern void conf_get_interface_list(void);
+extern void conf_get_interface_list(bool init);
 extern char **iw_get_interface_list(void);
 extern void dump_parameters(void);