From: John Crispin Date: Sat, 2 Jun 2012 14:03:28 +0000 (+0000) Subject: move /dev/vmmcX creation to a more central place X-Git-Tag: v19.07.0-rc1~24373 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a4fa2cb6115815a383933ace6791e8954b2975e0;p=openwrt%2Fstaging%2Fhauke.git move /dev/vmmcX creation to a more central place SVN-Revision: 32024 --- diff --git a/package/ltq-vmmc/files/vmmc.init b/package/ltq-vmmc/files/vmmc.init index bae7badaf0..100a97dc45 100644 --- a/package/ltq-vmmc/files/vmmc.init +++ b/package/ltq-vmmc/files/vmmc.init @@ -5,21 +5,15 @@ START=31 start() { - # TODO: clean up this mess - [ `cat /proc/cpuinfo | grep system | cut -f 3 -d ' '` = "Twinpass-VE" ] && { - [ ! -e /dev/danube-port ] && mknod /dev/danube-port c 254 0 - return; - } - [ `cat /proc/cpuinfo | grep system | cut -f 3 -d ' '` != "Danube" ] && { - [ ! -e /dev/amazon_s-port ] && mknod /dev/amazon_s-port c 240 1 - echo "INFO configuring HW scheduling 33/66" - echo "t0 0x0" > /proc/mips/mtsched - echo "t1 0x1" > /proc/mips/mtsched - echo "v0 0x0" > /proc/mips/mtsched - } - [ `cat /proc/cpuinfo | grep system | cut -f 3 -d ' '` = "Danube" ] && { - [ ! -e /dev/danube-port ] && mknod /dev/danube-port c 240 1 - # switch life-line relais - echo 1 > /sys/class/leds/fxs_relay/brightness + [ ! -c /dev/vmmc10 ] && { + mknod /dev/vmmc10 c 122 10 + mknod /dev/vmmc11 c 122 11 + mknod /dev/vmmc12 c 122 12 + mknod /dev/vmmc13 c 122 13 + mknod /dev/vmmc14 c 122 14 + mknod /dev/vmmc15 c 122 15 + mknod /dev/vmmc16 c 122 16 + mknod /dev/vmmc17 c 122 17 + mknod /dev/vmmc18 c 122 18 } } diff --git a/package/owsip/files/telephony.init b/package/owsip/files/telephony.init index 9e40c41f49..90909e6257 100644 --- a/package/owsip/files/telephony.init +++ b/package/owsip/files/telephony.init @@ -7,22 +7,6 @@ SERVICE_PID_FILE=/var/run/owsip.pid . /lib/functions.sh -load_module() { - MODULE=`lsmod | grep vmmc` - [ ! -z "$MODULE" ] || ( insmod vmmc ; sleep 3 ) - [ ! -c /dev/vmmc10 ] && { - mknod /dev/vmmc10 c 122 10 - mknod /dev/vmmc11 c 122 11 - mknod /dev/vmmc12 c 122 12 - mknod /dev/vmmc13 c 122 13 - mknod /dev/vmmc14 c 122 14 - mknod /dev/vmmc15 c 122 15 - mknod /dev/vmmc16 c 122 16 - mknod /dev/vmmc17 c 122 17 - mknod /dev/vmmc18 c 122 18 - } -} - relay_set () { local cfg="$1" local gpio value @@ -41,7 +25,6 @@ relay_set () { start() { config_load telephony config_foreach relay_set relay - load_module service_start /usr/bin/owsip_ua }