aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/atm/ueagle-atm.c
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2012-07-25 16:32:50 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-15 18:17:40 -0400
commit47282502933e94a2e443fab36c412191fc3ed6ce (patch)
treeb566e97d906a75a97451ed7bcf2ed7d951ee6f41 /drivers/usb/atm/ueagle-atm.c
parent595c8970064275d1eb59b8df5c871ccda2f2bc88 (diff)
USB: atm: ueagle-atm: Declare MODULE_FIRMWARE usage
Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Cc: Stanislaw Gruszka <stf_xl@wp.pl> Acked-by: Matthieu Castet <castet.matthieu@free.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/atm/ueagle-atm.c')
-rw-r--r--drivers/usb/atm/ueagle-atm.c79
1 files changed, 66 insertions, 13 deletions
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index d7e422dc0ef7..e1f8b2c973fe 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -307,6 +307,34 @@ enum {
307#define FW_GET_BYTE(p) (*((__u8 *) (p))) 307#define FW_GET_BYTE(p) (*((__u8 *) (p)))
308 308
309#define FW_DIR "ueagle-atm/" 309#define FW_DIR "ueagle-atm/"
310#define EAGLE_FIRMWARE FW_DIR "eagle.fw"
311#define ADI930_FIRMWARE FW_DIR "adi930.fw"
312#define EAGLE_I_FIRMWARE FW_DIR "eagleI.fw"
313#define EAGLE_II_FIRMWARE FW_DIR "eagleII.fw"
314#define EAGLE_III_FIRMWARE FW_DIR "eagleIII.fw"
315#define EAGLE_IV_FIRMWARE FW_DIR "eagleIV.fw"
316
317#define DSP4I_FIRMWARE FW_DIR "DSP4i.bin"
318#define DSP4P_FIRMWARE FW_DIR "DSP4p.bin"
319#define DSP9I_FIRMWARE FW_DIR "DSP9i.bin"
320#define DSP9P_FIRMWARE FW_DIR "DSP9p.bin"
321#define DSPEI_FIRMWARE FW_DIR "DSPei.bin"
322#define DSPEP_FIRMWARE FW_DIR "DSPep.bin"
323#define FPGA930_FIRMWARE FW_DIR "930-fpga.bin"
324
325#define CMV4P_FIRMWARE FW_DIR "CMV4p.bin"
326#define CMV4PV2_FIRMWARE FW_DIR "CMV4p.bin.v2"
327#define CMV4I_FIRMWARE FW_DIR "CMV4i.bin"
328#define CMV4IV2_FIRMWARE FW_DIR "CMV4i.bin.v2"
329#define CMV9P_FIRMWARE FW_DIR "CMV9p.bin"
330#define CMV9PV2_FIRMWARE FW_DIR "CMV9p.bin.v2"
331#define CMV9I_FIRMWARE FW_DIR "CMV9i.bin"
332#define CMV9IV2_FIRMWARE FW_DIR "CMV9i.bin.v2"
333#define CMVEP_FIRMWARE FW_DIR "CMVep.bin"
334#define CMVEPV2_FIRMWARE FW_DIR "CMVep.bin.v2"
335#define CMVEI_FIRMWARE FW_DIR "CMVei.bin"
336#define CMVEIV2_FIRMWARE FW_DIR "CMVei.bin.v2"
337
310#define UEA_FW_NAME_MAX 30 338#define UEA_FW_NAME_MAX 30
311#define NB_MODEM 4 339#define NB_MODEM 4
312 340
@@ -694,26 +722,26 @@ err:
694static int uea_load_firmware(struct usb_device *usb, unsigned int ver) 722static int uea_load_firmware(struct usb_device *usb, unsigned int ver)
695{ 723{
696 int ret; 724 int ret;
697 char *fw_name = FW_DIR "eagle.fw"; 725 char *fw_name = EAGLE_FIRMWARE;
698 726
699 uea_enters(usb); 727 uea_enters(usb);
700 uea_info(usb, "pre-firmware device, uploading firmware\n"); 728 uea_info(usb, "pre-firmware device, uploading firmware\n");
701 729
702 switch (ver) { 730 switch (ver) {
703 case ADI930: 731 case ADI930:
704 fw_name = FW_DIR "adi930.fw"; 732 fw_name = ADI930_FIRMWARE;
705 break; 733 break;
706 case EAGLE_I: 734 case EAGLE_I:
707 fw_name = FW_DIR "eagleI.fw"; 735 fw_name = EAGLE_I_FIRMWARE;
708 break; 736 break;
709 case EAGLE_II: 737 case EAGLE_II:
710 fw_name = FW_DIR "eagleII.fw"; 738 fw_name = EAGLE_II_FIRMWARE;
711 break; 739 break;
712 case EAGLE_III: 740 case EAGLE_III:
713 fw_name = FW_DIR "eagleIII.fw"; 741 fw_name = EAGLE_III_FIRMWARE;
714 break; 742 break;
715 case EAGLE_IV: 743 case EAGLE_IV:
716 fw_name = FW_DIR "eagleIV.fw"; 744 fw_name = EAGLE_IV_FIRMWARE;
717 break; 745 break;
718 } 746 }
719 747
@@ -869,19 +897,19 @@ static int request_dsp(struct uea_softc *sc)
869 897
870 if (UEA_CHIP_VERSION(sc) == EAGLE_IV) { 898 if (UEA_CHIP_VERSION(sc) == EAGLE_IV) {
871 if (IS_ISDN(sc)) 899 if (IS_ISDN(sc))
872 dsp_name = FW_DIR "DSP4i.bin"; 900 dsp_name = DSP4I_FIRMWARE;
873 else 901 else
874 dsp_name = FW_DIR "DSP4p.bin"; 902 dsp_name = DSP4P_FIRMWARE;
875 } else if (UEA_CHIP_VERSION(sc) == ADI930) { 903 } else if (UEA_CHIP_VERSION(sc) == ADI930) {
876 if (IS_ISDN(sc)) 904 if (IS_ISDN(sc))
877 dsp_name = FW_DIR "DSP9i.bin"; 905 dsp_name = DSP9I_FIRMWARE;
878 else 906 else
879 dsp_name = FW_DIR "DSP9p.bin"; 907 dsp_name = DSP9P_FIRMWARE;
880 } else { 908 } else {
881 if (IS_ISDN(sc)) 909 if (IS_ISDN(sc))
882 dsp_name = FW_DIR "DSPei.bin"; 910 dsp_name = DSPEI_FIRMWARE;
883 else 911 else
884 dsp_name = FW_DIR "DSPep.bin"; 912 dsp_name = DSPEP_FIRMWARE;
885 } 913 }
886 914
887 ret = request_firmware(&sc->dsp_firm, dsp_name, &sc->usb_dev->dev); 915 ret = request_firmware(&sc->dsp_firm, dsp_name, &sc->usb_dev->dev);
@@ -1925,7 +1953,7 @@ static int load_XILINX_firmware(struct uea_softc *sc)
1925 int ret, size, u, ln; 1953 int ret, size, u, ln;
1926 const u8 *pfw; 1954 const u8 *pfw;
1927 u8 value; 1955 u8 value;
1928 char *fw_name = FW_DIR "930-fpga.bin"; 1956 char *fw_name = FPGA930_FIRMWARE;
1929 1957
1930 uea_enters(INS_TO_USBDEV(sc)); 1958 uea_enters(INS_TO_USBDEV(sc));
1931 1959
@@ -2753,3 +2781,28 @@ module_usb_driver(uea_driver);
2753MODULE_AUTHOR("Damien Bergamini/Matthieu Castet/Stanislaw W. Gruszka"); 2781MODULE_AUTHOR("Damien Bergamini/Matthieu Castet/Stanislaw W. Gruszka");
2754MODULE_DESCRIPTION("ADI 930/Eagle USB ADSL Modem driver"); 2782MODULE_DESCRIPTION("ADI 930/Eagle USB ADSL Modem driver");
2755MODULE_LICENSE("Dual BSD/GPL"); 2783MODULE_LICENSE("Dual BSD/GPL");
2784MODULE_FIRMWARE(EAGLE_FIRMWARE);
2785MODULE_FIRMWARE(ADI930_FIRMWARE);
2786MODULE_FIRMWARE(EAGLE_I_FIRMWARE);
2787MODULE_FIRMWARE(EAGLE_II_FIRMWARE);
2788MODULE_FIRMWARE(EAGLE_III_FIRMWARE);
2789MODULE_FIRMWARE(EAGLE_IV_FIRMWARE);
2790MODULE_FIRMWARE(DSP4I_FIRMWARE);
2791MODULE_FIRMWARE(DSP4P_FIRMWARE);
2792MODULE_FIRMWARE(DSP9I_FIRMWARE);
2793MODULE_FIRMWARE(DSP9P_FIRMWARE);
2794MODULE_FIRMWARE(DSPEI_FIRMWARE);
2795MODULE_FIRMWARE(DSPEP_FIRMWARE);
2796MODULE_FIRMWARE(FPGA930_FIRMWARE);
2797MODULE_FIRMWARE(CMV4P_FIRMWARE);
2798MODULE_FIRMWARE(CMV4PV2_FIRMWARE);
2799MODULE_FIRMWARE(CMV4I_FIRMWARE);
2800MODULE_FIRMWARE(CMV4IV2_FIRMWARE);
2801MODULE_FIRMWARE(CMV9P_FIRMWARE);
2802MODULE_FIRMWARE(CMV9PV2_FIRMWARE);
2803MODULE_FIRMWARE(CMV9I_FIRMWARE);
2804MODULE_FIRMWARE(CMV9IV2_FIRMWARE);
2805MODULE_FIRMWARE(CMVEP_FIRMWARE);
2806MODULE_FIRMWARE(CMVEPV2_FIRMWARE);
2807MODULE_FIRMWARE(CMVEI_FIRMWARE);
2808MODULE_FIRMWARE(CMVEIV2_FIRMWARE);