diff --git a/README.md b/README.md index aea30b3..fc4bbff 100644 --- a/README.md +++ b/README.md @@ -2,23 +2,26 @@ ## Notice ### Release roadmap +- v1.3.2 (2020.09.16) - v1.3.1 (2020.08.05) - v1.3.0 (2020.05.30) ### Latest release -- [NRC7292_SW_PKG_v1.3.1](https://github.com/newracom/nrc7292_sw_pkg/releases/tag/v1.3.1) +- [NRC7292_SW_PKG_v1.3.2](https://github.com/newracom/nrc7292_sw_pkg/releases/tag/v1.3.2) ### Release package contents - host - cli_app + - doc - evk - nrc_driver - - doc + - tools - host_kr_mic - cli_app + - doc - evk - nrc_driver - - doc + - tools ## NRC7292 Software Package User Guide ### (Optional) Install toolchain diff --git a/package/host/RN-7292-001-SW_PKG_release_note (v1.3.1).pdf b/package/host/RN-7292-001-SW_PKG_release_note (v1.3.1).pdf deleted file mode 100644 index 2a3b856..0000000 Binary files a/package/host/RN-7292-001-SW_PKG_release_note (v1.3.1).pdf and /dev/null differ diff --git a/package/host/RN-7292-001-SW_PKG_release_note (v1.3.2).pdf b/package/host/RN-7292-001-SW_PKG_release_note (v1.3.2).pdf new file mode 100755 index 0000000..ff09bbc Binary files /dev/null and b/package/host/RN-7292-001-SW_PKG_release_note (v1.3.2).pdf differ diff --git a/package/host/VERSION-SDK.txt b/package/host/VERSION-SDK.txt old mode 100644 new mode 100755 index 41271fc..9e26487 --- a/package/host/VERSION-SDK.txt +++ b/package/host/VERSION-SDK.txt @@ -1,3 +1,4 @@ VERSION_MAJOR 1 VERSION_MINOR 3 -VERSION_REVISION 1 +VERSION_REVISION 2 + diff --git a/package/host/cli_app/source/cli_app/Makefile b/package/host/cli_app/source/cli_app/Makefile old mode 100644 new mode 100755 diff --git a/package/host/cli_app/source/cli_app/cli_cmd.c b/package/host/cli_app/source/cli_app/cli_cmd.c old mode 100644 new mode 100755 diff --git a/package/host/cli_app/source/cli_app/cli_cmd.h b/package/host/cli_app/source/cli_app/cli_cmd.h old mode 100644 new mode 100755 diff --git a/package/host/cli_app/source/cli_app/cli_config.h b/package/host/cli_app/source/cli_app/cli_config.h old mode 100644 new mode 100755 diff --git a/package/host/cli_app/source/cli_app/cli_key_list.h b/package/host/cli_app/source/cli_app/cli_key_list.h old mode 100644 new mode 100755 diff --git a/package/host/cli_app/source/cli_app/cli_netlink.c b/package/host/cli_app/source/cli_app/cli_netlink.c old mode 100644 new mode 100755 diff --git a/package/host/cli_app/source/cli_app/cli_netlink.h b/package/host/cli_app/source/cli_app/cli_netlink.h old mode 100644 new mode 100755 diff --git a/package/host/cli_app/source/cli_app/cli_util.c b/package/host/cli_app/source/cli_app/cli_util.c old mode 100644 new mode 100755 diff --git a/package/host/cli_app/source/cli_app/cli_util.h b/package/host/cli_app/source/cli_app/cli_util.h old mode 100644 new mode 100755 diff --git a/package/host/cli_app/source/cli_app/main.c b/package/host/cli_app/source/cli_app/main.c old mode 100644 new mode 100755 diff --git a/package/host/doc/AN-7292-001-Dual Band.pdf b/package/host/doc/AN-7292-001-Dual Band.pdf old mode 100644 new mode 100755 diff --git a/package/host/doc/AN-7292-002-Dynamic Vendor IE.pdf b/package/host/doc/AN-7292-002-Dynamic Vendor IE.pdf old mode 100644 new mode 100755 diff --git a/package/host/doc/AN-7292-006-Tree-based Mesh.pdf b/package/host/doc/AN-7292-006-Tree-based Mesh.pdf old mode 100644 new mode 100755 diff --git a/package/host/doc/NRC7292_EVK_User_Guide_HDPG.pdf b/package/host/doc/NRC7292_EVK_User_Guide_HDPG.pdf old mode 100644 new mode 100755 diff --git a/package/host/doc/TL-7292-009-Board_Data_Editor.pdf b/package/host/doc/TL-7292-009-Board_Data_Editor.pdf new file mode 100755 index 0000000..c8c5ae0 Binary files /dev/null and b/package/host/doc/TL-7292-009-Board_Data_Editor.pdf differ diff --git a/package/host/doc/UG-7292-001-Host mode SDK.pdf b/package/host/doc/UG-7292-001-Host mode SDK.pdf old mode 100644 new mode 100755 index 67c0c3a..bfc05c2 Binary files a/package/host/doc/UG-7292-001-Host mode SDK.pdf and b/package/host/doc/UG-7292-001-Host mode SDK.pdf differ diff --git a/package/host/doc/UG-7292-002-Host driver porting.pdf b/package/host/doc/UG-7292-002-Host driver porting.pdf old mode 100644 new mode 100755 diff --git a/package/host/doc/UG-7292-003-S1G_Channel.pdf b/package/host/doc/UG-7292-003-S1G_Channel.pdf old mode 100644 new mode 100755 index cc3d575..b227508 Binary files a/package/host/doc/UG-7292-003-S1G_Channel.pdf and b/package/host/doc/UG-7292-003-S1G_Channel.pdf differ diff --git a/package/host/doc/UG-7292-007-Commnad line application.pdf b/package/host/doc/UG-7292-007-Commnad line application.pdf old mode 100644 new mode 100755 diff --git a/package/host/doc/UG-7292-009-Guide_Deep Sleep Mode.pdf b/package/host/doc/UG-7292-009-Guide_Deep Sleep Mode.pdf old mode 100644 new mode 100755 diff --git a/package/host/doc/UG-7292-010-Recovery.pdf b/package/host/doc/UG-7292-010-Recovery.pdf old mode 100644 new mode 100755 diff --git a/package/host/doc/UG-7292-011-NewraPeek.pdf b/package/host/doc/UG-7292-011-NewraPeek.pdf old mode 100644 new mode 100755 diff --git a/package/host/doc/UG-7292-013-iperf.pdf b/package/host/doc/UG-7292-013-iperf.pdf old mode 100644 new mode 100755 diff --git a/package/host/doc/UG-7292-015-Transmit_Power_Control.pdf b/package/host/doc/UG-7292-015-Transmit_Power_Control.pdf new file mode 100755 index 0000000..a31f3a3 Binary files /dev/null and b/package/host/doc/UG-7292-015-Transmit_Power_Control.pdf differ diff --git a/package/host/evk/binary/VERSION-SDK.txt b/package/host/evk/binary/VERSION-SDK.txt old mode 100644 new mode 100755 index 41271fc..9e26487 --- a/package/host/evk/binary/VERSION-SDK.txt +++ b/package/host/evk/binary/VERSION-SDK.txt @@ -1,3 +1,4 @@ VERSION_MAJOR 1 VERSION_MINOR 3 -VERSION_REVISION 1 +VERSION_REVISION 2 + diff --git a/package/host/evk/binary/cli_app b/package/host/evk/binary/cli_app old mode 100644 new mode 100755 diff --git a/package/host/evk/binary/nrc.ko b/package/host/evk/binary/nrc.ko old mode 100644 new mode 100755 index 8adbbfc..2842a5d Binary files a/package/host/evk/binary/nrc.ko and b/package/host/evk/binary/nrc.ko differ diff --git a/package/host/evk/binary/nrc7292_bd.dat b/package/host/evk/binary/nrc7292_bd.dat new file mode 100755 index 0000000..846bed2 Binary files /dev/null and b/package/host/evk/binary/nrc7292_bd.dat differ diff --git a/package/host/evk/binary/nrc7292_cspi.bin b/package/host/evk/binary/nrc7292_cspi.bin old mode 100644 new mode 100755 index 64f56c4..5df509c Binary files a/package/host/evk/binary/nrc7292_cspi.bin and b/package/host/evk/binary/nrc7292_cspi.bin differ diff --git a/package/host/evk/sw_pkg/.bashrc b/package/host/evk/sw_pkg/.bashrc old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/README.txt b/package/host/evk/sw_pkg/README.txt old mode 100644 new mode 100755 index 6b1dba8..d1e33b9 --- a/package/host/evk/sw_pkg/README.txt +++ b/package/host/evk/sw_pkg/README.txt @@ -9,5 +9,5 @@ chmod -R 755 * #apply single-band (Sub1G) to EVK ./update.sh -#apply dual-band (Sub1G + 2.4GHz) 1.3.0 to EVK +#apply dual-band (Sub1G + 2.4GHz) to EVK ./update.sh dual diff --git a/package/host/evk/sw_pkg/nrc_pkg/README b/package/host/evk/sw_pkg/nrc_pkg/README old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/VERSION-SDK.txt b/package/host/evk/sw_pkg/nrc_pkg/VERSION-SDK.txt old mode 100644 new mode 100755 index 41271fc..9e26487 --- a/package/host/evk/sw_pkg/nrc_pkg/VERSION-SDK.txt +++ b/package/host/evk/sw_pkg/nrc_pkg/VERSION-SDK.txt @@ -1,3 +1,4 @@ VERSION_MAJOR 1 VERSION_MINOR 3 -VERSION_REVISION 1 +VERSION_REVISION 2 + diff --git a/package/host/evk/sw_pkg/nrc_pkg/etc/dhcpcd/dhcpcd.conf b/package/host/evk/sw_pkg/nrc_pkg/etc/dhcpcd/dhcpcd.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/etc/dnsmasq/dnsmasq.conf b/package/host/evk/sw_pkg/nrc_pkg/etc/dnsmasq/dnsmasq.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/etc/python/gain_rx.py b/package/host/evk/sw_pkg/nrc_pkg/etc/python/gain_rx.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/etc/python/netlink.py b/package/host/evk/sw_pkg/nrc_pkg/etc/python/netlink.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/etc/python/nrcnetlink.py b/package/host/evk/sw_pkg/nrc_pkg/etc/python/nrcnetlink.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/etc/python/shell.py b/package/host/evk/sw_pkg/nrc_pkg/etc/python/shell.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/etc/python/test_send_addba.py b/package/host/evk/sw_pkg/nrc_pkg/etc/python/test_send_addba.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/cli_app b/package/host/evk/sw_pkg/nrc_pkg/script/cli_app old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/etc/CONFIG_IP b/package/host/evk/sw_pkg/nrc_pkg/script/conf/etc/CONFIG_IP old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/etc/add_route.sh b/package/host/evk/sw_pkg/nrc_pkg/script/conf/etc/add_route.sh old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/etc/clock_config.sh b/package/host/evk/sw_pkg/nrc_pkg/script/conf/etc/clock_config.sh old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/conf/etc/ip_config.sh b/package/host/evk/sw_pkg/nrc_pkg/script/conf/etc/ip_config.sh old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/run_recovery.py b/package/host/evk/sw_pkg/nrc_pkg/script/run_recovery.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/README.txt b/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/README.txt old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/newrapeek_0-1.4_armhf.deb b/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/newrapeek_0-1.4_armhf.deb old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/rpcapd b/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/rpcapd old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/run_rpcapd.py b/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/run_rpcapd.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/run_tshark.py b/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/run_tshark.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/change_channel.py b/package/host/evk/sw_pkg/nrc_pkg/script/sniffer/change_channel.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/start.py b/package/host/evk/sw_pkg/nrc_pkg/script/start.py old mode 100644 new mode 100755 index 82c94e3..405bc55 --- a/package/host/evk/sw_pkg/nrc_pkg/script/start.py +++ b/package/host/evk/sw_pkg/nrc_pkg/script/start.py @@ -7,22 +7,24 @@ ################################################################################## # Default Configuration (you can change value you want here) -model = 7292 # 7292 or 7192 -hif_speed = 16000000 # HSPI Clock -gain_type = 'phy' # 'phy' or 'nrf(legacy)' -txpwr_val = 17 # TX Power -maxagg_num = 8 # 0(AMPDU off) or >2(AMPDU on) -cqm_off = 0 # 0(CQM on) or 1(CQM off) -fw_download = 1 # 0(FW Download off) or 1(FW Download on) +model = 7292 # 7292 or 7192 +hif_speed = 16000000 # HSPI Clock +gain_type = 'phy' # 'phy' or 'nrf(legacy)' +txpwr_val = 17 # TX Power +maxagg_num = 8 # 0(AMPDU off) or >2(AMPDU on) +cqm_off = 0 # 0(CQM on) or 1(CQM off) +fw_download = 1 # 0(FW Download off) or 1(FW Download on) fw_name = 'uni_s1g.bin' -bd_download = 0 # 0(Board Data Download off) or 1(Board Data Download on) +bd_download = 0 # 0(Board Data Download off) or 1(Board Data Download on) bd_name = 'nrc7292_bd.dat' -guard_int = 'long' # 'long'(LGI) or 'short'(SGI) -supplicant_debug = 0 # WPA Supplicant debug option : 0(off) or 1(on) -hostapd_debug = 0 # Hostapd debug option : 0(off) or 1(on) -max_cpuclock = 1 # RPi Max CPU Clock : 0(off) or 1(on) -relay_type = 0 # 0 (wlan0: STA, wlan1: AP) 1 (wlan0: AP, wlan1: STA) -power_save = 0 # power save : 0(off) or 1(on) +guard_int = 'long' # 'long'(LGI) or 'short'(SGI) +supplicant_debug = 0 # WPA Supplicant debug option : 0(off) or 1(on) +hostapd_debug = 0 # Hostapd debug option : 0(off) or 1(on) +max_cpuclock = 1 # RPi Max CPU Clock : 0(off) or 1(on) +relay_type = 0 # 0 (wlan0: STA, wlan1: AP) 1 (wlan0: AP, wlan1: STA) +power_save = 0 # power save : 0(off) or 1(on) +bss_max_idle_enable = 0 # 0(bss_max_idle off) or 1(bss_max_idle on) +bss_max_idle = 10 # number of keepalives (0 ~ 65535) ################################################################################## def check(interface): @@ -103,10 +105,12 @@ def argv_print(): if int(bd_download) == 1: print ("Download Board Data : " + bd_name) print ("TX Power : " + str(txpwr_val)) + if int(bss_max_idle_enable) == 1 and strSTA() == 'AP': + print ("bss_max_idle : " + str(bss_max_idle)) print ("------------------------------") def copyConf(): - os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model)) + os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model) + " " + str(bd_name)) os.system("/home/pi/nrc_pkg/script/conf/etc/ip_config.sh " + strSTA() + " " + str(relay_type)) def startNAT(): @@ -177,7 +181,12 @@ def run_common(): else: power_save_arg = " power_save=0" - insmod_arg = fw_arg + bd_arg + alt_mode_arg + power_save_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed) + if int(bss_max_idle_enable) == 1 and strSTA() == 'AP': + bss_max_idle_arg = " bss_max_idle=" + str(bss_max_idle) + else: + bss_max_idle_arg = "" + + insmod_arg = fw_arg + bd_arg + alt_mode_arg + power_save_arg + bss_max_idle_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed) print "[2] Loading module" print "sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg os.system("sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg + "") diff --git a/package/host/evk/sw_pkg/nrc_pkg/script/stop.py b/package/host/evk/sw_pkg/nrc_pkg/script/stop.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/sw/driver/README.txt b/package/host/evk/sw_pkg/nrc_pkg/sw/driver/README.txt old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg/sw/driver/nrc.ko b/package/host/evk/sw_pkg/nrc_pkg/sw/driver/nrc.ko old mode 100644 new mode 100755 index 8adbbfc..2842a5d Binary files a/package/host/evk/sw_pkg/nrc_pkg/sw/driver/nrc.ko and b/package/host/evk/sw_pkg/nrc_pkg/sw/driver/nrc.ko differ diff --git a/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/copy b/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/copy old mode 100644 new mode 100755 index c6146ca..486b044 --- a/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/copy +++ b/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/copy @@ -1,6 +1,6 @@ cp /home/pi/nrc_pkg/sw/firmware/nrc$1_cspi.bin /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin sudo cp /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin /lib/firmware -sudo cp /home/pi/nrc_pkg/sw/firmware/nrc7292_bd.dat /lib/firmware +sudo cp /home/pi/nrc_pkg/sw/firmware/$2 /lib/firmware ls -al /home/pi/nrc_pkg/sw/firmware ls -al /lib/firmware/uni_s1g* diff --git a/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_bd.dat b/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_bd.dat old mode 100644 new mode 100755 index 40d3db8..846bed2 Binary files a/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_bd.dat and b/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_bd.dat differ diff --git a/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_cspi.bin b/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_cspi.bin old mode 100644 new mode 100755 index 64f56c4..5df509c Binary files a/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_cspi.bin and b/package/host/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_cspi.bin differ diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/README b/package/host/evk/sw_pkg/nrc_pkg_dual/README old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/VERSION-SDK.txt b/package/host/evk/sw_pkg/nrc_pkg_dual/VERSION-SDK.txt old mode 100644 new mode 100755 index 41271fc..9e26487 --- a/package/host/evk/sw_pkg/nrc_pkg_dual/VERSION-SDK.txt +++ b/package/host/evk/sw_pkg/nrc_pkg_dual/VERSION-SDK.txt @@ -1,3 +1,4 @@ VERSION_MAJOR 1 VERSION_MINOR 3 -VERSION_REVISION 1 +VERSION_REVISION 2 + diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_ap.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_ap.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_ap_sta.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_ap_sta.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_sta.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_sta.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_sta_ap.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_sta_ap.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_ap.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_ap.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_ap_sta.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_ap_sta.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_sta_ap.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_sta_ap.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/python/gain_rx.py b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/python/gain_rx.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/python/netlink.py b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/python/netlink.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/python/nrcnetlink.py b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/python/nrcnetlink.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/python/shell.py b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/python/shell.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/etc/python/test_send_addba.py b/package/host/evk/sw_pkg/nrc_pkg_dual/etc/python/test_send_addba.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/cli_app b/package/host/evk/sw_pkg/nrc_pkg_dual/script/cli_app old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/hostapd_AP.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/hostapd_AP.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/hostapd_STA.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/hostapd_STA.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/wpa_supplicant.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/wpa_supplicant.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_open.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_owe.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_sae.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_wpa2.conf b/package/host/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/fix_clock.sh b/package/host/evk/sw_pkg/nrc_pkg_dual/script/fix_clock.sh old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/run_recovery.py b/package/host/evk/sw_pkg/nrc_pkg_dual/script/run_recovery.py new file mode 100755 index 0000000..9ebbb3f --- /dev/null +++ b/package/host/evk/sw_pkg/nrc_pkg_dual/script/run_recovery.py @@ -0,0 +1,131 @@ +import os +import sys +import time +import ctypes +import threading +import libnl.handlers +from libnl.error import errmsg +from libnl.nl import nl_recvmsgs +from libnl.attr import nla_parse +from libnl.nl80211 import nl80211 +from libnl.msg import nlmsg_data, nlmsg_hdr +from libnl.linux_private.genetlink import genlmsghdr +from libnl.genl.ctrl import genl_ctrl_resolve, genl_ctrl_resolve_grp +from libnl.genl.genl import genl_connect, genlmsg_attrdata, genlmsg_attrlen +from libnl.socket_ import nl_socket_add_membership, nl_socket_alloc, nl_socket_drop_membership + +NL_CMD_RECOVERY_MSG = 27 + +PATH_TO_DRIVER = "/home/pi/nrc_pkg/sw/driver/nrc.ko" +PATH_TO_CONFIG = "/home/pi/nrc_pkg/script/conf/{}/" +FIRMWARE = "uni_s1g.bin" + +class Recovery: + def __init__(self): + self.recovery = False + self.recovery_count = 0 + self.keyboard = False + self.sk = None + self.driver_id = None + self.station_type = 0 + self.config = -1 + self.country = "US" + + def trigger_recovery(self): + self.recovery_count += 1 + self.recovery = False + + #startup routine + self.startup() + + print("Recovery Count: {}".format(self.recovery_count)) + self.connect() + + def startup(self): #example + app = "wpa_supplicant" if self.is_sta() else "hostapd" + + os.system("sudo killall -9 {} > /dev/null 2>&1".format(app)) + os.system("sudo rmmod nrc > /dev/null 2>&1") + + os.system("sudo insmod {} fw_name={} > /dev/null".format(PATH_TO_DRIVER, FIRMWARE)) + time.sleep(5) + os.system("sudo {} {} {}/{} -B > /dev/null".format(app, "-iwlan0 -c" if self.is_sta() else "", PATH_TO_CONFIG.format(self.country), self.get_config())) + time.sleep(7) + + def parse_arg(self): + if (len(sys.argv) < 4): + sys.exit("Usage: python run_recovery.py ") + + self.station_type = int(sys.argv[1]) + self.config = int(sys.argv[2]) + self.country = sys.argv[3] + + def is_sta(self): + return self.station_type == 0 + + def get_config(self): + station = "sta" if self.is_sta() else "ap" + if self.config == 0: + return "{}_halow_open.conf".format(station) + elif self.config == 1: + return "{}_halow_wpa2.conf".format(station) + elif self.config == 2: + return "{}_halow_owe.conf".format(station) + elif self.config == 3: + return "{}_halow_sae.conf".format(station) + else: + return "{}_halow_open.conf".format(station) + + def connect(self): + self.sk = nl_socket_alloc() + recovery.ok(0, genl_connect, self.sk) + self.driver_id = recovery.ok(0, genl_ctrl_resolve, self.sk, b'NRC-NL-FAM') + + def ok(self, no_exit, func, *args, **kwargs): + ret = func(*args, **kwargs) + if no_exit or ret >= 0: + return ret + reason = errmsg[abs(ret)] + print('{0}() returned {1} ({2})'.format(func.__name__, ret, reason)) + + def callback_trigger(self, msg, arg): + gnlh = genlmsghdr(nlmsg_data(nlmsg_hdr(msg))) + + tb = dict((i, None) for i in range(10 + 1)) + nla_parse(tb, nl80211.NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), None) + if tb.get(NL_CMD_RECOVERY_MSG): + self.recovery = True + + return libnl.handlers.NL_STOP + + def mcast_handler(self): + mcid = self.ok(0, genl_ctrl_resolve_grp, self.sk, b'NRC-NL-FAM', b'nrc-log') + ret = nl_socket_add_membership(self.sk, mcid) + err = ctypes.c_int(1) + results = ctypes.c_int(-1) + cb = libnl.handlers.nl_cb_alloc(libnl.handlers.NL_CB_DEFAULT) + libnl.handlers.nl_cb_set(cb, libnl.handlers.NL_CB_VALID, libnl.handlers.NL_CB_CUSTOM, self.callback_trigger, results) + libnl.handlers.nl_cb_set(cb, libnl.handlers.NL_CB_SEQ_CHECK, libnl.handlers.NL_CB_CUSTOM, lambda *_: libnl.handlers.NL_OK, None) + + try: + while True: + ret = nl_recvmsgs(self.sk, cb) + if self.recovery: break + except KeyboardInterrupt: + self.keyboard = True + finally: + nl_socket_drop_membership(self.sk, mcid) + +if __name__ == "__main__": + recovery = Recovery() + recovery.parse_arg() + recovery.connect() + + while True: + print("Waiting for recovery trigger...") + recovery.mcast_handler() + if recovery.keyboard: + break + if recovery.recovery: + print("Recovery Triggered...") + recovery.trigger_recovery() diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/README.txt b/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/README.txt old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/newrapeek_0-1.4_armhf.deb b/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/newrapeek_0-1.4_armhf.deb old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/rpcapd b/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/rpcapd old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/run_rpcapd.py b/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/run_rpcapd.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/run_tshark.py b/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/run_tshark.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/change_channel.py b/package/host/evk/sw_pkg/nrc_pkg_dual/script/sniffer/change_channel.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/start.py b/package/host/evk/sw_pkg/nrc_pkg_dual/script/start.py old mode 100644 new mode 100755 index cd743e4..7af63ee --- a/package/host/evk/sw_pkg/nrc_pkg_dual/script/start.py +++ b/package/host/evk/sw_pkg/nrc_pkg_dual/script/start.py @@ -7,28 +7,30 @@ ################################################################################## # Default Configuration (you can change value you want here) -model = 7292 # 7292 or 7192 -hif_speed = 16000000 # HSPI Clock -gain_type = 'phy' # 'phy' or 'nrf(legacy)' -txpwr_val = 17 # TX Power -maxagg_num = 8 # 0(AMPDU off) or >2(AMPDU on) -cqm_off = 0 # 0(CQM on) or 1(CQM off) -fw_download = 1 # 0(FW Download off) or 1(FW Download on) +model = 7292 # 7292 or 7192 +hif_speed = 16000000 # HSPI Clock +gain_type = 'phy' # 'phy' or 'nrf(legacy)' +txpwr_val = 17 # TX Power +maxagg_num = 8 # 0(AMPDU off) or >2(AMPDU on) +cqm_off = 0 # 0(CQM on) or 1(CQM off) +fw_download = 1 # 0(FW Download off) or 1(FW Download on) fw_name = 'uni_s1g.bin' -bd_download = 0 # 0(Board Data Download off) or 1(Board Data Download on) +bd_download = 0 # 0(Board Data Download off) or 1(Board Data Download on) bd_name = 'nrc7292_bd.dat' -guard_int = 'long' # 'long'(LGI) or 'short'(SGI) -concurrent = 0 # 0(Concurrent Mode off) or 1(Coucurrent Mode on) +guard_int = 'long' # 'long'(LGI) or 'short'(SGI) +concurrent = 0 # 0(Concurrent Mode off) or 1(Coucurrent Mode on) interface_11ah = 'wlan1' # 11ah driver interface : 'wlan0' or 'wlan1' -supplicant_debug = 0 # WPA Supplicant debug option : 0(off) or 1(on) -hostapd_debug = 0 # Hostapd debug option : 0(off) or 1(on) -max_cpuclock = 1 # RPi Max CPU Clock : 0(off) or 1(on) +supplicant_debug = 0 # WPA Supplicant debug option : 0(off) or 1(on) +hostapd_debug = 0 # Hostapd debug option : 0(off) or 1(on) +max_cpuclock = 1 # RPi Max CPU Clock : 0(off) or 1(on) # Optional Configuration for dual-band (11N + 11AH) enable_11n = 1 # Enable Dual-Band (11ah + 11n) role_11n = 'AP' # Role of 11N ('AP' or 'STA') interface_11n = 'wlan0' # 11n driver interface : 'wlan0' -disable_NAT = 0 # 1(NAT disable) 0(NAT enable) -power_save = 0 # power save : 0(off) or 1(on) +disable_NAT = 0 # 1(NAT disable) 0(NAT enable) +power_save = 0 # power save : 0(off) or 1(on) +bss_max_idle_enable = 0 # 0(bss_max_idle off) or 1(bss_max_idle on) +bss_max_idle = 10 # number of keepalives (0 ~ 65535) ################################################################################## def check(interface): @@ -108,6 +110,8 @@ def argv_print(): print ("Download Board Data : " + bd_name) print ("Interface : " + interface_11ah) print ("TX Power : " + str(txpwr_val)) + if int(bss_max_idle_enable) == 1 and strSTA() == 'AP': + print ("bss_max_idle : " + str(bss_max_idle)) print ("------------------------------") if int(enable_11n): print ("11n Interface : " + interface_11n) @@ -115,7 +119,7 @@ def argv_print(): print ("------------------------------") def copyConf(): - os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model)) + os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model) + " " + str(bd_name)) if strSTA() == 'AP': os.system("sudo cp /home/pi/nrc_pkg/etc/dhcpcd/dhcpcd_ap.conf /etc/dhcpcd.conf") os.system("sudo cp /home/pi/nrc_pkg/etc/dhcpcd/dnsmasq/dnsmasq_ap.conf /etc/dnsmasq.conf") @@ -187,7 +191,12 @@ def run_common(): else: power_save_arg = " power_save=0" - insmod_arg = fw_arg + alt_mode_arg + power_save_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed) + if int(bss_max_idle_enable) == 1 and strSTA() == 'AP': + bss_max_idle_arg = " bss_max_idle=" + str(bss_max_idle) + else: + bss_max_idle_arg = "" + + insmod_arg = fw_arg + bd_arg + alt_mode_arg + power_save_arg + bss_max_idle_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed) print "[2] Loading module" print "sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg os.system("sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg + "") diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/script/stop.py b/package/host/evk/sw_pkg/nrc_pkg_dual/script/stop.py old mode 100644 new mode 100755 diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/sw/driver/README.txt b/package/host/evk/sw_pkg/nrc_pkg_dual/sw/driver/README.txt old mode 100644 new mode 100755 index bc23f5a..c041629 --- a/package/host/evk/sw_pkg/nrc_pkg_dual/sw/driver/README.txt +++ b/package/host/evk/sw_pkg/nrc_pkg_dual/sw/driver/README.txt @@ -1,2 +1 @@ -SDK-v1.3.0 built on Linux kernel 4.14.70 \ No newline at end of file diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/sw/driver/nrc.ko b/package/host/evk/sw_pkg/nrc_pkg_dual/sw/driver/nrc.ko old mode 100644 new mode 100755 index 8adbbfc..2842a5d Binary files a/package/host/evk/sw_pkg/nrc_pkg_dual/sw/driver/nrc.ko and b/package/host/evk/sw_pkg/nrc_pkg_dual/sw/driver/nrc.ko differ diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/copy b/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/copy old mode 100644 new mode 100755 index c6146ca..486b044 --- a/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/copy +++ b/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/copy @@ -1,6 +1,6 @@ cp /home/pi/nrc_pkg/sw/firmware/nrc$1_cspi.bin /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin sudo cp /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin /lib/firmware -sudo cp /home/pi/nrc_pkg/sw/firmware/nrc7292_bd.dat /lib/firmware +sudo cp /home/pi/nrc_pkg/sw/firmware/$2 /lib/firmware ls -al /home/pi/nrc_pkg/sw/firmware ls -al /lib/firmware/uni_s1g* diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_bd.dat b/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_bd.dat old mode 100644 new mode 100755 index 40d3db8..846bed2 Binary files a/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_bd.dat and b/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_bd.dat differ diff --git a/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_cspi.bin b/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_cspi.bin old mode 100644 new mode 100755 index 64f56c4..5df509c Binary files a/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_cspi.bin and b/package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_cspi.bin differ diff --git a/package/host/evk/sw_pkg/update.sh b/package/host/evk/sw_pkg/update.sh old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/Makefile b/package/host/nrc_driver/source/nrc_driver/nrc/Makefile old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/Makefile.11n.sdio b/package/host/nrc_driver/source/nrc_driver/nrc/Makefile.11n.sdio old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/Makefile.halow.cspi b/package/host/nrc_driver/source/nrc_driver/nrc/Makefile.halow.cspi old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/compat.h b/package/host/nrc_driver/source/nrc_driver/nrc/compat.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/fastboot-cm0.h b/package/host/nrc_driver/source/nrc_driver/nrc/fastboot-cm0.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/hif.c b/package/host/nrc_driver/source/nrc_driver/nrc/hif.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/mac80211-ext.c b/package/host/nrc_driver/source/nrc_driver/nrc/mac80211-ext.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/mac80211-ext.h b/package/host/nrc_driver/source/nrc_driver/nrc/mac80211-ext.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/make_qsdk.sh b/package/host/nrc_driver/source/nrc_driver/nrc/make_qsdk.sh old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-bd.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-bd.c old mode 100644 new mode 100755 index 214ca7a..c02bbf1 --- a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-bd.c +++ b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-bd.c @@ -75,35 +75,44 @@ static void * nrc_dump_load(int len) int ret; mm_segment_t old_fs; int i; - char str[64]; + char filepath[64]; - sprintf(str, "/lib/firmware/%s", bd_name); - filp = filp_open(str, O_RDONLY, 0); + sprintf(filepath, "/lib/firmware/%s", bd_name); + old_fs = get_fs(); + set_fs(KERNEL_DS); + + filp = filp_open(filepath, O_RDONLY, 0); if (IS_ERR(filp)) { - nrc_dbg(NRC_DBG_STATE,"error:%d",IS_ERR(filp)); + pr_err("Failed to load borad data, error:%d",IS_ERR(filp)); + set_fs(old_fs); return NULL; } - old_fs = get_fs(); - set_fs(KERNEL_DS); - #if KERNEL_VERSION(4, 14, 0) <= NRC_TARGET_KERNEL_VERSION ret = kernel_read(filp, g_bd_buf, length, &pos); #else ret = kernel_read(filp, g_bd_buf, length, pos); #endif + filp_close(filp, NULL); + set_fs(old_fs); + + if(ret < NRC_BD_HEADER_LENGTH) { + pr_err("Invalid data size(%d)", ret); + return NULL; + } + for(i=0; i < ret;) { nrc_dbg(NRC_DBG_STATE,"%02X %02X %02X %02X %02X %02X %02X %02X ", - g_bd_buf[i], - g_bd_buf[i+1], - g_bd_buf[i+2], - g_bd_buf[i+3], - g_bd_buf[i+4], - g_bd_buf[i+5], - g_bd_buf[i+6], - g_bd_buf[i+7] - ); + g_bd_buf[i], + g_bd_buf[i+1], + g_bd_buf[i+2], + g_bd_buf[i+3], + g_bd_buf[i+4], + g_bd_buf[i+5], + g_bd_buf[i+6], + g_bd_buf[i+7] + ); i += 8; } @@ -117,17 +126,13 @@ static void * nrc_dump_load(int len) g_bd_buf, &g_bd_buf[0]); } #endif - - filp_close(filp, NULL); - set_fs(old_fs); return &g_bd_buf[0]; - } struct wim_bd_param * nrc_read_bd_tx_pwr(uint8_t *country_code) { - uint8_t cc_index = CC_US; + uint8_t cc_index = CC_MAX; uint16_t ret = 0; uint16_t len = 0; uint8_t type = 0; diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-bd.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-bd.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-build-config.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-build-config.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-debug.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-debug.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-debug.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-debug.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-dump.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-dump.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-dump.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-dump.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-fw.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-fw.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-fw.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-fw.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.c old mode 100644 new mode 100755 index 773ca4f..5d6aa42 --- a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.c +++ b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.c @@ -324,6 +324,23 @@ static int _c_spi_read_regs_alt(struct spi_device *spi, return -EIO; } +static int _c_spi_write_dummy(struct spi_device *spi) +{ + struct spi_transfer xfer[2] = {{0},}; + u32 dummy=0xffffffff; + u8 tx[8], rx[8]; + ssize_t status; + + memset(tx, 0xff, sizeof(tx)); + spi_set_transfer(&xfer[0], tx, rx, 8); + dummy = 0xffffffff; + spi_set_transfer(&xfer[1], &dummy, NULL, sizeof(dummy)); + + status = spi_sync_transfer(spi, xfer, 2); + + return 0; +} + static int _c_spi_write_reg_alt(struct spi_device *spi, u8 addr, u8 data) { struct nrc_hif_device *hdev = spi->dev.platform_data; @@ -1402,7 +1419,12 @@ void spi_reset(struct nrc_hif_device *hdev) { struct nrc_spi_priv *priv = hdev->priv; struct spi_device *spi = priv->spi; + int i; + if (enable_hspi_init) { + for(i=0; i<180; i++) + _c_spi_write_dummy(spi); + } /* 0xC8 is magic number for reset the device */ c_spi_write_reg(spi, C_SPI_DEVICE_STATUS, 0xC8); } @@ -1644,6 +1666,9 @@ static int c_spi_probe(struct spi_device *spi) priv->ops = &cspi_ops_alt; } + if (fw_name && enable_hspi_init) + spi_reset(hdev); + /* Read the register */ ret = c_spi_read_regs(spi, C_SPI_WAKE_UP, (void *)sys, sizeof(*sys)); if (ret < 0) { diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-debug.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-debug.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-debug.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-debug.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-sdio.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-sdio.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-sdio.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-sdio.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-ssp.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-ssp.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-ssp.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-ssp.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-uart.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-uart.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-uart.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif-uart.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-hif.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-init.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-init.c old mode 100644 new mode 100755 index dcbeb82..fb039e0 --- a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-init.c +++ b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-init.c @@ -113,6 +113,11 @@ int bss_max_idle; module_param(bss_max_idle, int, 0600); MODULE_PARM_DESC(bss_max_idle, "BSS Max Idle"); +/* bss_max_idle_usf_format */ +bool bss_max_idle_usf_format; +module_param(bss_max_idle_usf_format, bool, 0600); +MODULE_PARM_DESC(bss_max_idle_usf_format, "BSS Max Idle specified in units of usf"); + /* default enable_short_bi */ bool enable_short_bi; module_param(enable_short_bi, bool, 0600); @@ -159,6 +164,13 @@ bool ndp_preq = false; module_param(ndp_preq, bool, 0600); MODULE_PARM_DESC(ndp_preq, "Enable NDP Probe Request"); +/* + * Enable HSPI init + */ +bool enable_hspi_init = false; +module_param(enable_hspi_init, bool, S_IRUSR | S_IWUSR); +MODULE_PARM_DESC(enable_hspi_init, "Enable HSPI Initialization"); + static bool has_macaddr_param(uint8_t *dev_mac) { int res; @@ -173,6 +185,34 @@ static bool has_macaddr_param(uint8_t *dev_mac) return (res == 6); } + +static int s1g_unscaled_interval_max = 0x3fff; +static int convert_usf(int interval) +{ + int ui, usf = 0, interval_usf; + + if (interval <= s1g_unscaled_interval_max) { + ui = interval; + usf = 0; + } else if (interval / 10 <= s1g_unscaled_interval_max) { + ui= interval / 10; + usf = 1; + } else if (interval / 1000 <= s1g_unscaled_interval_max) { + ui = interval / 1000; + usf = 2; + } else if (interval / 10000 <= s1g_unscaled_interval_max) { + ui = interval / 10000; + usf = 3; + } else { + ui = 0; + usf = 0; + } + + interval_usf = (usf << 14) + ui; + + return interval_usf; +} + /**************************************************************************** * FunctionName : nrc_set_macaddr_from_fw * Description : This function set MAC Addresses from Serial Flash. @@ -260,6 +300,7 @@ static void nrc_on_fw_ready(struct sk_buff *skb, struct nrc *nw) ready->v.cap.listen_interval, listen_interval); nrc_dbg(NRC_DBG_HIF, " -- cap_idle: %d, %d", ready->v.cap.bss_max_idle, bss_max_idle); + nw->cap.cap_mask = ready->v.cap.cap; nw->cap.listen_interval = ready->v.cap.listen_interval; nw->cap.bss_max_idle = ready->v.cap.bss_max_idle; @@ -292,10 +333,23 @@ static void nrc_on_fw_ready(struct sk_buff *skb, struct nrc *nw) nw->cap.listen_interval = listen_interval; } - if (bss_max_idle > 0) - nw->cap.bss_max_idle = bss_max_idle; - else - nw->cap.bss_max_idle = 0; + if (bss_max_idle_usf_format) { + if (bss_max_idle > 65535 || bss_max_idle <= 0) { + nw->cap.bss_max_idle = 0; + } else { + nw->cap.bss_max_idle = bss_max_idle; + } + } else { + long max_idle = bss_max_idle * 1000 / 1024; + bss_max_idle = max_idle; + + /* usf convert */ + if (bss_max_idle > 16383 * 10000 || bss_max_idle <= 0) { + nw->cap.bss_max_idle = 0; + } else { + nw->cap.bss_max_idle = convert_usf(bss_max_idle); + } + } dev_kfree_skb(skb); } diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-init.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-init.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.c old mode 100644 new mode 100755 index 5c712ba..b15ddc8 --- a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.c +++ b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.c @@ -2024,8 +2024,7 @@ static int nrc_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, } } else WARN_ON(!(vif->type == NL80211_IFTYPE_AP || - vif->type == NL80211_IFTYPE_P2P_GO || - vif->type == NL80211_IFTYPE_MESH_POINT)); + vif->type == NL80211_IFTYPE_P2P_GO)); } ret = nrc_wim_install_key(nw, cmd, vif, sta, key); @@ -2442,8 +2441,10 @@ static int nrc_reg_notifier(struct wiphy *wiphy, sizeof(u16), request->alpha2); #if defined(CONFIG_SUPPORT_BD) - if(bd_param) + if(bd_param) { nrc_wim_skb_add_tlv(skb, WIM_TLV_BD, sizeof(*bd_param), bd_param); + kfree(bd_param); + } #endif /* defined(CONFIG_SUPPORT_BD) */ nrc_xmit_wim_request(nw, skb); @@ -2460,10 +2461,11 @@ static int nrc_vendor_update(struct nrc *nw, u8 subcmd, const u8 *data, int data_len) { const int OUI_LEN = 3; + const int MAX_DATALEN = 255; int new_elem_len = data_len + 2 /* EID + LEN */ + OUI_LEN + 1; u8 *pos; - if (!data || data_len < 1) + if (!data || data_len < 1 || (data_len + OUI_LEN + 1) > MAX_DATALEN) return -EINVAL; if (!nw->vendor_skb) diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-netlink.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-netlink.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-netlink.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-netlink.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-pm.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-pm.c old mode 100644 new mode 100755 index c9b0b6e..c8f62ce --- a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-pm.c +++ b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-pm.c @@ -289,6 +289,7 @@ static void sta_max_idle_period_expire(struct timer_list *t) struct sk_buff *skb; int band; struct ieee80211_hdr_3addr_qos *qosnullfunc; + int idle_offset; nrc_mac_dbg("%s: sending a keep-alive", __func__); /* Send a Null frame as a keep alive frame */ @@ -325,9 +326,14 @@ static void sta_max_idle_period_expire(struct timer_list *t) nrc_mac_tx(hw, skb); #endif + if (bss_max_idle_offset == 0) + idle_offset = -768; + else + idle_offset = bss_max_idle_offset; + /* Re-arm the timer */ mod_timer(&i_sta->max_idle.timer, - jiffies + i_sta->max_idle.idle_period + bss_max_idle_offset); + jiffies + i_sta->max_idle.idle_period + idle_offset); return; drop: @@ -350,6 +356,7 @@ static int sta_h_bss_max_idle_period(struct ieee80211_hw *hw, { struct nrc_sta *i_sta = to_i_sta(sta); u32 max_idle_period = 0; + int idle_offset; #if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE void (*bss_max_idle_period_expire)(unsigned long); #else @@ -403,8 +410,17 @@ static int sta_h_bss_max_idle_period(struct ieee80211_hw *hw, i_sta->max_idle.idle_period = msecs_to_jiffies(max_idle_period * 1024); /* Start STA inactivity monitoring */ + if (vif->type == NL80211_IFTYPE_STATION) { + if (bss_max_idle_offset == 0) + idle_offset = -768; + else + idle_offset = bss_max_idle_offset; + } else { + idle_offset = bss_max_idle_offset; + } + mod_timer(&i_sta->max_idle.timer, - jiffies + i_sta->max_idle.idle_period + bss_max_idle_offset); + jiffies + i_sta->max_idle.idle_period + idle_offset); return 0; } diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-recovery.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-recovery.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-recovery.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-recovery.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-ssp-dev.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-ssp-dev.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-ssp.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-ssp.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-ssp.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-ssp.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-stats.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-stats.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-stats.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-stats.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-trx.c b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-trx.c old mode 100644 new mode 100755 index 25eb219..838a87d --- a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-trx.c +++ b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-trx.c @@ -783,8 +783,8 @@ nrc_add_rx_s1g_radiotap_header(struct nrc *nw, struct sk_buff *skb) 0x0 << 6 | /* NSS */ ((rxi->bandwidth & 0x0f) << 8) | /* BW */ ((mcs & 0x0f) << 12); /* MCS */ - rt_hdr_agg.rt_s1g_data2 = cpu_to_le16((color & 0x0f) | - ((uplink_ind & 0x01) << 4) | + rt_hdr_agg.rt_s1g_data2 = cpu_to_le16((color & 0x07) | + ((uplink_ind & 0x01) << 3) | (rxi->rcpi << 8)); } else { rt_hdr.hdr.it_version = PKTHDR_RADIOTAP_VERSION; @@ -817,8 +817,8 @@ nrc_add_rx_s1g_radiotap_header(struct nrc *nw, struct sk_buff *skb) ((rxi->bandwidth & 0x0f) << 8) | /* BW */ ((mcs & 0x0f) << 12); /* MCS */ rt_hdr.rt_s1g_data2 = - cpu_to_le16((color & 0x0f) | - ((uplink_ind & 0x01) << 4) | + cpu_to_le16((color & 0x07) | + ((uplink_ind & 0x01) << 3) | (rxi->rcpi << 8)); } diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-vendor.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-vendor.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc-wim-types.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc-wim-types.h old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc.h b/package/host/nrc_driver/source/nrc_driver/nrc/nrc.h old mode 100644 new mode 100755 index 6bf743b..cd899ba --- a/package/host/nrc_driver/source/nrc_driver/nrc/nrc.h +++ b/package/host/nrc_driver/source/nrc_driver/nrc/nrc.h @@ -422,6 +422,8 @@ extern int bss_max_idle_offset; extern int power_save; extern bool wlantest; extern bool ndp_preq; +extern bool enable_hspi_init; + void nrc_set_bss_max_idle_offset(int value); #endif diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/nrc.lds b/package/host/nrc_driver/source/nrc_driver/nrc/nrc.lds old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/wim.c b/package/host/nrc_driver/source/nrc_driver/nrc/wim.c old mode 100644 new mode 100755 diff --git a/package/host/nrc_driver/source/nrc_driver/nrc/wim.h b/package/host/nrc_driver/source/nrc_driver/nrc/wim.h old mode 100644 new mode 100755 diff --git a/package/host/tools/BoardDataEditor/BoardDataEditor.exe b/package/host/tools/BoardDataEditor/BoardDataEditor.exe new file mode 100755 index 0000000..89f59f5 Binary files /dev/null and b/package/host/tools/BoardDataEditor/BoardDataEditor.exe differ diff --git a/package/host/tools/BoardDataEditor/newrafc.exe b/package/host/tools/BoardDataEditor/newrafc.exe new file mode 100755 index 0000000..48dd243 Binary files /dev/null and b/package/host/tools/BoardDataEditor/newrafc.exe differ diff --git a/package/host/tools/BoardDataEditor/nrc7292_boot.bin b/package/host/tools/BoardDataEditor/nrc7292_boot.bin new file mode 100755 index 0000000..7b59c8b Binary files /dev/null and b/package/host/tools/BoardDataEditor/nrc7292_boot.bin differ diff --git a/package/host/tools/BoardDataEditor/nrc7292_lmactest_freertos.bin b/package/host/tools/BoardDataEditor/nrc7292_lmactest_freertos.bin new file mode 100755 index 0000000..c2d375d Binary files /dev/null and b/package/host/tools/BoardDataEditor/nrc7292_lmactest_freertos.bin differ diff --git a/package/host_kr_mic/RN-7292-001-SW_PKG_release_note (v1.3.1).pdf b/package/host_kr_mic/RN-7292-001-SW_PKG_release_note (v1.3.1).pdf deleted file mode 100644 index 2a3b856..0000000 Binary files a/package/host_kr_mic/RN-7292-001-SW_PKG_release_note (v1.3.1).pdf and /dev/null differ diff --git a/package/host_kr_mic/RN-7292-001-SW_PKG_release_note (v1.3.2).pdf b/package/host_kr_mic/RN-7292-001-SW_PKG_release_note (v1.3.2).pdf new file mode 100755 index 0000000..ff09bbc Binary files /dev/null and b/package/host_kr_mic/RN-7292-001-SW_PKG_release_note (v1.3.2).pdf differ diff --git a/package/host_kr_mic/VERSION-SDK.txt b/package/host_kr_mic/VERSION-SDK.txt old mode 100644 new mode 100755 index c7f0155..0ac5a1d --- a/package/host_kr_mic/VERSION-SDK.txt +++ b/package/host_kr_mic/VERSION-SDK.txt @@ -1,4 +1,5 @@ VERSION_MAJOR 1 VERSION_MINOR 3 -VERSION_REVISION 1 +VERSION_REVISION 2 + KR MIC (922.5Mhz-929.0Mhz) diff --git a/package/host_kr_mic/cli_app/source/cli_app/Makefile b/package/host_kr_mic/cli_app/source/cli_app/Makefile old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/cli_app/source/cli_app/cli_cmd.c b/package/host_kr_mic/cli_app/source/cli_app/cli_cmd.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/cli_app/source/cli_app/cli_cmd.h b/package/host_kr_mic/cli_app/source/cli_app/cli_cmd.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/cli_app/source/cli_app/cli_config.h b/package/host_kr_mic/cli_app/source/cli_app/cli_config.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/cli_app/source/cli_app/cli_key_list.h b/package/host_kr_mic/cli_app/source/cli_app/cli_key_list.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/cli_app/source/cli_app/cli_netlink.c b/package/host_kr_mic/cli_app/source/cli_app/cli_netlink.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/cli_app/source/cli_app/cli_netlink.h b/package/host_kr_mic/cli_app/source/cli_app/cli_netlink.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/cli_app/source/cli_app/cli_util.c b/package/host_kr_mic/cli_app/source/cli_app/cli_util.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/cli_app/source/cli_app/cli_util.h b/package/host_kr_mic/cli_app/source/cli_app/cli_util.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/cli_app/source/cli_app/main.c b/package/host_kr_mic/cli_app/source/cli_app/main.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/doc/AN-7292-001-Dual Band.pdf b/package/host_kr_mic/doc/AN-7292-001-Dual Band.pdf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/doc/AN-7292-002-Dynamic Vendor IE.pdf b/package/host_kr_mic/doc/AN-7292-002-Dynamic Vendor IE.pdf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/doc/AN-7292-006-Tree-based Mesh.pdf b/package/host_kr_mic/doc/AN-7292-006-Tree-based Mesh.pdf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/doc/NRC7292_EVK_User_Guide_HDPG.pdf b/package/host_kr_mic/doc/NRC7292_EVK_User_Guide_HDPG.pdf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/doc/TL-7292-009-Board_Data_Editor.pdf b/package/host_kr_mic/doc/TL-7292-009-Board_Data_Editor.pdf new file mode 100755 index 0000000..c8c5ae0 Binary files /dev/null and b/package/host_kr_mic/doc/TL-7292-009-Board_Data_Editor.pdf differ diff --git a/package/host_kr_mic/doc/UG-7292-001-Host mode SDK.pdf b/package/host_kr_mic/doc/UG-7292-001-Host mode SDK.pdf old mode 100644 new mode 100755 index 67c0c3a..bfc05c2 Binary files a/package/host_kr_mic/doc/UG-7292-001-Host mode SDK.pdf and b/package/host_kr_mic/doc/UG-7292-001-Host mode SDK.pdf differ diff --git a/package/host_kr_mic/doc/UG-7292-002-Host driver porting.pdf b/package/host_kr_mic/doc/UG-7292-002-Host driver porting.pdf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/doc/UG-7292-003-S1G_Channel.pdf b/package/host_kr_mic/doc/UG-7292-003-S1G_Channel.pdf old mode 100644 new mode 100755 index cc3d575..b227508 Binary files a/package/host_kr_mic/doc/UG-7292-003-S1G_Channel.pdf and b/package/host_kr_mic/doc/UG-7292-003-S1G_Channel.pdf differ diff --git a/package/host_kr_mic/doc/UG-7292-007-Commnad line application.pdf b/package/host_kr_mic/doc/UG-7292-007-Commnad line application.pdf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/doc/UG-7292-009-Guide_Deep Sleep Mode.pdf b/package/host_kr_mic/doc/UG-7292-009-Guide_Deep Sleep Mode.pdf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/doc/UG-7292-010-Recovery.pdf b/package/host_kr_mic/doc/UG-7292-010-Recovery.pdf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/doc/UG-7292-011-NewraPeek.pdf b/package/host_kr_mic/doc/UG-7292-011-NewraPeek.pdf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/doc/UG-7292-013-iperf.pdf b/package/host_kr_mic/doc/UG-7292-013-iperf.pdf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/doc/UG-7292-015-Transmit_Power_Control.pdf b/package/host_kr_mic/doc/UG-7292-015-Transmit_Power_Control.pdf new file mode 100755 index 0000000..a31f3a3 Binary files /dev/null and b/package/host_kr_mic/doc/UG-7292-015-Transmit_Power_Control.pdf differ diff --git a/package/host_kr_mic/evk/binary/VERSION-SDK.txt b/package/host_kr_mic/evk/binary/VERSION-SDK.txt old mode 100644 new mode 100755 index c7f0155..0ac5a1d --- a/package/host_kr_mic/evk/binary/VERSION-SDK.txt +++ b/package/host_kr_mic/evk/binary/VERSION-SDK.txt @@ -1,4 +1,5 @@ VERSION_MAJOR 1 VERSION_MINOR 3 -VERSION_REVISION 1 +VERSION_REVISION 2 + KR MIC (922.5Mhz-929.0Mhz) diff --git a/package/host_kr_mic/evk/binary/cli_app b/package/host_kr_mic/evk/binary/cli_app old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/binary/nrc.ko b/package/host_kr_mic/evk/binary/nrc.ko old mode 100644 new mode 100755 index 8adbbfc..2842a5d Binary files a/package/host_kr_mic/evk/binary/nrc.ko and b/package/host_kr_mic/evk/binary/nrc.ko differ diff --git a/package/host_kr_mic/evk/binary/nrc7292_bd.dat b/package/host_kr_mic/evk/binary/nrc7292_bd.dat new file mode 100755 index 0000000..846bed2 Binary files /dev/null and b/package/host_kr_mic/evk/binary/nrc7292_bd.dat differ diff --git a/package/host_kr_mic/evk/binary/nrc7292_cspi.bin b/package/host_kr_mic/evk/binary/nrc7292_cspi.bin old mode 100644 new mode 100755 index 7df005f..c6a9170 Binary files a/package/host_kr_mic/evk/binary/nrc7292_cspi.bin and b/package/host_kr_mic/evk/binary/nrc7292_cspi.bin differ diff --git a/package/host_kr_mic/evk/sw_pkg/.bashrc b/package/host_kr_mic/evk/sw_pkg/.bashrc old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/README.txt b/package/host_kr_mic/evk/sw_pkg/README.txt old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/README b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/README old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/VERSION-SDK.txt b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/VERSION-SDK.txt old mode 100644 new mode 100755 index c7f0155..0ac5a1d --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/VERSION-SDK.txt +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/VERSION-SDK.txt @@ -1,4 +1,5 @@ VERSION_MAJOR 1 VERSION_MINOR 3 -VERSION_REVISION 1 +VERSION_REVISION 2 + KR MIC (922.5Mhz-929.0Mhz) diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/dhcpcd/dhcpcd.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/dhcpcd/dhcpcd.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/dnsmasq/dnsmasq.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/dnsmasq/dnsmasq.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/python/gain_rx.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/python/gain_rx.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/python/netlink.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/python/netlink.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/python/nrcnetlink.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/python/nrcnetlink.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/python/shell.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/python/shell.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/python/test_send_addba.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/etc/python/test_send_addba.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/cli_app b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/cli_app old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/CN/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/EU/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/JP/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_open.conf old mode 100644 new mode 100755 index 454d05b..b4bcf7c --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_open.conf +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_open.conf @@ -8,7 +8,7 @@ hw_mode=a #1MHz #925.5MHz -#channel=36 +channel=36 #926.5MHz #channel=37 #927.5MHz @@ -22,7 +22,7 @@ hw_mode=a #2MHz #927MHz -channel=42 +#channel=42 #929MHz #channel=43 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_owe.conf old mode 100644 new mode 100755 index ef7d009..e8ab516 --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_owe.conf +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_owe.conf @@ -7,7 +7,7 @@ hw_mode=a #1MHz #925.5MHz -#channel=36 +channel=36 #926.5MHz #channel=37 #927.5MHz @@ -21,7 +21,7 @@ hw_mode=a #2MHz #927MHz -channel=42 +#channel=42 #929MHz #channel=43 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_sae.conf old mode 100644 new mode 100755 index fa02935..db40019 --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_sae.conf +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_sae.conf @@ -7,7 +7,7 @@ hw_mode=a #1MHz #925.5MHz -#channel=36 +channel=36 #926.5MHz #channel=37 #927.5MHz @@ -21,7 +21,7 @@ hw_mode=a #2MHz #927MHz -channel=42 +#channel=42 #929MHz #channel=43 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_wpa2.conf old mode 100644 new mode 100755 index 33edc04..30dcfd1 --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_wpa2.conf +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/ap_halow_wpa2.conf @@ -7,7 +7,7 @@ hw_mode=a #1MHz #925.5MHz -#channel=36 +channel=36 #926.5MHz #channel=37 #927.5MHz @@ -21,7 +21,7 @@ hw_mode=a #2MHz #927MHz -channel=42 +#channel=42 #929MHz #channel=43 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/KR/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/TW/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/US/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/etc/CONFIG_IP b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/etc/CONFIG_IP old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/etc/add_route.sh b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/etc/add_route.sh old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/etc/clock_config.sh b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/etc/clock_config.sh old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/etc/ip_config.sh b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/conf/etc/ip_config.sh old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/run_recovery.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/run_recovery.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/README.txt b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/README.txt old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/newrapeek_0-1.4_armhf.deb b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/newrapeek_0-1.4_armhf.deb old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/rpcapd b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/rpcapd old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/run_rpcapd.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/run_rpcapd.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/run_tshark.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/NewraPeek_v0-1.4/run_tshark.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/change_channel.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/sniffer/change_channel.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/start.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/start.py old mode 100644 new mode 100755 index 82c94e3..3284efc --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/start.py +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/start.py @@ -7,22 +7,24 @@ ################################################################################## # Default Configuration (you can change value you want here) -model = 7292 # 7292 or 7192 -hif_speed = 16000000 # HSPI Clock -gain_type = 'phy' # 'phy' or 'nrf(legacy)' -txpwr_val = 17 # TX Power -maxagg_num = 8 # 0(AMPDU off) or >2(AMPDU on) -cqm_off = 0 # 0(CQM on) or 1(CQM off) -fw_download = 1 # 0(FW Download off) or 1(FW Download on) +model = 7292 # 7292 or 7192 +hif_speed = 16000000 # HSPI Clock +gain_type = 'phy' # 'phy' or 'nrf(legacy)' +txpwr_val = 17 # TX Power +maxagg_num = 8 # 0(AMPDU off) or >2(AMPDU on) +cqm_off = 0 # 0(CQM on) or 1(CQM off) +fw_download = 1 # 0(FW Download off) or 1(FW Download on) fw_name = 'uni_s1g.bin' -bd_download = 0 # 0(Board Data Download off) or 1(Board Data Download on) +bd_download = 0 # 0(Board Data Download off) or 1(Board Data Download on) bd_name = 'nrc7292_bd.dat' -guard_int = 'long' # 'long'(LGI) or 'short'(SGI) -supplicant_debug = 0 # WPA Supplicant debug option : 0(off) or 1(on) -hostapd_debug = 0 # Hostapd debug option : 0(off) or 1(on) -max_cpuclock = 1 # RPi Max CPU Clock : 0(off) or 1(on) -relay_type = 0 # 0 (wlan0: STA, wlan1: AP) 1 (wlan0: AP, wlan1: STA) -power_save = 0 # power save : 0(off) or 1(on) +guard_int = 'long' # 'long'(LGI) or 'short'(SGI) +supplicant_debug = 0 # WPA Supplicant debug option : 0(off) or 1(on) +hostapd_debug = 0 # Hostapd debug option : 0(off) or 1(on) +max_cpuclock = 1 # RPi Max CPU Clock : 0(off) or 1(on) +relay_type = 0 # 0 (wlan0: STA, wlan1: AP) 1 (wlan0: AP, wlan1: STA) +power_save = 0 # power save : 0(off) or 1(on) +bss_max_idle_enable = 0 # 0(bss_max_idle off) or 1(bss_max_idle on) +bss_max_idle = 10 # number of keepalives (0 ~ 65535) ################################################################################## def check(interface): @@ -33,13 +35,13 @@ def usage_print(): print ("Usage: \n\tstart.py [sta_type] [security_mode] [country] [channel] [sniffer_mode]") print ("Argument: \n\tsta_type [0:STA | 1:AP | 2:SNIFFER | 3:RELAY] \ \n\tsecurity_mode [0:Open | 1:WPA2-PSK | 2:WPA3-OWE | 3:WPA3-SAE] \ - \n\tcountry [US:USA | JP:Japan | TW:Taiwan | KR:Korea | EU:EURO | CN:China] \ + \n\tcountry [KR:Korea] \ \n\t----------------------------------------------------------- \ \n\tchannel [S1G Channel Number] * Only for Sniffer \ \n\tsniffer_mode [0:Local | 1:Remote] * Only for Sniffer") print ("Example: \n\tOPEN mode STA for Korea : ./start.py 0 0 KR \ - \n\tSecurity mode AP for US : ./start.py 1 1 US \ - \n\tLocal Sniffer mode on CH 40 for Japan : ./start.py 2 0 JP 40 0") + \n\tSecurity mode AP for KR : ./start.py 1 1 KR \ + \n\tLocal Sniffer mode on CH 36 for Korea : ./start.py 2 0 KR 36 0") print ("Note: \n\tsniffer_mode should be set as '1' when running sniffer on remote terminal") exit() @@ -56,11 +58,12 @@ def strSTA(): usage_print() def checkCountry(): - country_list = ["US","KR","CN","JP","EU","TW"] + country_list = ["KR"] if str(sys.argv[3]) in country_list: return else: - usage_print() + print ("Only KR MIC channel frequencies are supported. Please select the country code KR.") + exit() def strSecurity(): if int(sys.argv[2]) == 0: @@ -103,10 +106,12 @@ def argv_print(): if int(bd_download) == 1: print ("Download Board Data : " + bd_name) print ("TX Power : " + str(txpwr_val)) + if int(bss_max_idle_enable) == 1 and strSTA() == 'AP': + print ("bss_max_idle : " + str(bss_max_idle)) print ("------------------------------") def copyConf(): - os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model)) + os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model) + " " + str(bd_name)) os.system("/home/pi/nrc_pkg/script/conf/etc/ip_config.sh " + strSTA() + " " + str(relay_type)) def startNAT(): @@ -177,7 +182,12 @@ def run_common(): else: power_save_arg = " power_save=0" - insmod_arg = fw_arg + bd_arg + alt_mode_arg + power_save_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed) + if int(bss_max_idle_enable) == 1 and strSTA() == 'AP': + bss_max_idle_arg = " bss_max_idle=" + str(bss_max_idle) + else: + bss_max_idle_arg = "" + + insmod_arg = fw_arg + bd_arg + alt_mode_arg + power_save_arg + bss_max_idle_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed) print "[2] Loading module" print "sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg os.system("sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg + "") diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/stop.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/script/stop.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/driver/README.txt b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/driver/README.txt old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/driver/nrc.ko b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/driver/nrc.ko old mode 100644 new mode 100755 index 8adbbfc..2842a5d Binary files a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/driver/nrc.ko and b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/driver/nrc.ko differ diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/copy b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/copy old mode 100644 new mode 100755 index c6146ca..486b044 --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/copy +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/copy @@ -1,6 +1,6 @@ cp /home/pi/nrc_pkg/sw/firmware/nrc$1_cspi.bin /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin sudo cp /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin /lib/firmware -sudo cp /home/pi/nrc_pkg/sw/firmware/nrc7292_bd.dat /lib/firmware +sudo cp /home/pi/nrc_pkg/sw/firmware/$2 /lib/firmware ls -al /home/pi/nrc_pkg/sw/firmware ls -al /lib/firmware/uni_s1g* diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_bd.dat b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_bd.dat old mode 100644 new mode 100755 index 40d3db8..846bed2 Binary files a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_bd.dat and b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_bd.dat differ diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_cspi.bin b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_cspi.bin old mode 100644 new mode 100755 index 7df005f..c6a9170 Binary files a/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_cspi.bin and b/package/host_kr_mic/evk/sw_pkg/nrc_pkg/sw/firmware/nrc7292_cspi.bin differ diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/README b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/README old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/VERSION-SDK.txt b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/VERSION-SDK.txt old mode 100644 new mode 100755 index c7f0155..0ac5a1d --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/VERSION-SDK.txt +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/VERSION-SDK.txt @@ -1,4 +1,5 @@ VERSION_MAJOR 1 VERSION_MINOR 3 -VERSION_REVISION 1 +VERSION_REVISION 2 + KR MIC (922.5Mhz-929.0Mhz) diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_ap.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_ap.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_ap_sta.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_ap_sta.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_sta.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_sta.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_sta_ap.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dhcpcd_sta_ap.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_ap.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_ap.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_ap_sta.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_ap_sta.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_sta_ap.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/dhcpcd/dnsmasq/dnsmasq_sta_ap.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/python/gain_rx.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/python/gain_rx.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/python/netlink.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/python/netlink.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/python/nrcnetlink.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/python/nrcnetlink.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/python/shell.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/python/shell.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/python/test_send_addba.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/etc/python/test_send_addba.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/cli_app b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/cli_app old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/hostapd_AP.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/hostapd_AP.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/hostapd_STA.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/hostapd_STA.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/wpa_supplicant.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/11N/wpa_supplicant.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/CN/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/EU/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/JP/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_open.conf old mode 100644 new mode 100755 index f43773b..9a4df8c --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_open.conf +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_open.conf @@ -7,7 +7,7 @@ hw_mode=a #1MHz #925.5MHz -#channel=36 +channel=36 #926.5MHz #channel=37 #927.5MHz @@ -21,7 +21,7 @@ hw_mode=a #2MHz #927MHz -channel=42 +#channel=42 #929MHz #channel=43 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_owe.conf old mode 100644 new mode 100755 index e790e42..f77a841 --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_owe.conf +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_owe.conf @@ -7,7 +7,7 @@ hw_mode=a #1MHz #925.5MHz -#channel=36 +channel=36 #926.5MHz #channel=37 #927.5MHz @@ -21,7 +21,7 @@ hw_mode=a #2MHz #927MHz -channel=42 +#channel=42 #929MHz #channel=43 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_sae.conf old mode 100644 new mode 100755 index a06a5e5..aa52e02 --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_sae.conf +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_sae.conf @@ -7,7 +7,7 @@ hw_mode=a #1MHz #925.5MHz -#channel=36 +channel=36 #926.5MHz #channel=37 #927.5MHz @@ -21,7 +21,7 @@ hw_mode=a #2MHz #927MHz -channel=42 +#channel=42 #929MHz #channel=43 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_wpa2.conf old mode 100644 new mode 100755 index b17b980..eaee9e1 --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_wpa2.conf +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/ap_halow_wpa2.conf @@ -7,7 +7,7 @@ hw_mode=a #1MHz #925.5MHz -#channel=36 +channel=36 #926.5MHz #channel=37 #927.5MHz @@ -21,7 +21,7 @@ hw_mode=a #2MHz #927MHz -channel=42 +#channel=42 #929MHz #channel=43 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/KR/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/TW/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/ap_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_open.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_open.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_owe.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_owe.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_sae.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_sae.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_wpa2.conf b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/conf/US/sta_halow_wpa2.conf old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/fix_clock.sh b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/fix_clock.sh old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/README.txt b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/README.txt old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/newrapeek_0-1.4_armhf.deb b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/newrapeek_0-1.4_armhf.deb old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/rpcapd b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/rpcapd old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/run_rpcapd.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/run_rpcapd.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/run_tshark.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/NewraPeek_v0-1.4/run_tshark.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/change_channel.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/sniffer/change_channel.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/start.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/start.py old mode 100644 new mode 100755 index cd743e4..e98d22c --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/start.py +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/start.py @@ -7,28 +7,30 @@ ################################################################################## # Default Configuration (you can change value you want here) -model = 7292 # 7292 or 7192 -hif_speed = 16000000 # HSPI Clock -gain_type = 'phy' # 'phy' or 'nrf(legacy)' -txpwr_val = 17 # TX Power -maxagg_num = 8 # 0(AMPDU off) or >2(AMPDU on) -cqm_off = 0 # 0(CQM on) or 1(CQM off) -fw_download = 1 # 0(FW Download off) or 1(FW Download on) +model = 7292 # 7292 or 7192 +hif_speed = 16000000 # HSPI Clock +gain_type = 'phy' # 'phy' or 'nrf(legacy)' +txpwr_val = 17 # TX Power +maxagg_num = 8 # 0(AMPDU off) or >2(AMPDU on) +cqm_off = 0 # 0(CQM on) or 1(CQM off) +fw_download = 1 # 0(FW Download off) or 1(FW Download on) fw_name = 'uni_s1g.bin' -bd_download = 0 # 0(Board Data Download off) or 1(Board Data Download on) +bd_download = 0 # 0(Board Data Download off) or 1(Board Data Download on) bd_name = 'nrc7292_bd.dat' -guard_int = 'long' # 'long'(LGI) or 'short'(SGI) -concurrent = 0 # 0(Concurrent Mode off) or 1(Coucurrent Mode on) +guard_int = 'long' # 'long'(LGI) or 'short'(SGI) +concurrent = 0 # 0(Concurrent Mode off) or 1(Coucurrent Mode on) interface_11ah = 'wlan1' # 11ah driver interface : 'wlan0' or 'wlan1' -supplicant_debug = 0 # WPA Supplicant debug option : 0(off) or 1(on) -hostapd_debug = 0 # Hostapd debug option : 0(off) or 1(on) -max_cpuclock = 1 # RPi Max CPU Clock : 0(off) or 1(on) +supplicant_debug = 0 # WPA Supplicant debug option : 0(off) or 1(on) +hostapd_debug = 0 # Hostapd debug option : 0(off) or 1(on) +max_cpuclock = 1 # RPi Max CPU Clock : 0(off) or 1(on) # Optional Configuration for dual-band (11N + 11AH) enable_11n = 1 # Enable Dual-Band (11ah + 11n) role_11n = 'AP' # Role of 11N ('AP' or 'STA') interface_11n = 'wlan0' # 11n driver interface : 'wlan0' -disable_NAT = 0 # 1(NAT disable) 0(NAT enable) -power_save = 0 # power save : 0(off) or 1(on) +disable_NAT = 0 # 1(NAT disable) 0(NAT enable) +power_save = 0 # power save : 0(off) or 1(on) +bss_max_idle_enable = 0 # 0(bss_max_idle off) or 1(bss_max_idle on) +bss_max_idle = 10 # number of keepalives (0 ~ 65535) ################################################################################## def check(interface): @@ -39,13 +41,13 @@ def usage_print(): print ("Usage: \n\tstart.py [sta_type] [security_mode] [country] [channel] [sniffer_mode]") print ("Argument: \n\tsta_type [0:STA | 1:AP | 2:SNIFFER | 3:RELAY] \ \n\tsecurity_mode [0:Open | 1:WPA2-PSK | 2:WPA3-OWE | 3:WPA3-SAE] \ - \n\tcountry [US:USA | JP:Japan | TW:Taiwan | KR:Korea | EU:EURO | CN:China] \ + \n\tcountry [KR:Korea] \ \n\t----------------------------------------------------------- \ \n\tchannel [S1G Channel Number] * Only for Sniffer \ \n\tsniffer_mode [0:Local | 1:Remote] * Only for Sniffer") print ("Example: \n\tOPEN mode STA for Korea : ./start.py 0 0 KR \ - \n\tSecurity mode AP for US : ./start.py 1 1 US \ - \n\tLocal Sniffer mode on CH 40 for Japan : ./start.py 2 0 JP 40 0") + \n\tSecurity mode AP for KR : ./start.py 1 1 KR \ + \n\tLocal Sniffer mode on CH 36 for Korea : ./start.py 2 0 KR 36 0") print ("Note: \n\tsniffer_mode should be set as '1' when running sniffer on remote terminal") exit() @@ -60,11 +62,12 @@ def strSTA(): usage_print() def checkCountry(): - country_list = ["US","KR","CN","JP","EU","TW"] + country_list = ["KR"] if str(sys.argv[3]) in country_list: return else: - usage_print() + print ("Only KR MIC channel frequencies are supported. Please select the country code KR.") + exit() def strSecurity(): if int(sys.argv[2]) == 0: @@ -108,6 +111,8 @@ def argv_print(): print ("Download Board Data : " + bd_name) print ("Interface : " + interface_11ah) print ("TX Power : " + str(txpwr_val)) + if int(bss_max_idle_enable) == 1 and strSTA() == 'AP': + print ("bss_max_idle : " + str(bss_max_idle)) print ("------------------------------") if int(enable_11n): print ("11n Interface : " + interface_11n) @@ -115,7 +120,7 @@ def argv_print(): print ("------------------------------") def copyConf(): - os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model)) + os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model) + " " + str(bd_name)) if strSTA() == 'AP': os.system("sudo cp /home/pi/nrc_pkg/etc/dhcpcd/dhcpcd_ap.conf /etc/dhcpcd.conf") os.system("sudo cp /home/pi/nrc_pkg/etc/dhcpcd/dnsmasq/dnsmasq_ap.conf /etc/dnsmasq.conf") @@ -187,7 +192,12 @@ def run_common(): else: power_save_arg = " power_save=0" - insmod_arg = fw_arg + alt_mode_arg + power_save_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed) + if int(bss_max_idle_enable) == 1 and strSTA() == 'AP': + bss_max_idle_arg = " bss_max_idle=" + str(bss_max_idle) + else: + bss_max_idle_arg = "" + + insmod_arg = fw_arg + bd_arg + alt_mode_arg + power_save_arg + bss_max_idle_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed) print "[2] Loading module" print "sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg os.system("sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg + "") diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/stop.py b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/script/stop.py old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/driver/README.txt b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/driver/README.txt old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/driver/nrc.ko b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/driver/nrc.ko old mode 100644 new mode 100755 index 8adbbfc..2842a5d Binary files a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/driver/nrc.ko and b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/driver/nrc.ko differ diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/copy b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/copy old mode 100644 new mode 100755 index c6146ca..486b044 --- a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/copy +++ b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/copy @@ -1,6 +1,6 @@ cp /home/pi/nrc_pkg/sw/firmware/nrc$1_cspi.bin /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin sudo cp /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin /lib/firmware -sudo cp /home/pi/nrc_pkg/sw/firmware/nrc7292_bd.dat /lib/firmware +sudo cp /home/pi/nrc_pkg/sw/firmware/$2 /lib/firmware ls -al /home/pi/nrc_pkg/sw/firmware ls -al /lib/firmware/uni_s1g* diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_bd.dat b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_bd.dat old mode 100644 new mode 100755 index 40d3db8..846bed2 Binary files a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_bd.dat and b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_bd.dat differ diff --git a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_cspi.bin b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_cspi.bin old mode 100644 new mode 100755 index 7df005f..c6a9170 Binary files a/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_cspi.bin and b/package/host_kr_mic/evk/sw_pkg/nrc_pkg_dual/sw/firmware/nrc7292_cspi.bin differ diff --git a/package/host_kr_mic/evk/sw_pkg/update.sh b/package/host_kr_mic/evk/sw_pkg/update.sh old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/Makefile b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/Makefile old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/Makefile.11n.sdio b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/Makefile.11n.sdio old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/Makefile.halow.cspi b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/Makefile.halow.cspi old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/compat.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/compat.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/fastboot-cm0.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/fastboot-cm0.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/hif.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/hif.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/mac80211-ext.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/mac80211-ext.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/mac80211-ext.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/mac80211-ext.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/make_qsdk.sh b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/make_qsdk.sh old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-bd.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-bd.c old mode 100644 new mode 100755 index 214ca7a..c02bbf1 --- a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-bd.c +++ b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-bd.c @@ -75,35 +75,44 @@ static void * nrc_dump_load(int len) int ret; mm_segment_t old_fs; int i; - char str[64]; + char filepath[64]; - sprintf(str, "/lib/firmware/%s", bd_name); - filp = filp_open(str, O_RDONLY, 0); + sprintf(filepath, "/lib/firmware/%s", bd_name); + old_fs = get_fs(); + set_fs(KERNEL_DS); + + filp = filp_open(filepath, O_RDONLY, 0); if (IS_ERR(filp)) { - nrc_dbg(NRC_DBG_STATE,"error:%d",IS_ERR(filp)); + pr_err("Failed to load borad data, error:%d",IS_ERR(filp)); + set_fs(old_fs); return NULL; } - old_fs = get_fs(); - set_fs(KERNEL_DS); - #if KERNEL_VERSION(4, 14, 0) <= NRC_TARGET_KERNEL_VERSION ret = kernel_read(filp, g_bd_buf, length, &pos); #else ret = kernel_read(filp, g_bd_buf, length, pos); #endif + filp_close(filp, NULL); + set_fs(old_fs); + + if(ret < NRC_BD_HEADER_LENGTH) { + pr_err("Invalid data size(%d)", ret); + return NULL; + } + for(i=0; i < ret;) { nrc_dbg(NRC_DBG_STATE,"%02X %02X %02X %02X %02X %02X %02X %02X ", - g_bd_buf[i], - g_bd_buf[i+1], - g_bd_buf[i+2], - g_bd_buf[i+3], - g_bd_buf[i+4], - g_bd_buf[i+5], - g_bd_buf[i+6], - g_bd_buf[i+7] - ); + g_bd_buf[i], + g_bd_buf[i+1], + g_bd_buf[i+2], + g_bd_buf[i+3], + g_bd_buf[i+4], + g_bd_buf[i+5], + g_bd_buf[i+6], + g_bd_buf[i+7] + ); i += 8; } @@ -117,17 +126,13 @@ static void * nrc_dump_load(int len) g_bd_buf, &g_bd_buf[0]); } #endif - - filp_close(filp, NULL); - set_fs(old_fs); return &g_bd_buf[0]; - } struct wim_bd_param * nrc_read_bd_tx_pwr(uint8_t *country_code) { - uint8_t cc_index = CC_US; + uint8_t cc_index = CC_MAX; uint16_t ret = 0; uint16_t len = 0; uint8_t type = 0; diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-bd.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-bd.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-build-config.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-build-config.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-debug.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-debug.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-debug.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-debug.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-dump.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-dump.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-dump.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-dump.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-fw.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-fw.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-fw.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-fw.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.c old mode 100644 new mode 100755 index 773ca4f..5d6aa42 --- a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.c +++ b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.c @@ -324,6 +324,23 @@ static int _c_spi_read_regs_alt(struct spi_device *spi, return -EIO; } +static int _c_spi_write_dummy(struct spi_device *spi) +{ + struct spi_transfer xfer[2] = {{0},}; + u32 dummy=0xffffffff; + u8 tx[8], rx[8]; + ssize_t status; + + memset(tx, 0xff, sizeof(tx)); + spi_set_transfer(&xfer[0], tx, rx, 8); + dummy = 0xffffffff; + spi_set_transfer(&xfer[1], &dummy, NULL, sizeof(dummy)); + + status = spi_sync_transfer(spi, xfer, 2); + + return 0; +} + static int _c_spi_write_reg_alt(struct spi_device *spi, u8 addr, u8 data) { struct nrc_hif_device *hdev = spi->dev.platform_data; @@ -1402,7 +1419,12 @@ void spi_reset(struct nrc_hif_device *hdev) { struct nrc_spi_priv *priv = hdev->priv; struct spi_device *spi = priv->spi; + int i; + if (enable_hspi_init) { + for(i=0; i<180; i++) + _c_spi_write_dummy(spi); + } /* 0xC8 is magic number for reset the device */ c_spi_write_reg(spi, C_SPI_DEVICE_STATUS, 0xC8); } @@ -1644,6 +1666,9 @@ static int c_spi_probe(struct spi_device *spi) priv->ops = &cspi_ops_alt; } + if (fw_name && enable_hspi_init) + spi_reset(hdev); + /* Read the register */ ret = c_spi_read_regs(spi, C_SPI_WAKE_UP, (void *)sys, sizeof(*sys)); if (ret < 0) { diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-cspi.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-debug.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-debug.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-debug.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-debug.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-sdio.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-sdio.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-sdio.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-sdio.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-ssp.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-ssp.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-ssp.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-ssp.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-uart.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-uart.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-uart.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif-uart.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-hif.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-init.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-init.c old mode 100644 new mode 100755 index dcbeb82..fb039e0 --- a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-init.c +++ b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-init.c @@ -113,6 +113,11 @@ int bss_max_idle; module_param(bss_max_idle, int, 0600); MODULE_PARM_DESC(bss_max_idle, "BSS Max Idle"); +/* bss_max_idle_usf_format */ +bool bss_max_idle_usf_format; +module_param(bss_max_idle_usf_format, bool, 0600); +MODULE_PARM_DESC(bss_max_idle_usf_format, "BSS Max Idle specified in units of usf"); + /* default enable_short_bi */ bool enable_short_bi; module_param(enable_short_bi, bool, 0600); @@ -159,6 +164,13 @@ bool ndp_preq = false; module_param(ndp_preq, bool, 0600); MODULE_PARM_DESC(ndp_preq, "Enable NDP Probe Request"); +/* + * Enable HSPI init + */ +bool enable_hspi_init = false; +module_param(enable_hspi_init, bool, S_IRUSR | S_IWUSR); +MODULE_PARM_DESC(enable_hspi_init, "Enable HSPI Initialization"); + static bool has_macaddr_param(uint8_t *dev_mac) { int res; @@ -173,6 +185,34 @@ static bool has_macaddr_param(uint8_t *dev_mac) return (res == 6); } + +static int s1g_unscaled_interval_max = 0x3fff; +static int convert_usf(int interval) +{ + int ui, usf = 0, interval_usf; + + if (interval <= s1g_unscaled_interval_max) { + ui = interval; + usf = 0; + } else if (interval / 10 <= s1g_unscaled_interval_max) { + ui= interval / 10; + usf = 1; + } else if (interval / 1000 <= s1g_unscaled_interval_max) { + ui = interval / 1000; + usf = 2; + } else if (interval / 10000 <= s1g_unscaled_interval_max) { + ui = interval / 10000; + usf = 3; + } else { + ui = 0; + usf = 0; + } + + interval_usf = (usf << 14) + ui; + + return interval_usf; +} + /**************************************************************************** * FunctionName : nrc_set_macaddr_from_fw * Description : This function set MAC Addresses from Serial Flash. @@ -260,6 +300,7 @@ static void nrc_on_fw_ready(struct sk_buff *skb, struct nrc *nw) ready->v.cap.listen_interval, listen_interval); nrc_dbg(NRC_DBG_HIF, " -- cap_idle: %d, %d", ready->v.cap.bss_max_idle, bss_max_idle); + nw->cap.cap_mask = ready->v.cap.cap; nw->cap.listen_interval = ready->v.cap.listen_interval; nw->cap.bss_max_idle = ready->v.cap.bss_max_idle; @@ -292,10 +333,23 @@ static void nrc_on_fw_ready(struct sk_buff *skb, struct nrc *nw) nw->cap.listen_interval = listen_interval; } - if (bss_max_idle > 0) - nw->cap.bss_max_idle = bss_max_idle; - else - nw->cap.bss_max_idle = 0; + if (bss_max_idle_usf_format) { + if (bss_max_idle > 65535 || bss_max_idle <= 0) { + nw->cap.bss_max_idle = 0; + } else { + nw->cap.bss_max_idle = bss_max_idle; + } + } else { + long max_idle = bss_max_idle * 1000 / 1024; + bss_max_idle = max_idle; + + /* usf convert */ + if (bss_max_idle > 16383 * 10000 || bss_max_idle <= 0) { + nw->cap.bss_max_idle = 0; + } else { + nw->cap.bss_max_idle = convert_usf(bss_max_idle); + } + } dev_kfree_skb(skb); } diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-init.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-init.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.c old mode 100644 new mode 100755 index 5c712ba..b15ddc8 --- a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.c +++ b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.c @@ -2024,8 +2024,7 @@ static int nrc_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, } } else WARN_ON(!(vif->type == NL80211_IFTYPE_AP || - vif->type == NL80211_IFTYPE_P2P_GO || - vif->type == NL80211_IFTYPE_MESH_POINT)); + vif->type == NL80211_IFTYPE_P2P_GO)); } ret = nrc_wim_install_key(nw, cmd, vif, sta, key); @@ -2442,8 +2441,10 @@ static int nrc_reg_notifier(struct wiphy *wiphy, sizeof(u16), request->alpha2); #if defined(CONFIG_SUPPORT_BD) - if(bd_param) + if(bd_param) { nrc_wim_skb_add_tlv(skb, WIM_TLV_BD, sizeof(*bd_param), bd_param); + kfree(bd_param); + } #endif /* defined(CONFIG_SUPPORT_BD) */ nrc_xmit_wim_request(nw, skb); @@ -2460,10 +2461,11 @@ static int nrc_vendor_update(struct nrc *nw, u8 subcmd, const u8 *data, int data_len) { const int OUI_LEN = 3; + const int MAX_DATALEN = 255; int new_elem_len = data_len + 2 /* EID + LEN */ + OUI_LEN + 1; u8 *pos; - if (!data || data_len < 1) + if (!data || data_len < 1 || (data_len + OUI_LEN + 1) > MAX_DATALEN) return -EINVAL; if (!nw->vendor_skb) diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-mac80211.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-netlink.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-netlink.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-netlink.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-netlink.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-pm.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-pm.c old mode 100644 new mode 100755 index c9b0b6e..c8f62ce --- a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-pm.c +++ b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-pm.c @@ -289,6 +289,7 @@ static void sta_max_idle_period_expire(struct timer_list *t) struct sk_buff *skb; int band; struct ieee80211_hdr_3addr_qos *qosnullfunc; + int idle_offset; nrc_mac_dbg("%s: sending a keep-alive", __func__); /* Send a Null frame as a keep alive frame */ @@ -325,9 +326,14 @@ static void sta_max_idle_period_expire(struct timer_list *t) nrc_mac_tx(hw, skb); #endif + if (bss_max_idle_offset == 0) + idle_offset = -768; + else + idle_offset = bss_max_idle_offset; + /* Re-arm the timer */ mod_timer(&i_sta->max_idle.timer, - jiffies + i_sta->max_idle.idle_period + bss_max_idle_offset); + jiffies + i_sta->max_idle.idle_period + idle_offset); return; drop: @@ -350,6 +356,7 @@ static int sta_h_bss_max_idle_period(struct ieee80211_hw *hw, { struct nrc_sta *i_sta = to_i_sta(sta); u32 max_idle_period = 0; + int idle_offset; #if KERNEL_VERSION(4, 15, 0) > LINUX_VERSION_CODE void (*bss_max_idle_period_expire)(unsigned long); #else @@ -403,8 +410,17 @@ static int sta_h_bss_max_idle_period(struct ieee80211_hw *hw, i_sta->max_idle.idle_period = msecs_to_jiffies(max_idle_period * 1024); /* Start STA inactivity monitoring */ + if (vif->type == NL80211_IFTYPE_STATION) { + if (bss_max_idle_offset == 0) + idle_offset = -768; + else + idle_offset = bss_max_idle_offset; + } else { + idle_offset = bss_max_idle_offset; + } + mod_timer(&i_sta->max_idle.timer, - jiffies + i_sta->max_idle.idle_period + bss_max_idle_offset); + jiffies + i_sta->max_idle.idle_period + idle_offset); return 0; } diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-recovery.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-recovery.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-recovery.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-recovery.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-ssp-dev.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-ssp-dev.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-ssp.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-ssp.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-ssp.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-ssp.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-stats.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-stats.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-stats.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-stats.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-trx.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-trx.c old mode 100644 new mode 100755 index 25eb219..838a87d --- a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-trx.c +++ b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-trx.c @@ -783,8 +783,8 @@ nrc_add_rx_s1g_radiotap_header(struct nrc *nw, struct sk_buff *skb) 0x0 << 6 | /* NSS */ ((rxi->bandwidth & 0x0f) << 8) | /* BW */ ((mcs & 0x0f) << 12); /* MCS */ - rt_hdr_agg.rt_s1g_data2 = cpu_to_le16((color & 0x0f) | - ((uplink_ind & 0x01) << 4) | + rt_hdr_agg.rt_s1g_data2 = cpu_to_le16((color & 0x07) | + ((uplink_ind & 0x01) << 3) | (rxi->rcpi << 8)); } else { rt_hdr.hdr.it_version = PKTHDR_RADIOTAP_VERSION; @@ -817,8 +817,8 @@ nrc_add_rx_s1g_radiotap_header(struct nrc *nw, struct sk_buff *skb) ((rxi->bandwidth & 0x0f) << 8) | /* BW */ ((mcs & 0x0f) << 12); /* MCS */ rt_hdr.rt_s1g_data2 = - cpu_to_le16((color & 0x0f) | - ((uplink_ind & 0x01) << 4) | + cpu_to_le16((color & 0x07) | + ((uplink_ind & 0x01) << 3) | (rxi->rcpi << 8)); } diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-vendor.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-vendor.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-wim-types.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc-wim-types.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc.h old mode 100644 new mode 100755 index 6bf743b..cd899ba --- a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc.h +++ b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc.h @@ -422,6 +422,8 @@ extern int bss_max_idle_offset; extern int power_save; extern bool wlantest; extern bool ndp_preq; +extern bool enable_hspi_init; + void nrc_set_bss_max_idle_offset(int value); #endif diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc.lds b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/nrc.lds old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/wim.c b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/wim.c old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/wim.h b/package/host_kr_mic/nrc_driver/source/nrc_driver/nrc/wim.h old mode 100644 new mode 100755 diff --git a/package/host_kr_mic/tools/BoardDataEditor/BoardDataEditor.exe b/package/host_kr_mic/tools/BoardDataEditor/BoardDataEditor.exe new file mode 100755 index 0000000..89f59f5 Binary files /dev/null and b/package/host_kr_mic/tools/BoardDataEditor/BoardDataEditor.exe differ diff --git a/package/host_kr_mic/tools/BoardDataEditor/newrafc.exe b/package/host_kr_mic/tools/BoardDataEditor/newrafc.exe new file mode 100755 index 0000000..48dd243 Binary files /dev/null and b/package/host_kr_mic/tools/BoardDataEditor/newrafc.exe differ diff --git a/package/host_kr_mic/tools/BoardDataEditor/nrc7292_boot.bin b/package/host_kr_mic/tools/BoardDataEditor/nrc7292_boot.bin new file mode 100755 index 0000000..7b59c8b Binary files /dev/null and b/package/host_kr_mic/tools/BoardDataEditor/nrc7292_boot.bin differ diff --git a/package/host_kr_mic/tools/BoardDataEditor/nrc7292_lmactest_freertos.bin b/package/host_kr_mic/tools/BoardDataEditor/nrc7292_lmactest_freertos.bin new file mode 100755 index 0000000..c2d375d Binary files /dev/null and b/package/host_kr_mic/tools/BoardDataEditor/nrc7292_lmactest_freertos.bin differ