From de1bb6ef97ddd71db237578bd5f7ed8c5a61fb82 Mon Sep 17 00:00:00 2001 From: jow Date: Sun, 4 Dec 2011 20:37:01 +0000 Subject: [package] iwinfo: expose txpower and frequency offset information git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29425 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iwinfo/src/iwinfo_madwifi.c | 53 ++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 7 deletions(-) (limited to 'package/iwinfo/src/iwinfo_madwifi.c') diff --git a/package/iwinfo/src/iwinfo_madwifi.c b/package/iwinfo/src/iwinfo_madwifi.c index 50793c493..732cfe56f 100644 --- a/package/iwinfo/src/iwinfo_madwifi.c +++ b/package/iwinfo/src/iwinfo_madwifi.c @@ -1060,20 +1060,59 @@ int madwifi_get_hardware_id(const char *ifname, char *buf) return 0; } -int madwifi_get_hardware_name(const char *ifname, char *buf) +static const struct iwinfo_hardware_entry * +madwifi_get_hardware_entry(const char *ifname) { struct iwinfo_hardware_id id; - struct iwinfo_hardware_entry *hw; if (madwifi_get_hardware_id(ifname, (char *)&id)) - return -1; + return NULL; - hw = iwinfo_hardware(&id); + return iwinfo_hardware(&id); +} - if (hw) - sprintf(buf, "%s %s", hw->vendor_name, hw->device_name); +int madwifi_get_hardware_name(const char *ifname, char *buf) +{ + char vendor[64]; + char device[64]; + const struct iwinfo_hardware_entry *hw; + + if (!(hw = madwifi_get_hardware_entry(ifname))) + { + madwifi_proc_file(ifname, "dev_vendor", vendor, sizeof(vendor)); + madwifi_proc_file(ifname, "dev_name", device, sizeof(device)); + + if (vendor[0] && device[0]) + sprintf(buf, "%s %s", vendor, device); + else + sprintf(buf, "Generic Atheros"); + } else - sprintf(buf, "Generic Atheros"); + { + sprintf(buf, "%s %s", hw->vendor_name, hw->device_name); + } + + return 0; +} + +int madwifi_get_txpower_offset(const char *ifname, int *buf) +{ + const struct iwinfo_hardware_entry *hw; + + if (!(hw = madwifi_get_hardware_entry(ifname))) + return -1; + + *buf = hw->txpower_offset; + return 0; +} + +int madwifi_get_frequency_offset(const char *ifname, int *buf) +{ + const struct iwinfo_hardware_entry *hw; + + if (!(hw = madwifi_get_hardware_entry(ifname))) + return -1; + *buf = hw->frequency_offset; return 0; } -- cgit v1.2.3