merge of '2d05a6d4c8545b71cddf93011420891bf70fb47e'

     and 'a5a7ee9814548b1e054d96cea845556c4b5c39e9'

diff --git a/packages/misc-binary-only/prism-firmware.bb b/packages/misc-binary-only/prism-firmware.bb
index fefdb0a..903c55e 100644 (file)
--- a/packages/misc-binary-only/prism-firmware.bb
+++ b/packages/misc-binary-only/prism-firmware.bb
@@ -5,22 +5,24 @@ RDEPENDS = "hostap-utils"
 RREPLACES = "prism3-firmware prism3-support"
 RCONFLICTS = "prism3-firmware prism3-support"
 PACKAGE_ARCH = "all"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://www.red-bean.com/~proski/firmware/Latest-prism.tar.bz2 \
+SRC_URI = "http://www.red-bean.com/~proski/firmware/primary.tar.bz2 \
+           http://www.red-bean.com/~proski/firmware/1.7.4.tar.bz2 \
            file://prism-fw.sh \
           file://hostap.rules"
 
-S = "${WORKDIR}/Latest-prism/"
-
 do_install() {
        install -d ${D}${base_libdir}/firmware/
        install -d ${D}${base_libdir}/udev/
        install -d ${D}${sysconfdir}/pcmcia/
        install -d ${D}${sysconfdir}/udev/rules.d/
 
-       install -m 0644 primary-RAM/*.hex ${D}${base_libdir}/firmware/
-       install -m 0644 secondary-RAM/rf010804.hex ${D}${base_libdir}/firmware/
+       install -m 0644 ${WORKDIR}/primary/af010104.hex ${D}${base_libdir}/firmware/
+       install -m 0644 ${WORKDIR}/primary/ak010104.hex ${D}${base_libdir}/firmware/
+       install -m 0644 ${WORKDIR}/primary/pm010102.hex ${D}${base_libdir}/firmware/
+
+       install -m 0644 ${WORKDIR}/1.7.4/rf010704.hex ${D}${base_libdir}/firmware/
 
        install -m 0755 ${WORKDIR}/prism-fw.sh ${D}${base_libdir}/udev/
        install -m 0644 ${WORKDIR}/hostap.rules ${D}${sysconfdir}/udev/rules.d/

diff --git a/packages/misc-binary-only/prism-firmware/prism-fw.sh b/packages/misc-binary-only/prism-firmware/prism-fw.sh
index 96a2457..619f612 100644 (file)
--- a/packages/misc-binary-only/prism-firmware/prism-fw.sh
+++ b/packages/misc-binary-only/prism-firmware/prism-fw.sh
@@ -4,7 +4,7 @@ CARD_ID=`/usr/sbin/hostap_diag $INTERFACE|grep NICID|awk '{print $2}'|sed -e 's/
 
 # 801d cards lack even Primary firmware so we cannot use hostap_diag
 PRI=/lib/firmware/pm010102.hex 
-STA=/lib/firmware/rf010804.hex
+STA=/lib/firmware/rf010704.hex
 
 if [ $CARD_ID = '800c' ] || [ $CARD_ID = '8013' ] || [ $CARD_ID = '8017' ] || \
    [ $CARD_ID = '801b' ] || [ $CARD_ID = '8022' ] || [ $CARD_ID = '8023' ] ; then