Skip to content

Fix noise sign and return code #834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 7, 2022
Merged

Fix noise sign and return code #834

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec9ad71
Return 6 instead of kIOReturnError when not connected
Dec 7, 2022
4e34447
Noise should be negative. Positive noise means that noise is MUCH str…
Dec 7, 2022
f69313e
Remove unneeded macro
Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions AirportItlwm/AirportSTAIOCTL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ getSSID(OSObject *object,
sd->ssid_len = (uint32_t)strlen((const char*)ic->ic_des_essid);
return kIOReturnSuccess;
}
return kIOReturnError;
return 6;
}

IOReturn AirportItlwm::
Expand Down Expand Up @@ -376,7 +376,7 @@ getCHANNEL(OSObject *object,
cd->channel.flags = ieeeChanFlag2apple(ic->ic_bss->ni_chan->ic_flags, ic->ic_bss->ni_chw);
return kIOReturnSuccess;
}
return kIOReturnError;
return 6;
}

IOReturn AirportItlwm::
Expand All @@ -397,7 +397,7 @@ getPROTMODE(OSObject *object, struct apple80211_protmode_data *pd)
pd->protmode = 0;
return kIOReturnSuccess;
}
return kIOReturnError;
return 6;
}

IOReturn AirportItlwm::
Expand All @@ -418,7 +418,7 @@ getTXPOWER(OSObject *object,
txd->txpower_unit = APPLE80211_UNIT_PERCENT;
return kIOReturnSuccess;
}
return kIOReturnError;
return 6;
}

IOReturn AirportItlwm::
Expand Down Expand Up @@ -457,7 +457,7 @@ getRATE(OSObject *object, struct apple80211_rate_data *rd)
{
struct ieee80211com *ic = fHalService->get80211Controller();
if (ic->ic_bss == NULL)
return kIOReturnError;
return 6;
int nss;
int sgi;
int index = 0;
Expand Down Expand Up @@ -502,7 +502,7 @@ getRATE(OSObject *object, struct apple80211_rate_data *rd)
rd->rate[0] = ic->ic_bss->ni_rates.rs_rates[ic->ic_bss->ni_txrate];
return kIOReturnSuccess;
}
return kIOReturnError;
return 6;
}

IOReturn AirportItlwm::
Expand Down Expand Up @@ -638,7 +638,7 @@ getBSSID(OSObject *object,
memcpy(bd->bssid.octet, ic->ic_bss->ni_bssid, APPLE80211_ADDR_LEN);
return kIOReturnSuccess;
}
return kIOReturnError;
return 6;
}

IOReturn AirportItlwm::
Expand Down Expand Up @@ -722,7 +722,7 @@ getMCS_INDEX_SET(OSObject *object, struct apple80211_mcs_index_set_data *ad)
ad->mcs_set_map[i] = ic->ic_bss->ni_rxmcs[i];
return kIOReturnSuccess;
}
return kIOReturnError;
return 6;
}

IOReturn AirportItlwm::
Expand Down Expand Up @@ -793,7 +793,7 @@ getRATE_SET(OSObject *object, struct apple80211_rate_set_data *ad)
}
return kIOReturnSuccess;
}
return kIOReturnError;
return 6;
}

IOReturn AirportItlwm::
Expand Down Expand Up @@ -869,7 +869,7 @@ getRSSI(OSObject *object,
= -(0 - IWM_MIN_DBM - ic->ic_bss->ni_rssi);
return kIOReturnSuccess;
}
return kIOReturnError;
return 6;
}

IOReturn AirportItlwm::
Expand Down Expand Up @@ -940,11 +940,11 @@ getNOISE(OSObject *object,
nd->version = APPLE80211_VERSION;
nd->num_radios = 1;
nd->noise[0]
= nd->aggregate_noise = fHalService->getDriverInfo()->getBSSNoise();
= nd->aggregate_noise = -fHalService->getDriverInfo()->getBSSNoise();
nd->noise_unit = APPLE80211_UNIT_DBM;
return kIOReturnSuccess;
}
return kIOReturnError;
return 6;
}

IOReturn AirportItlwm::
Expand Down Expand Up @@ -1166,30 +1166,27 @@ setDEAUTH(OSObject *object,
void AirportItlwm::
eventHandler(struct ieee80211com *ic, int msgCode, void *data)
{
#define INTERFACE_POST_MESSAGE(code) \
if (interface) { \
interface->postMessage(code); \
}
IO80211Interface *interface = OSDynamicCast(IO80211Interface, ic->ic_ac.ac_if.iface);
if (!interface)
return;
switch (msgCode) {
case IEEE80211_EVT_COUNTRY_CODE_UPDATE:
INTERFACE_POST_MESSAGE(APPLE80211_M_COUNTRY_CODE_CHANGED)
interface->postMessage(APPLE80211_M_COUNTRY_CODE_CHANGED);
break;
case IEEE80211_EVT_STA_ASSOC_DONE:
INTERFACE_POST_MESSAGE(APPLE80211_M_ASSOC_DONE)
interface->postMessage(APPLE80211_M_ASSOC_DONE);
break;
case IEEE80211_EVT_STA_DEAUTH:
INTERFACE_POST_MESSAGE(APPLE80211_M_DEAUTH_RECEIVED)
interface->postMessage(APPLE80211_M_DEAUTH_RECEIVED);
break;
#if 0
case IEEE80211_EVT_SCAN_DONE:
INTERFACE_POST_MESSAGE(APPLE80211_M_SCAN_DONE)
interface->postMessage(APPLE80211_M_SCAN_DONE);
break;
#endif
default:
break;
}
#undef INTERFACE_POST_MESSAGE
}

IOReturn AirportItlwm::
Expand Down Expand Up @@ -1274,7 +1271,7 @@ getMCS(OSObject *object, struct apple80211_mcs_data* md)
{
struct ieee80211com *ic = fHalService->get80211Controller();
if (ic->ic_state != IEEE80211_S_RUN || ic->ic_bss == NULL || !md)
return kIOReturnError;
return 6;
md->version = APPLE80211_VERSION;
md->index = ic->ic_bss->ni_txmcs;
return kIOReturnSuccess;
Expand Down Expand Up @@ -1408,7 +1405,7 @@ getSCAN_RESULT(OSObject *object, struct apple80211_scan_result **sr)
result->asr_channel.version = APPLE80211_VERSION;
result->asr_channel.channel = ieee80211_chan2ieee(ic, fNextNodeToSend->ni_chan);
result->asr_channel.flags = ieeeChanFlag2apple(fNextNodeToSend->ni_chan->ic_flags, -1);
result->asr_noise = fHalService->getDriverInfo()->getBSSNoise();
result->asr_noise = -fHalService->getDriverInfo()->getBSSNoise();
result->asr_rssi = -(0 - IWM_MIN_DBM - fNextNodeToSend->ni_rssi);
memcpy(result->asr_bssid, fNextNodeToSend->ni_bssid, IEEE80211_ADDR_LEN);
result->asr_ssid_len = fNextNodeToSend->ni_esslen;
Expand Down