diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-11-06 21:18:42 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-11-06 21:18:42 +0000 |
| commit | 4953605453a7f7f1da8c70c4c12a4b557cfc2c24 (patch) | |
| tree | 0d1bd64cb09f75bf0c7aca3b17820738965a0f77 /xpp/utils/xpp_fxloader | |
| parent | 1148b31f800c4a280c9a26592a18d4478afc1a82 (diff) | |
r1557@boole: tzafrir | 2006-11-06 20:12:16 +0200
Merging xpp driver release 1.2 (rev. 2569), originally team/tzafrir/xpp_1.2
* Should build well. Almost final.
* genzaptelconf: Also work when zap_autoreg=0
* README.Astribank updated for rev. 1.2.
* xpp/utils/Makefile: Use $< with cc -c
* Get xpp/utils configuration from autoconf (without changesin top dir)
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1563 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/utils/xpp_fxloader')
| -rw-r--r-- | xpp/utils/xpp_fxloader | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xpp/utils/xpp_fxloader b/xpp/utils/xpp_fxloader index f584266..8c54370 100644 --- a/xpp/utils/xpp_fxloader +++ b/xpp/utils/xpp_fxloader @@ -29,12 +29,8 @@ # # BUS!="usb", ACTION!="add", GOTO="zaptel_usb_add_end" # -# SYSFS{idVendor}=="04b4", SYSFS{idProduct}=="8613", \ -# RUN+="/etc/hotplug/usb/xpp_fxloader udev $sysfs{idVendor}/$sysfs{idProduct}/" -# SYSFS{idVendor}=="e4e4", SYSFS{idProduct}=="1130", \ -# RUN+="/etc/hotplug/usb/xpp_fxloader udev $sysfs{idVendor}/$sysfs{idProduct}/" -# SYSFS{idVendor}=="e4e4", SYSFS{idProduct}=="1131", \ -# RUN+="/etc/hotplug/usb/xpp_fxloader udev $sysfs{idVendor}/$sysfs{idProduct}/" +# SYSFS{idVendor}=="e4e4", SYSFS{idProduct}=="11[345][01]", \ +# RUN+="/etc/hotplug/usb/xpp_fxloader udev $sysfs{idVendor}/$sysfs{idProduct}/$sysfs{bcdDevice}" # # LABEL="zaptel_usb_add_end" # @@ -151,9 +147,13 @@ xppdetect|load|usb) load_fw 04b4 8613 USB_8613.hex load_fw e4e4 1130 USB_1130.hex + load_fw e4e4 1140 USB_1140.hex + load_fw e4e4 1150 USB_1150.hex if [ "$1" != 'usb' ] then load_fpga e4e4 1131 FPGA_FXS.hex + load_fpga e4e4 1141 FPGA_1141.hex + load_fpga e4e4 1151 FPGA_1151.hex fi sleep 3 # Let it stabilize @@ -182,12 +182,12 @@ then $LOGGER "Trying to find what to do for product $PRODUCT, device $DEVICE" prod_id=`echo "$PRODUCT" | cut -d/ -f2` case "$PRODUCT" in - 4b4/8613/*|e4e4/1130/*|e4e4/1140/*) + 4b4/8613/*|e4e4/11[345]0/*) FIRM_USB="$FIRMWARE_DIR/USB_$prod_id.hex" $LOGGER "Loading firmware '$FIRM_USB' into '$DEVICE'" do_fxload -D "$DEVICE" -I "$FIRM_USB" ;; - e4e4/1131/*|e4e4/1141/*) + e4e4/11[345]1/*) if [ "$prod_id" = 1131 ]; then FIRM_FPGA="$FIRMWARE_DIR/FPGA_FXS.hex" # Legacy else |