ar71xx: fix WNDR3x00 model detection

[openwrt.git] / target / linux / ar71xx / base-files / lib / ar71xx.sh

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index ca0799d..bbd84d1 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -6,18 +6,22 @@
 AR71XX_BOARD_NAME=
 AR71XX_MODEL=
 
-ar71xx_get_mem_total() {
-       $(awk '/MemTotal:/ {print($2)}' /proc/meminfo)
-}
+ar71xx_get_mtd_offset_size_format() {
+       local mtd="$1"
+       local offset="$2"
+       local size="$3"
+       local format="$4"
+       local dev
 
-ar71xx_get_mtd_part_magic() {
-       local part="$1"
-       local mtd
+       dev=$(find_mtd_part $mtd)
+       [ -z "$dev" ] && return
 
-       mtd=$(find_mtd_part $part)
-       [ -z "$mtd" ] && return
+       dd if=$dev bs=1 skip=$offset count=$size 2>/dev/null | hexdump -v -e "1/1 \"$format\""
+}
 
-       dd if=$mtd bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+ar71xx_get_mtd_part_magic() {
+       local mtd="$1"
+       ar71xx_get_mtd_offset_size_format "$mtd" 0 4 %02x
 }
 
 wndr3700_board_detect() {
@@ -33,13 +37,12 @@ wndr3700_board_detect() {
                machine="NETGEAR WNDR3700"
                ;;
        "33373031")
-               local mt
-
-               mt=$(ar71xx_get_mem_total)
-               if [ "$mt" -lt "65536" ]; then
+               local model
+               model=$(ar71xx_get_mtd_offset_size_format art 56 10 %c)
+               if [ -z "$model" ] || [ "$model" = $'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff' ]; then
                        machine="NETGEAR WNDR3700v2"
                else
-                       machine="NETGEAR WNDR3800"
+                       machine="NETGEAR $model"
                fi
                ;;
        esac
@@ -50,7 +53,6 @@ wndr3700_board_detect() {
 
 tplink_get_hwid() {
        local part
-       local hwid
 
        part=$(find_mtd_part firmware)
        [ -z "$part" ] && return 1
@@ -58,6 +60,54 @@ tplink_get_hwid() {
        dd if=$part bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
 }
 
+tplink_board_detect() {
+       local model="$1"
+       local hwid
+       local hwver
+
+       hwid=$(tplink_get_hwid)
+       hwver=${hwid:6:2}
+       hwver="v${hwver#0}"
+
+       case "$hwid" in
+       "070300"*)
+               model="TP-Link TL-WR703N"
+               ;;
+       "074000"*)
+               model="TP-Link TL-WR740N/ND"
+               ;;
+       "074100"*)
+               model="TP-Link TL-WR741N/ND"
+               ;;
+       "074300"*)
+               model="TP-Link TL-WR743N/ND"
+               ;;
+       "084100"*)
+               model="TP-Link TL-WR841N/ND"
+               ;;
+       "090100"*)
+               model="TP-Link TL-WA901N/ND"
+               ;;
+       "094100"*)
+               model="TP-Link TL-WR941N/ND"
+               ;;
+       "104300"*)
+               model="TP-Link TL-WR1043N/ND"
+               ;;
+       "322000"*)
+               model="TP-Link TL-MR3220"
+               ;;
+       "342000"*)
+               model="TP-Link TL-MR3420"
+               ;;
+       *)
+               hwver=""
+               ;;
+       esac
+
+       AR71XX_MODEL="$model $hwver"
+}
+
 ar71xx_board_detect() {
        local machine
        local name
@@ -253,6 +303,12 @@ ar71xx_board_detect() {
                ;;
        esac
 
+       case "$machine" in
+       *TL-WR* | *TL-WA* | *TL-MR*)
+               tplink_board_detect "$machine"
+               ;;
+       esac
+
        [ -z "$name" ] && name="unknown"
 
        [ -z "$AR71XX_BOARD_NAME" ] && AR71XX_BOARD_NAME="$name"