mirror of
https://github.com/drasko/open-ameba.git
synced 2024-11-24 23:14:17 +00:00
update
This commit is contained in:
parent
426d573a21
commit
24014b170c
9 changed files with 2195 additions and 2167 deletions
|
@ -506,10 +506,37 @@ int wext_get_ap_info(const char *ifname, rtw_bss_info_t * ap_info,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int wext_set_mode(const char *ifname, int mode) {
|
int wext_set_mode(const char *ifname, int mode) {
|
||||||
|
#ifdef USE_WIFI_ADAPTER
|
||||||
|
_adapter * pad = get_padapter(ifname);
|
||||||
|
int nwm;
|
||||||
|
if(rtw_pwr_wakeup(pad) && pad->hw_init_completed) {
|
||||||
|
switch(mode) {
|
||||||
|
case IW_MODE_AUTO:
|
||||||
|
nwm = Ndis802_11AutoUnknown;
|
||||||
|
break;
|
||||||
|
case IW_MODE_MASTER:
|
||||||
|
nwm = Ndis802_11APMode;
|
||||||
|
break;
|
||||||
|
case IW_MODE_INFRA:
|
||||||
|
nwm = Ndis802_11Infrastructure;
|
||||||
|
break;
|
||||||
|
case IW_MODE_ADHOC:
|
||||||
|
nwm = Ndis802_11IBSS;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return RTW_NORESOURCE;
|
||||||
|
}
|
||||||
|
if(rtw_set_802_11_infrastructure_mode(pad, nwm)) {
|
||||||
|
return set_opmode(pad, nwm);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return RTW_ERROR;
|
||||||
|
#else
|
||||||
struct iwreq iwr;
|
struct iwreq iwr;
|
||||||
memset(&iwr, 0, sizeof(iwr));
|
memset(&iwr, 0, sizeof(iwr));
|
||||||
iwr.u.mode = mode;
|
iwr.u.mode = mode;
|
||||||
return iw_ioctl(ifname, SIOCSIWMODE, &iwr);
|
return iw_ioctl(ifname, SIOCSIWMODE, &iwr);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
int wext_get_mode(const char *ifname, int *mode) {
|
int wext_get_mode(const char *ifname, int *mode) {
|
||||||
|
@ -624,7 +651,7 @@ int wext_set_pscan_channel(const char *ifname,
|
||||||
//extern int rtw_wx_set_freq(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra);
|
//extern int rtw_wx_set_freq(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra);
|
||||||
|
|
||||||
int wext_set_channel(const char *ifname, __u8 ch) {
|
int wext_set_channel(const char *ifname, __u8 ch) {
|
||||||
#if 0 //def USE_WIFI_ADAPTER
|
#if 0 //def USE_WIFI_ADAPTER // link: undefined reference to `rtw_wx_set_freq' -> rtw_wx_set_freq.isra.10
|
||||||
struct net_device * pdev = rltk_wlan_info[0].dev;
|
struct net_device * pdev = rltk_wlan_info[0].dev;
|
||||||
if(ifname[4] != '0')
|
if(ifname[4] != '0')
|
||||||
pdev = rltk_wlan_info[1].dev;
|
pdev = rltk_wlan_info[1].dev;
|
||||||
|
@ -649,10 +676,10 @@ int wext_get_channel(const char *ifname, __u8 *ch) {
|
||||||
rtw_result_t ret = RTW_ERROR;
|
rtw_result_t ret = RTW_ERROR;
|
||||||
if(pad) {
|
if(pad) {
|
||||||
if(pad->mlmepriv.fw_state & 1) {
|
if(pad->mlmepriv.fw_state & 1) {
|
||||||
*ch = pad->mlmepriv.cur_network.network.Configuration.DSConfig;// .Reserved[1]; //.PhyInfo.Optimum_antenna; //
|
*ch = pad->mlmepriv.cur_network.network.Configuration.DSConfig;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
*ch = pad->mlmeextpriv.cur_channel; //
|
*ch = pad->mlmeextpriv.cur_channel;
|
||||||
}
|
}
|
||||||
ret = RTW_SUCCESS;
|
ret = RTW_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
|
@ -554,7 +554,7 @@ LOCAL int _wifi_on(rtw_mode_t mode) {
|
||||||
// set wifi mib
|
// set wifi mib
|
||||||
wext_set_adaptivity(wifi_cfg.adaptivity & 3); // rtw_adaptivity_mode_t
|
wext_set_adaptivity(wifi_cfg.adaptivity & 3); // rtw_adaptivity_mode_t
|
||||||
|
|
||||||
ret = rltk_wlan_init(WLAN0_IDX, mode);
|
ret = rltk_wlan_init(WLAN0_IDX, mode); // rtw_mode_t
|
||||||
|
|
||||||
netif_set_up(&xnetif[0]);
|
netif_set_up(&xnetif[0]);
|
||||||
if (ret < 0) return ret;
|
if (ret < 0) return ret;
|
||||||
|
|
|
@ -333,7 +333,7 @@ LOCAL void print_on(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
// (!) размещается в специальном сегменте '.mon.tab*' (см. *.ld файл)
|
// (!) размещается в специальном сегменте '.mon.tab*' (см. *.ld файл)
|
||||||
MON_RAM_TAB_SECTION COMMAND_TABLE console_commands[] = {
|
MON_RAM_TAB_SECTION COMMAND_TABLE console_commands[] = {
|
||||||
{"PR", 1, print_on, "<1/0>: Printf on/off"}, // Help
|
{"PR", 1, print_on, "=<1/0>: Printf on/off"}, // Help
|
||||||
{"?", 0, console_help, ": This Help"} // Help
|
{"?", 0, console_help, ": This Help"} // Help
|
||||||
// {"HELP", 0, console_help, ": Help"} // Help
|
// {"HELP", 0, console_help, ": Help"} // Help
|
||||||
};
|
};
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4325
build/obj/build.nmap
4325
build/obj/build.nmap
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue