@@ -17,6 +17,22 @@ NO_EXPORT=1
LOAD_STATE=1
LIST_SEP=" "
+# xor multiple hex values of the same length
+xor() {
+ local val
+ local ret="0x$1"
+ local retlen=${#1}
+
+ shift
+ while [ -n "$1" ]; do
+ val="0x$1"
+ ret=$((ret ^ val))
+ shift
+ done
+
+ printf "%0${retlen}x" "$ret"
+}
+
append() {
local var="$1"
local value="$2"
@@ -42,21 +42,6 @@ ath9k_eeprom_extract_reverse() {
printf "%b" "$caldata" > /lib/firmware/$FIRMWARE
}
-xor() {
- local val
- local ret="0x$1"
- local retlen=${#1}
-
- shift
- while [ -n "$1" ]; do
- val="0x$1"
- ret=$((ret ^ val))
- shift
- done
-
- printf "%0${retlen}x" "$ret"
-}
-
ath9k_patch_fw_mac() {
local mac=$1
local mac_offset=$(($2))
@@ -1,23 +1,8 @@
#!/bin/sh
+. /lib/functions.sh
. /lib/functions/k2t.sh
-# xor multiple hex values of the same length
-xor() {
- local val
- local ret="0x$1"
- local retlen=${#1}
-
- shift
- while [ -n "$1" ]; do
- val="0x$1"
- ret=$((ret ^ val))
- shift
- done
-
- printf "%0${retlen}x" "$ret"
-}
-
ath10kcal_die() {
echo "ath10cal: " "$*"
exit 1
@@ -79,7 +64,6 @@ ath10kcal_patch_mac_crc() {
[ -e /lib/firmware/$FIRMWARE ] && exit 0
-. /lib/functions.sh
. /lib/functions/system.sh
board=$(board_name)
@@ -1,20 +1,6 @@
#!/bin/sh
-# xor multiple hex values of the same length
-xor() {
- local val
- local ret="0x$1"
- local retlen=${#1}
-
- shift
- while [ -n "$1" ]; do
- val="0x$1"
- ret=$((ret ^ val))
- shift
- done
-
- printf "%0${retlen}x" "$ret"
-}
+. /lib/functions.sh
ath10kcal_die() {
echo "ath10cal: " "$*"
@@ -88,7 +74,6 @@ ath10kcal_is_caldata_valid() {
[ -e /lib/firmware/$FIRMWARE ] && exit 0
-. /lib/functions.sh
. /lib/functions/system.sh
board=$(board_name)
@@ -1,20 +1,6 @@
#!/bin/sh
-# xor multiple hex values of the same length
-xor() {
- local val
- local ret="0x$1"
- local retlen=${#1}
-
- shift
- while [ -n "$1" ]; do
- val="0x$1"
- ret=$((ret ^ val))
- shift
- done
-
- printf "%0${retlen}x" "$ret"
-}
+. /lib/functions.sh
ath10kcal_die() {
echo "ath10cal: " "$*"
@@ -71,7 +57,6 @@ ath10kcal_patch_mac_crc() {
[ -e /lib/firmware/$FIRMWARE ] && exit 0
-. /lib/functions.sh
. /lib/functions/system.sh
board=$(board_name)
@@ -7,22 +7,6 @@
. /lib/functions/system.sh
. /lib/upgrade/nand.sh
-# xor multiple hex values of the same length
-xor() {
- local val
- local ret="0x$1"
- local retlen=${#1}
-
- shift
- while [ -n "$1" ]; do
- val="0x$1"
- ret=$((ret ^ val))
- shift
- done
-
- printf "%0${retlen}x" "$ret"
-}
-
ath9k_eeprom_die() {
echo "ath9k eeprom: $*"
exit 1
The xor() function is defined in each of the caldata extraction scripts for several targets. Move it to functions.sh to reduce duplicate code. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- package/base-files/files/lib/functions.sh | 16 ++++++++++++++++ .../etc/hotplug.d/firmware/10-ath9k-eeprom | 15 --------------- .../etc/hotplug.d/firmware/11-ath10k-caldata | 18 +----------------- .../etc/hotplug.d/firmware/11-ath10k-caldata | 17 +---------------- .../etc/hotplug.d/firmware/11-ath10k-caldata | 17 +---------------- .../etc/hotplug.d/firmware/12-ath9k-eeprom | 16 ---------------- 6 files changed, 19 insertions(+), 80 deletions(-)