From 09d05d5c1ab0a8bf0e0c7c1e0fb0c919d1da7832 Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Wed, 5 Mar 2014 15:54:16 -0600 Subject: udev: mtocgd,mtocgd2: remove default serial modem link, remove unused modems remove default serial modem link mtocgd does not support socket modem, so remove old radios --- multitech/recipes/udev/udev-165/mtocgd/corecdp.rules | 20 -------------------- .../recipes/udev/udev-165/mtocgd2/corecdp.rules | 4 ---- multitech/recipes/udev/udev_165.bbappend | 2 +- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/multitech/recipes/udev/udev-165/mtocgd/corecdp.rules b/multitech/recipes/udev/udev-165/mtocgd/corecdp.rules index 196102b..f40c596 100644 --- a/multitech/recipes/udev/udev-165/mtocgd/corecdp.rules +++ b/multitech/recipes/udev/udev-165/mtocgd/corecdp.rules @@ -2,10 +2,6 @@ ACTION=="remove", GOTO="corecdp_end" SUBSYSTEM!="tty", GOTO="corecdp_end" KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*|ttyS*", GOTO="corecdp_end" -# use serial port by default, allow USB radios to overwrite link -KERNEL=="ttyS1", SYMLINK+="modem0", OPTIONS+="link_priority=-1" -KERNEL=="ttyS1", SYMLINK+="modem_at0", OPTIONS+="link_priority=-1" - SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}" ENV{ID_IFACE}=="", GOTO="corecdp_end" @@ -23,16 +19,6 @@ ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="00", SYMLINK+ ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="01", SYMLINK+="modem1" ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem2" ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem3" -# H4 -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="00", SYMLINK+="modem0" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="01", SYMLINK+="modem1" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="02", SYMLINK+="modem2" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem3" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem4" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem5" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="06", SYMLINK+="modem6" -# EV2 -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", SYMLINK+="modem$env{ID_PORT}" # AT Command ports # H5: ttyACM0, ttyACM3 @@ -41,12 +27,6 @@ ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+ # EV3: ttyUSB2, ttyUSB3 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem_at0" ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem_at1" -# H4: ttyUSB3, ttyUSB4, ttyUSB5 -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem_at0" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem_at1" -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem_at2" -# EV2: ttyUSB0 -ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", ENV{ID_PORT}=="0", SYMLINK+="modem_at0" # mtocgd: bluetooth on exar chip (ACM0, iface 0) ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="00", SYMLINK+="bt" diff --git a/multitech/recipes/udev/udev-165/mtocgd2/corecdp.rules b/multitech/recipes/udev/udev-165/mtocgd2/corecdp.rules index 9677908..802754d 100644 --- a/multitech/recipes/udev/udev-165/mtocgd2/corecdp.rules +++ b/multitech/recipes/udev/udev-165/mtocgd2/corecdp.rules @@ -2,10 +2,6 @@ ACTION=="remove", GOTO="corecdp_end" SUBSYSTEM!="tty", GOTO="corecdp_end" KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*|ttyS*", GOTO="corecdp_end" -# use serial port by default, allow USB radios to overwrite link -KERNEL=="ttyS1", SYMLINK+="modem0", OPTIONS+="link_priority=-1" -KERNEL=="ttyS1", SYMLINK+="modem_at0", OPTIONS+="link_priority=-1" - SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}" ENV{ID_IFACE}=="", GOTO="corecdp_end" diff --git a/multitech/recipes/udev/udev_165.bbappend b/multitech/recipes/udev/udev_165.bbappend index e6d011c..2f42438 100644 --- a/multitech/recipes/udev/udev_165.bbappend +++ b/multitech/recipes/udev/udev_165.bbappend @@ -1,7 +1,7 @@ FILESEXTRA := "${THISDIR}" FILESPATHBASE =. "${FILESEXTRA}:" -PR .= ".corecdp5" +PR .= ".corecdp6" # add custom rules for persistent modem device names SRC_URI += "file://corecdp.rules" -- cgit v1.2.3