diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-08-09 17:45:13 +0200 |
---|---|---|
committer | Alexander Couzens <lynxis@fe80.eu> | 2019-08-14 12:36:37 +0200 |
commit | b133e466b08e25ea59be9108de5f262f7eff49a6 (patch) | |
tree | dbc48250081f63215bbaa430651fb1cf4ad03da4 /target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | |
parent | 75bfc393ba6cffd783e723d3115c25b70836c116 (diff) | |
download | upstream-b133e466b08e25ea59be9108de5f262f7eff49a6.tar.gz upstream-b133e466b08e25ea59be9108de5f262f7eff49a6.tar.bz2 upstream-b133e466b08e25ea59be9108de5f262f7eff49a6.zip |
treewide: convert WiFi caldata size and offset to hexadecimal
This changes size and offset set for WiFi caldata extraction and
MAC address adjustment to hexadecimal notation.
This will be much clearer for the reader when numbers are big, and
will also match the style used for mtd-cal-data in DTS files.
Since dd cannot deal with hexadecimal notation, one has to convert
back to decimal by simple $(($hexnum)).
Acked-by: Alexander Couzens <lynxis@fe80.eu>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata')
-rw-r--r-- | target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index a3d4770b32..2ba8de4783 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -7,8 +7,8 @@ ath10kcal_die() { ath10kcal_from_file() { local source=$1 - local offset=$2 - local count=$3 + local offset=$(($2)) + local count=$(($3)) dd if=$source of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \ ath10kcal_die "failed to extract calibration data from $source" @@ -16,8 +16,8 @@ ath10kcal_from_file() { ath10kcal_extract() { local part=$1 - local offset=$2 - local count=$3 + local offset=$(($2)) + local count=$(($3)) local mtd cal_size mtd=$(find_mtd_chardev $part) @@ -57,17 +57,17 @@ case "$FIRMWARE" in mr1750|\ mr1750v2|\ om5p-acv2) - ath10kcal_extract "ART" 20480 2116 + ath10kcal_extract "ART" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16) ;; archer-c25-v1|\ tl-wdr6500-v2) - ath10kcal_extract "art" 20480 2116 + ath10kcal_extract "art" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2) ;; archer-c7-v4|\ archer-c7-v5) - ath10kcal_extract "art" 20480 2116 + ath10kcal_extract "art" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1) ;; cf-e355ac-v1|\ @@ -81,60 +81,60 @@ case "$FIRMWARE" in oolite-v5.2-dev|\ sr3200|\ xd3200) - ath10kcal_extract "art" 20480 2116 + ath10kcal_extract "art" 0x5000 0x844 ;; dap-2695-a1) - ath10kcal_extract "radiocfg" 20480 2116 + ath10kcal_extract "radiocfg" 0x5000 0x844 ath10kcal_patch_mac $(mtd_get_mac_ascii bdcfg wlanmac_a) ;; dir-869-a1|\ qihoo-c301) - ath10kcal_extract "radiocfg" 20480 2116 + ath10kcal_extract "radiocfg" 0x5000 0x844 ath10kcal_patch_mac $(mtd_get_mac_ascii devdata wlan5mac) ;; dw33d) - ath10kcal_extract "art" 20480 2116 + ath10kcal_extract "art" 0x5000 0x844 ath10kcal_patch_mac $(mtd_get_mac_binary art 0x12) ;; epg5000|\ esr1750) - ath10kcal_extract "caldata" 20480 2116 + ath10kcal_extract "caldata" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1) ;; gl-ar750s|\ gl-ar750|\ tl-wpa8630) - ath10kcal_extract "art" 20480 2116 + ath10kcal_extract "art" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1) ;; koala) - ath10kcal_extract "art" 20480 2116 + ath10kcal_extract "art" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0xc) +0) ;; mc-mac1200r) - ath10kcal_extract "art" 20480 2116 + ath10kcal_extract "art" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -1) ;; r6100) - ath10kcal_extract "caldata" 20480 2116 + ath10kcal_extract "caldata" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) +2) ;; rb-952ui-5ac2nd|\ rb-wapg-5hact2hnd) - ath10kcal_from_file "/sys/firmware/routerboot/ext_wlan_data" 20480 2116 + ath10kcal_from_file "/sys/firmware/routerboot/ext_wlan_data" 0x5000 0x844 ;; re355|\ re450|\ tl-wr902ac-v1) - ath10kcal_extract "art" 20480 2116 + ath10kcal_extract "art" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2) ;; unifiac-lite|\ unifiac-pro) - ath10kcal_extract "EEPROM" 20480 2116 + ath10kcal_extract "EEPROM" 0x5000 0x844 ;; wi2a-ac200i) - ath10kcal_extract "ART" 20480 2116 + ath10kcal_extract "ART" 0x5000 0x844 ;; esac ;; @@ -142,26 +142,26 @@ case "$FIRMWARE" in case $board in archer-c5|\ archer-c7) - ath10kcal_extract "art" 20480 2116 + ath10kcal_extract "art" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2) ;; nbg6616|\ nbg6716) - ath10kcal_extract "RFdata" 20480 2116 + ath10kcal_extract "RFdata" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2) ;; om5p-ac) - ath10kcal_extract "ART" 20480 2116 + ath10kcal_extract "ART" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16) ;; rb-911g-5hpacd|\ rb-921gs-5hpacd-r2|\ rb-922uags-5hpacd|\ rb-962uigs-5hact2hnt) - ath10kcal_from_file "/sys/firmware/routerboot/ext_wlan_data" 20480 2116 + ath10kcal_from_file "/sys/firmware/routerboot/ext_wlan_data" 0x5000 0x844 ;; wlr8100) - ath10kcal_extract "art" 20480 2116 + ath10kcal_extract "art" 0x5000 0x844 ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1) ;; esac @@ -174,18 +174,18 @@ case "$FIRMWARE" in archer-c60-v1|\ cf-e355ac-v2|\ cf-e375ac) - ath10kcal_extract "art" 20480 12064 + ath10kcal_extract "art" 0x5000 0x2f20 ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ /lib/firmware/ath10k/QCA9888/hw2.0/board.bin ;; archer-c60-v2) - ath10kcal_extract "art" 20480 12064 + ath10kcal_extract "art" 0x5000 0x2f20 ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ /lib/firmware/ath10k/QCA9888/hw2.0/board.bin ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1) ;; cf-e385ac) - ath10kcal_extract "art" 20480 12064 + ath10kcal_extract "art" 0x5000 0x2f20 ;; esac ;; |