treewide: move calibration data extraction function to library

[openwrt/openwrt.git] / target / linux / ramips / base-files / etc / hotplug.d / firmware / 10-rt2x00-eeprom

diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 7b98936ec3595d04522bb0552857ce12c1a2e7fc..ec70d86dac902cac11bf57ac68295e2dca3359b3 100644 (file)
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -1,23 +1,8 @@
 #!/bin/sh
 
-rt2x00_eeprom_die() {
-       echo "rt2x00 eeprom: " "$*"
-       exit 1
-}
-
-rt2x00_eeprom_extract() {
-       local part=$1
-       local offset=$(($2))
-       local count=$(($3))
-       local mtd
-
-       mtd=$(find_mtd_part $part)
-       [ -n "$mtd" ] || \
-               rt2x00_eeprom_die "no mtd device found for partition $part"
+[ -e /lib/firmware/$FIRMWARE ] && exit 0
 
-       dd if=$mtd of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \
-               rt2x00_eeprom_die "failed to extract from $mtd"
-}
+. /lib/functions/caldata.sh
 
 jboot_eeprom_extract() {
        local part=$1
@@ -26,29 +11,23 @@ jboot_eeprom_extract() {
 
        mtd=$(find_mtd_part $part)
        [ -n "$mtd" ] || \
-               rt2x00_eeprom_die "no mtd device found for partition $part"
+               caldata_die "no mtd device found for partition $part"
 
        jboot_config_read -i $mtd -o $offset -e /lib/firmware/$FIRMWARE  2>/dev/null || \
-               rt2x00_eeprom_die "failed to extract from $mtd"
+               caldata_die "failed to extract from $mtd"
 }
 
 rt2x00_eeprom_set_macaddr() {
        local macaddr=$1
 
        [ -n "$macaddr" ] || \
-               rt2x00_eeprom_die "invalid wlan mac address"
+               caldata_die "invalid wlan mac address"
 
        macaddr_2bin $macaddr | dd of=/lib/firmware/$FIRMWARE \
                                conv=notrunc oflag=seek_bytes bs=6 seek=4 count=1 2>/dev/null || \
-               rt2x00_eeprom_die "failed to write mac address to eeprom file"
+               caldata_die "failed to write mac address to eeprom file"
 }
 
-FW="/lib/firmware/$FIRMWARE"
-[ -e "$FW" ] && exit 0
-
-. /lib/functions.sh
-. /lib/functions/system.sh
-
 board=$(board_name)
 
 case "$FIRMWARE" in
@@ -68,11 +47,11 @@ case "$FIRMWARE" in
                ;;
        dovado,tiny-ac)
                wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR)
-               rt2x00_eeprom_extract "factory" 0x0 0x200
+               caldata_extract "factory" 0x0 0x200
                rt2x00_eeprom_set_macaddr $wifi_mac
                ;;
        *)
-               rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!"
+               caldata_die "Please define mtd-eeprom in $board DTS file!"
                ;;
        esac
        ;;