diff --git a/buildroot/board/cvitek/SG200X/busybox-extra.config b/buildroot/board/cvitek/SG200X/busybox-extra.config new file mode 100644 index 000000000..4919343a4 --- /dev/null +++ b/buildroot/board/cvitek/SG200X/busybox-extra.config @@ -0,0 +1,2 @@ +CONFIG_UDHCPD=y +CONFIG_RX=y diff --git a/buildroot/board/cvitek/SG200X/overlay/etc/init.d/S30rndis b/buildroot/board/cvitek/SG200X/overlay/etc/init.d/S30rndis index 6dc544680..c5ebf09bd 100755 --- a/buildroot/board/cvitek/SG200X/overlay/etc/init.d/S30rndis +++ b/buildroot/board/cvitek/SG200X/overlay/etc/init.d/S30rndis @@ -2,11 +2,16 @@ . /etc/profile -gen_dnsmasq_conf() { +gen_udhcpd_conf() { interface=${1} ipv4_prefix=${2} - echo "interface=${interface}" - echo "dhcp-range=${ipv4_prefix}.50,${ipv4_prefix}.150,255.255.255.0,120h" + echo "start ${ipv4_prefix}.100" + echo "end ${ipv4_prefix}.200" + echo "interface ${interface}" + echo "pidfile /var/run/udhcpd.${interface}.pid" + echo "lease_file /var/lib/misc/udhcpd.${interface}.leases" + echo "option subnet 255.255.255.0" + echo "option lease 864000" } start() { @@ -28,13 +33,15 @@ start() { fi ipv4_prefix=10.$id2.$id3 fi - gen_dnsmasq_conf usb0 "${ipv4_prefix}" > /etc/dnsmasq.conf + gen_udhcpd_conf usb0 "${ipv4_prefix}" > /etc/udhcpd.usb0.conf ip addr add $ipv4_prefix.1/24 dev usb0 + udhcpd -S /etc/udhcpd.usb0.conf fi } stop() { - echo "" + kill `cat /var/run/udhcpd.usb0.pid` + rm /var/run/udhcpd.usb0.pid } restart() { diff --git a/buildroot/board/cvitek/SG200X/overlay/etc/init.d/S30wifi b/buildroot/board/cvitek/SG200X/overlay/etc/init.d/S30wifi index 01cc3b570..e9e5a779d 100755 --- a/buildroot/board/cvitek/SG200X/overlay/etc/init.d/S30wifi +++ b/buildroot/board/cvitek/SG200X/overlay/etc/init.d/S30wifi @@ -2,6 +2,40 @@ . /etc/profile +gen_hostapd_conf() { + ssid="${1}" + pass="${2}" + echo "ctrl_interface=/var/run/hostapd" + echo "ctrl_interface_group=0" + echo "ssid=${ssid}" + echo "hw_mode=g" + echo "channel=1" + echo "beacon_int=100" + echo "dtim_period=2" + echo "max_num_sta=255" + echo "rts_threshold=-1" + echo "fragm_threshold=-1" + echo "macaddr_acl=0" + echo "auth_algs=3" + echo "wpa=2" + echo "wpa_passphrase=${pass}" + echo "ieee80211n=1" +} + + + +gen_udhcpd_conf() { + interface=${1} + ipv4_prefix=${2} + echo "start ${ipv4_prefix}.100" + echo "end ${ipv4_prefix}.200" + echo "interface ${interface}" + echo "pidfile /var/run/udhcpd.${interface}.pid" + echo "lease_file /var/lib/misc/udhcpd.${interface}.leases" + echo "option subnet 255.255.255.0" + echo "option lease 864000" +} + start() { if [ -e /boot/wifi.sta ] then @@ -31,8 +65,50 @@ start() { then (udhcpc -i wlan0 -t 10 -T 1 -A 5 -b -p /run/udhcpc.wlan0.pid) & fi - fi - if [ -e /boot/wifi.mon ] + elif [ -e /boot/wifi.ap ] + then + if [ -e /boot/hostapd.conf ] + then + cp /boot/hostapd.conf /etc/hostapd.conf + else + id2=$(printf "%d" 0x$(sha512sum /sys/class/cvi-base/base_uid | head -c 2)) + id3=$(printf "%d" 0x$(sha512sum /sys/class/cvi-base/base_uid | head -c 4 | tail -c 2)) + if [ "$id2" -ge 255 ] + then + id2=254 + fi + if [ "$id3" -ge 255 ] + then + id3=254 + fi + ssid="licheervnano-${id2}${id3}" + pass="licheervnano" + if [ -e /boot/wifi.ssid ] + then + echo -n "ssid: " + cat /boot/wifi.ssid + ssid=`cat /boot/wifi.ssid` + fi + if [ -e /boot/wifi.pass ] + then + echo -n "wifi.pass: " + cat /boot/wifi.pass + pass=`cat /boot/wifi.pass` + fi + gen_hostapd_conf "$ssid" "$pass" > /etc/hostapd.conf + if [ -e /boot/wifi.ipv4_prefix ] + then + ipv4_prefix=`cat /boot/rndis.ipv4_prefix` + else + ipv4_prefix=10.$id3.$id2 + fi + gen_udhcpd_conf wlan0 "${ipv4_prefix}" > /etc/udhcpd.wlan0.conf + ifconfig wlan0 up + ip addr add $ipv4_prefix.1/24 dev wlan0 + fi + hostapd -B -i wlan0 /etc/hostapd.conf + udhcpd -S /etc/udhcpd.wlan0.conf + elif [ -e /boot/wifi.mon ] then airmon-ng start wlan0 fi @@ -42,6 +118,8 @@ stop() { killall wpa_supplicant kill `cat /run/udhcpc.wlan0.pid` rm /run/udhcpc.wlan0.pid + kill `cat /var/run/udhcpd.wlan0.pid` + rm /var/run/udhcpd.wlan0.pid airmon-ng stop wlan0mon } diff --git a/buildroot/configs/cvitek_SG200X_musl_riscv64_defconfig b/buildroot/configs/cvitek_SG200X_musl_riscv64_defconfig index e3e880aef..537515aad 100644 --- a/buildroot/configs/cvitek_SG200X_musl_riscv64_defconfig +++ b/buildroot/configs/cvitek_SG200X_musl_riscv64_defconfig @@ -254,10 +254,16 @@ BR2_PACKAGE_OPENCV4_LIB_PYTHON=y BR2_PACKAGE_OPENCV4_WITH_QT5=y BR2_PACKAGE_BLUEZ_TOOLS=y BR2_PACKAGE_TPUDEMO_SG200X=y - +BR2_PACKAGE_TCPDUMP=y +BR2_PACKAGE_SSDP_RESPONDER=y +BR2_PACKAGE_PPPD=y +BR2_PACKAGE_NFTABLES=y +BR2_PACKAGE_IPTABLES=y +BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="640M" BR2_ROOTFS_OVERLAY="$(TOPDIR)/board/cvitek/SG200X/overlay" +BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(TOPDIR)/board/cvitek/SG200X/busybox-extra.config" diff --git a/middleware/v2/lib/3rd/libini.a b/middleware/v2/lib/3rd/libini.a index 580b8d63c..057f64b7b 100644 Binary files a/middleware/v2/lib/3rd/libini.a and b/middleware/v2/lib/3rd/libini.a differ diff --git a/middleware/v2/lib/libcvi_bin.a b/middleware/v2/lib/libcvi_bin.a index 34b1fd578..e05b9a589 100644 Binary files a/middleware/v2/lib/libcvi_bin.a and b/middleware/v2/lib/libcvi_bin.a differ diff --git a/middleware/v2/lib/libcvi_ive.a b/middleware/v2/lib/libcvi_ive.a index 88e2232d3..8a2ffd413 100644 Binary files a/middleware/v2/lib/libcvi_ive.a and b/middleware/v2/lib/libcvi_ive.a differ diff --git a/middleware/v2/lib/libmipi_tx.a b/middleware/v2/lib/libmipi_tx.a index 4fddb0129..a6fd9528f 100644 Binary files a/middleware/v2/lib/libmipi_tx.a and b/middleware/v2/lib/libmipi_tx.a differ diff --git a/middleware/v2/lib/libmisc.a b/middleware/v2/lib/libmisc.a index b1e9cdcf0..301d2de69 100644 Binary files a/middleware/v2/lib/libmisc.a and b/middleware/v2/lib/libmisc.a differ diff --git a/middleware/v2/lib/libosdc.a b/middleware/v2/lib/libosdc.a index 03d9d7ca1..cae01d4ab 100644 Binary files a/middleware/v2/lib/libosdc.a and b/middleware/v2/lib/libosdc.a differ diff --git a/middleware/v2/lib/libsample.a b/middleware/v2/lib/libsample.a index 4123351fa..7aa4385bf 100644 Binary files a/middleware/v2/lib/libsample.a and b/middleware/v2/lib/libsample.a differ diff --git a/middleware/v2/lib/libsns_full.a b/middleware/v2/lib/libsns_full.a index 65e6a5ae4..09f3a9982 100644 Binary files a/middleware/v2/lib/libsns_full.a and b/middleware/v2/lib/libsns_full.a differ diff --git a/middleware/v2/lib/libsns_gc4653.a b/middleware/v2/lib/libsns_gc4653.a index 8abf893c8..1c68d0764 100644 Binary files a/middleware/v2/lib/libsns_gc4653.a and b/middleware/v2/lib/libsns_gc4653.a differ diff --git a/middleware/v2/lib/libsys.a b/middleware/v2/lib/libsys.a index 88fb18291..30da0372e 100644 Binary files a/middleware/v2/lib/libsys.a and b/middleware/v2/lib/libsys.a differ diff --git a/middleware/v2/lib/libsys.so b/middleware/v2/lib/libsys.so index 25055d06a..fc3d0a24f 100755 Binary files a/middleware/v2/lib/libsys.so and b/middleware/v2/lib/libsys.so differ diff --git a/middleware/v2/lib/libvdec.a b/middleware/v2/lib/libvdec.a index dfaa971c3..2b651c67b 100644 Binary files a/middleware/v2/lib/libvdec.a and b/middleware/v2/lib/libvdec.a differ diff --git a/middleware/v2/lib/libvenc.a b/middleware/v2/lib/libvenc.a index 5299c7524..2be5327a6 100644 Binary files a/middleware/v2/lib/libvenc.a and b/middleware/v2/lib/libvenc.a differ diff --git a/middleware/v2/lib/libvpu.a b/middleware/v2/lib/libvpu.a index 0dc6de03e..6a857f00f 100644 Binary files a/middleware/v2/lib/libvpu.a and b/middleware/v2/lib/libvpu.a differ diff --git a/osdrv/extdrv/wireless/aic8800/aic8800_fdrv/rwnx_tx.c b/osdrv/extdrv/wireless/aic8800/aic8800_fdrv/rwnx_tx.c index 7be91e061..fa03bae34 100644 --- a/osdrv/extdrv/wireless/aic8800/aic8800_fdrv/rwnx_tx.c +++ b/osdrv/extdrv/wireless/aic8800/aic8800_fdrv/rwnx_tx.c @@ -169,7 +169,8 @@ void rwnx_ps_bh_traffic_req(struct rwnx_hw *rwnx_hw, struct rwnx_sta *sta, // sta->mac_addr)) // return; if (!sta->ps.active) { - printk("sta %pM is not in Power Save mode", sta->mac_addr); + // dont flood my console + //printk("sta %pM is not in Power Save mode", sta->mac_addr); return; } #ifdef CREATE_TRACE_POINTS