diff --git a/source/linux-5.10/drivers/net/wireless/aic8800/aic8800_bsp/aic_bsp_driver.h b/source/linux-5.10/drivers/net/wireless/aic8800/aic8800_bsp/aic_bsp_driver.h index ebb56887e..93c5076a7 100644 --- a/source/linux-5.10/drivers/net/wireless/aic8800/aic8800_bsp/aic_bsp_driver.h +++ b/source/linux-5.10/drivers/net/wireless/aic8800/aic8800_bsp/aic_bsp_driver.h @@ -46,12 +46,17 @@ extern int aicwf_dbg_level_bsp; #define AICWF_LOG "AICWFDBG(" -#define AICWFDBG(level, args, arg...) \ +//#define AICWFDBG(level, args, arg...) \ do { \ if (aicwf_dbg_level_bsp & level) { \ printk(AICWF_LOG#level")\t" args, ##arg); \ } \ } while (0) +#define AICWFDBG(level, args, arg...) \ +do { \ + if (aicwf_dbg_level_bsp & level) { \ + } \ +} while (0) #define RWNX_DBG(fmt, ...) \ do { \ diff --git a/source/linux-5.10/drivers/net/wireless/aic8800/aic8800_fdrv/aicwf_debug.h b/source/linux-5.10/drivers/net/wireless/aic8800/aic8800_fdrv/aicwf_debug.h index 83a2fb83a..029846578 100644 --- a/source/linux-5.10/drivers/net/wireless/aic8800/aic8800_fdrv/aicwf_debug.h +++ b/source/linux-5.10/drivers/net/wireless/aic8800/aic8800_fdrv/aicwf_debug.h @@ -20,12 +20,17 @@ void rwnx_data_dump(char* tag, void* data, unsigned long len); #define AICWF_LOG "AICWFDBG(" -#define AICWFDBG(level, args, arg...) \ +//#define AICWFDBG(level, args, arg...) \ do { \ if (aicwf_dbg_level & level) { \ printk(AICWF_LOG#level")\t" args, ##arg); \ } \ } while (0) +#define AICWFDBG(level, args, arg...) \ +do { \ + if (aicwf_dbg_level & level) { \ + } \ +} while (0) #define RWNX_DBG(fmt, ...) \ do { \ diff --git a/target/d211/demo128_nand/board.dts b/target/d211/demo128_nand/board.dts index b346de4f4..512a7768b 100644 --- a/target/d211/demo128_nand/board.dts +++ b/target/d211/demo128_nand/board.dts @@ -193,20 +193,20 @@ u-boot,dm-pre-reloc; status = "okay"; }; - /* + rfkill_bt { compatible = "rfkill-gpio"; rfkill-name = "bluetooth"; rfkill-type = <2>; - reset-gpios = <&gpio_d 3 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio_c 6 GPIO_ACTIVE_HIGH>; status = "okay"; }; - + /* rfkill_wlan { compatible = "rfkill-gpio"; rfkill-name = "wlan"; rfkill-type = <1>; - reset-gpios = <&gpio_d 1 GPIO_ACTIVE_HIGH>; + //reset-gpios = <&gpio_c 6 GPIO_ACTIVE_HIGH>; status = "okay"; }; */ @@ -451,7 +451,7 @@ pinctrl-names = "default"; pinctrl-0 = <&sdmc1_pins>; max-frequency= <40000000>; - power-gpios = <&gpio_c 6 GPIO_ACTIVE_HIGH>; + //power-gpios = <&gpio_c 6 GPIO_ACTIVE_HIGH>; bus-width = <4>; no-mmc; no-sd; diff --git a/target/d211/demo128_nand/rootfs_overlay/etc/init.d/S40bluetooth b/target/d211/demo128_nand/rootfs_overlay/etc/init.d/S40bluetooth new file mode 100755 index 000000000..d5f5f14d0 --- /dev/null +++ b/target/d211/demo128_nand/rootfs_overlay/etc/init.d/S40bluetooth @@ -0,0 +1,102 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +HCI_DEV=hci0 +UART_DEV=/dev/ttyS2 +HCIATTACH_BIN=/usr/bin/hciattach +HCIATTACH_ARGS="-s 1500000 ${UART_DEV} any 1500000 flow nosleep" +HCI_TOOL=/usr/bin/bt-hci-tool +BTGATT_BIN=/usr/bin/btgatt-server +BTGATT_ARGS="-i ${HCI_DEV} -s low -t public" +BT_LOCAL_NAME="DSL-ETAG" +HCI_WAIT_TIMEOUT=10 + +ATTACH_PIDFILE=/var/run/hciattach.pid +BTGATT_PIDFILE=/var/run/btgatt-server.pid + +wait_for_hci() +{ + "${HCI_TOOL}" wait "${HCI_DEV}" "${HCI_WAIT_TIMEOUT}" +} + +bring_hci_up() +{ + "${HCI_TOOL}" up "${HCI_DEV}" +} + +set_hci_name() +{ + "${HCI_TOOL}" name "${HCI_DEV}" "${BT_LOCAL_NAME}" +} + +start_bt() +{ + echo "[BT] Init AIC8800..." + insmod /lib/modules/5.10.44/kernel/drivers/net/wireless/aic8800/aic8800_btlpm/aic8800_btlpm.ko + sleep 1 + + killall hciattach 2>/dev/null + killall btgatt-server 2>/dev/null + rm -f "${ATTACH_PIDFILE}" "${BTGATT_PIDFILE}" + + "${HCIATTACH_BIN}" ${HCIATTACH_ARGS} & + echo $! > "${ATTACH_PIDFILE}" + + if ! wait_for_hci; then + echo "[BT] ERROR: ${HCI_DEV} not ready" + return 1 + fi + + if ! bring_hci_up; then + echo "[BT] ERROR: failed to bring ${HCI_DEV} up" + return 1 + fi + + if ! set_hci_name; then + echo "[BT] WARN: failed to set controller local name" + fi + + echo "[BT] HCI ready" + + "${BTGATT_BIN}" ${BTGATT_ARGS} >/dev/null 2>&1 & + echo $! > "${BTGATT_PIDFILE}" + echo "[BT] GATT server started" +} + +stop_bt() +{ + if [ -f "${BTGATT_PIDFILE}" ]; then + kill "$(cat "${BTGATT_PIDFILE}")" 2>/dev/null + rm -f "${BTGATT_PIDFILE}" + else + killall btgatt-server 2>/dev/null + fi + + if [ -f "${ATTACH_PIDFILE}" ]; then + kill "$(cat "${ATTACH_PIDFILE}")" 2>/dev/null + rm -f "${ATTACH_PIDFILE}" + else + killall hciattach 2>/dev/null + fi +} + +case "$1" in + start) + start_bt + ;; + stop) + stop_bt + ;; + restart) + stop_bt + sleep 1 + start_bt + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +exit $? diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libaic_mem.so b/target/d211/demo128_nand/rootfs_overlay/lib/libaic_mem.so new file mode 100755 index 000000000..02534970e Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libaic_mem.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libcurl.so.4 b/target/d211/demo128_nand/rootfs_overlay/lib/libcurl.so.4 new file mode 100755 index 000000000..ed086571a Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libcurl.so.4 differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/liblogo_fdt.so b/target/d211/demo128_nand/rootfs_overlay/lib/liblogo_fdt.so new file mode 100755 index 000000000..256d9d87a Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/liblogo_fdt.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmedia_audio_player.so b/target/d211/demo128_nand/rootfs_overlay/lib/libmedia_audio_player.so new file mode 100755 index 000000000..3478decd0 Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmedia_audio_player.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmedia_player.so b/target/d211/demo128_nand/rootfs_overlay/lib/libmedia_player.so new file mode 100755 index 000000000..80f633e46 Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmedia_player.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmedia_recorder.so b/target/d211/demo128_nand/rootfs_overlay/lib/libmedia_recorder.so new file mode 100755 index 000000000..eb7bfe687 Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmedia_recorder.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmm_base.so b/target/d211/demo128_nand/rootfs_overlay/lib/libmm_base.so new file mode 100755 index 000000000..afed4b3b7 Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmm_base.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmm_component.so b/target/d211/demo128_nand/rootfs_overlay/lib/libmm_component.so new file mode 100755 index 000000000..ce3543996 Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmm_component.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmosquitto.so.1 b/target/d211/demo128_nand/rootfs_overlay/lib/libmosquitto.so.1 new file mode 100755 index 000000000..caad93c3d Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmosquitto.so.1 differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_audio_decoder.so b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_audio_decoder.so new file mode 100755 index 000000000..ef2d8f0dd Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_audio_decoder.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_base.so b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_base.so new file mode 100755 index 000000000..d7e60ca95 Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_base.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_decoder.so b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_decoder.so new file mode 100755 index 000000000..ce57a9757 Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_decoder.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_encoder.so b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_encoder.so new file mode 100755 index 000000000..106e48aa3 Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_encoder.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_ge.so b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_ge.so new file mode 100755 index 000000000..0f31470a3 Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_ge.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_ve.so b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_ve.so new file mode 100755 index 000000000..6caaae38d Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/lib/libmpp_ve.so differ diff --git a/target/d211/demo128_nand/rootfs_overlay/usr/bin/btgatt-server b/target/d211/demo128_nand/rootfs_overlay/usr/bin/btgatt-server new file mode 100755 index 000000000..ef7fef8c5 Binary files /dev/null and b/target/d211/demo128_nand/rootfs_overlay/usr/bin/btgatt-server differ diff --git a/target/d211/demo128_nand/rootfs_overlay/usr/bin/rtk_hciattach b/target/d211/demo128_nand/rootfs_overlay/usr/bin/rtk_hciattach deleted file mode 100755 index 921ac10eb..000000000 Binary files a/target/d211/demo128_nand/rootfs_overlay/usr/bin/rtk_hciattach and /dev/null differ