Skip to content
Snippets Groups Projects
Commit 440ad399 authored by Janusz Dziedzic's avatar Janusz Dziedzic
Browse files

rebase and use wifi_dataelements.h

parent 218a32a6
Branches
No related tags found
1 merge request!121refactor opclass structure
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
#include <timer_impl.h> #include <timer_impl.h>
#include <cmdu_ackq.h> #include <cmdu_ackq.h>
#include <map_module.h> #include <map_module.h>
#include "utils/opclass.h"
#include "wifi_dataelements.h" #include "wifi_dataelements.h"
#include "utils/opclass.h"
extern const char *ubus_socket; extern const char *ubus_socket;
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <map2.h> #include <map2.h>
#include "utils.h" #include "utils.h"
#include "debug.h" #include "debug.h"
#include "../wifi_dataelements.h"
#include "opclass.h" #include "opclass.h"
static const struct wifi_opclass e4 = { static const struct wifi_opclass e4 = {
......
#ifndef _OPCLASS_H_ #ifndef _OPCLASS_H_
#define _OPCLASS_H_ #define _OPCLASS_H_
enum wifi_opclass_dfs {
WIFI_OPCLASS_CHANNEL_DFS_NONE,
WIFI_OPCLASS_CHANNEL_DFS_USABLE,
WIFI_OPCLASS_CHANNEL_DFS_AVAILABLE,
WIFI_OPCLASS_CHANNEL_DFS_NOP,
WIFI_OPCLASS_CHANNEL_DFS_CAC,
};
struct wifi_opclass_channel {
uint8_t channel;
/* preference and reason */
uint8_t preference;
enum wifi_opclass_dfs dfs;
uint32_t cac_time;
uint32_t nop_time;
};
struct wifi_opclass_entry {
uint8_t id;
int bandwidth;
int max_txpower;
int channel_num;
struct wifi_opclass_channel channel[64];
};
struct wifi_opclass {
struct timespec entry_time;
int entry_num;
struct wifi_opclass_entry entry[64];
};
const struct wifi_opclass *wifi_opclass_e4(void); const struct wifi_opclass *wifi_opclass_e4(void);
struct wifi_opclass_entry *wifi_opclass_find_entry(struct wifi_opclass *opclass, uint8_t id); struct wifi_opclass_entry *wifi_opclass_find_entry(struct wifi_opclass *opclass, uint8_t id);
...@@ -52,4 +18,5 @@ void wifi_opclass_dump(struct wifi_opclass *opclass); ...@@ -52,4 +18,5 @@ void wifi_opclass_dump(struct wifi_opclass *opclass);
uint8_t wifi_opclass_get_id(struct wifi_opclass *opclass, uint8_t channel, int bandwidth); uint8_t wifi_opclass_get_id(struct wifi_opclass *opclass, uint8_t channel, int bandwidth);
bool wifi_opclass_channel_supported(struct wifi_opclass *opclass, uint8_t id, uint8_t channel, int bandwidth); bool wifi_opclass_channel_supported(struct wifi_opclass *opclass, uint8_t id, uint8_t channel, int bandwidth);
#endif /* _OPCLASS_H_ */ #endif /* _OPCLASS_H_ */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment