Fix -Wall -Wpedantic warnings

[project/iwinfo.git] / include / iwinfo.h

diff --git a/include/iwinfo.h b/include/iwinfo.h
index 38120e6..a3380ca 100644 (file)
--- a/include/iwinfo.h
+++ b/include/iwinfo.h
@@ -66,6 +66,21 @@ enum iwinfo_opmode {
 extern const char *IWINFO_OPMODE_NAMES[];
 
 
+enum iwinfo_htmode {
+       IWINFO_HTMODE_HT20       = (1 << 0),
+       IWINFO_HTMODE_HT40       = (1 << 1),
+       IWINFO_HTMODE_VHT20      = (1 << 2),
+       IWINFO_HTMODE_VHT40      = (1 << 3),
+       IWINFO_HTMODE_VHT80      = (1 << 4),
+       IWINFO_HTMODE_VHT80_80   = (1 << 5),
+       IWINFO_HTMODE_VHT160     = (1 << 6),
+
+       IWINFO_HTMODE_COUNT      = 7
+};
+
+extern const char *IWINFO_HTMODE_NAMES[IWINFO_HTMODE_COUNT];
+
+
 struct iwinfo_rate_entry {
        uint32_t rate;
        int8_t mcs;
@@ -106,7 +121,7 @@ struct iwinfo_crypto_entry {
 
 struct iwinfo_scanlist_entry {
        uint8_t mac[6];
-       uint8_t ssid[IWINFO_ESSID_MAX_SIZE+1];
+       char ssid[IWINFO_ESSID_MAX_SIZE+1];
        enum iwinfo_opmode mode;
        uint8_t channel;
        uint8_t signal;
@@ -117,12 +132,12 @@ struct iwinfo_scanlist_entry {
 
 struct iwinfo_country_entry {
        uint16_t iso3166;
-       uint8_t ccode[4];
+       char ccode[4];
 };
 
 struct iwinfo_iso3166_label {
        uint16_t iso3166;
-       uint8_t  name[28];
+       char name[28];
 };
 
 struct iwinfo_hardware_id {
@@ -165,6 +180,7 @@ struct iwinfo_ops {
        int (*quality_max)(const char *, int *);
        int (*mbssid_support)(const char *, int *);
        int (*hwmodelist)(const char *, int *);
+       int (*htmodelist)(const char *, int *);
        int (*ssid)(const char *, char *);
        int (*bssid)(const char *, char *);
        int (*country)(const char *, char *);
@@ -177,6 +193,7 @@ struct iwinfo_ops {
        int (*scanlist)(const char *, char *, int *);
        int (*freqlist)(const char *, char *, int *);
        int (*countrylist)(const char *, char *, int *);
+       int (*lookup_phy)(const char *, char *);
        void (*close)(void);
 };