GFA_CAPE Display_GSM neu

board/GfA/Display001/BUILD

@@ -1 +1 @@
-674
+675

board/GfA/Display001/rootfs/etc/init.d/gsmMuxd_PH8Ser

@@ -4,8 +4,8 @@ BASEBOARD=`cat /tmp/BASEBOARD`
 
 case "$1" in
 	start)
-		if [ "$BASEBOARD" == "DISPLAY002_DI4" -o "$BASEBOARD" == "DISPLAY002_RS485" ]; then
-			echo "DISPLAY002"
+		if [ "$BASEBOARD" == "DISPLAY002_DI4" -o "$BASEBOARD" == "DISPLAY002_RS485" -o "$BASEBOARD" == "GFA_RF_CAPE" ]; then
+			echo $BASEBOARD
 			echo 255 > /sys/class/leds/EMERG/brightness		
 			/bin/sleep 4
 			echo 0 > /sys/class/leds/EMERG/brightness		
@@ -25,7 +25,11 @@ case "$1" in
 		fi
 		#-------------------
 		/bin/sleep 5	
-		/var/GfA/gsmMuxd_Ser -p /dev/ttyO1 -m ph8 -B 921600 -b 115200 -r -w -s /dev/mux /dev/ptmx /dev/ptmx /dev/ptmx
+		if [ "$BASEBOARD" == "GFA_RF_CAPE" ]; then
+			/var/GfA/gsmMuxd_Ser -p /dev/ttyO4 -m ph8 -B 921600 -b 115200 -r -w -s /dev/mux /dev/ptmx /dev/ptmx /dev/ptmx
+		else
+			/var/GfA/gsmMuxd_Ser -p /dev/ttyO1 -m ph8 -B 921600 -b 115200 -r -w -s /dev/mux /dev/ptmx /dev/ptmx /dev/ptmx
+		fi
 		;;
 	stop)
 		killall gsmMuxd_Ser

board/GfA/Display001/rootfs/etc/init.d/gsmMuxd_TC65i

@@ -1,31 +1,17 @@
 #!/bin/sh
 #
-BASEBOARD=`cat /tmp/BASEBOARD`
 
 case "$1" in
 	start)
-		if [ "$BASEBOARD" == "DISPLAY002_DI4" -o "$BASEBOARD" == "DISPLAY002_RS485" ]; then
-			echo "DISPLAY002"
-			echo 255 > /sys/class/leds/EMERG/brightness		
-			/bin/sleep 4
-			echo 0 > /sys/class/leds/EMERG/brightness		
-			/bin/sleep 1
-			echo 255 > /sys/class/leds/IGNIT/brightness		
-			/bin/sleep 2
-			echo 0 > /sys/class/leds/IGNIT/brightness		
-		else
-			echo "DISPLAY001"
-			/root/gfa_spi -o 0x40025040 0x00000010
-			/bin/sleep 4
-			/root/gfa_spi -o 0x40025040 0x00000000
-			/bin/sleep 1
-			/root/gfa_spi -o 0x40027200 0x00000080
-			/bin/sleep 2
-			/root/gfa_spi -o 0x40027200 0x00000000
-		fi
-		#-------------------
+		/root/gfa_spi -o 0x40025040 0x00000010
+		/bin/sleep 4
+		/root/gfa_spi -o 0x40025040 0x00000000
+		/bin/sleep 1
+		/root/gfa_spi -o 0x40027200 0x00000080
+		/bin/sleep 2
+		/root/gfa_spi -o 0x40027200 0x00000000
 		/bin/sleep 5	
-		/var/GfA/gsmMuxd_Ser -p /dev/ttyO1 -m mc35  -B 460800 -b 115200 -r -w -s /dev/mux /dev/ptmx /dev/ptmx /dev/ptmx
+		/var/GfA/gsmMuxd_Ser -p /dev/ttyO1 -m mc35 -B 460800 -b 115200 -r -w -s /dev/mux /dev/ptmx /dev/ptmx /dev/ptmx
 		;;
 	stop)
 		killall gsmMuxd_Ser

board/GfA/Display001/rootfs/etc/init.d/rcS

@@ -1,20 +1,28 @@
 #!/bin/sh
 # -- set tcp socket timeouts
-echo 10 > /proc/sys/net/ipv4/tcp_keepalive_time
-echo 5 > /proc/sys/net/ipv4/tcp_keepalive_probes
-echo 15 >  /proc/sys/net/ipv4/tcp_keepalive_intvl
-echo 2 > /proc/sys/net/ipv4/tcp_retries2
-echo 1 > /proc/sys/net/ipv4/tcp_orphan_retries
-echo 5 > /proc/sys/net/ipv4/tcp_reordering
-echo 0 > /proc/sys/net/ipv4/tcp_retrans_collapse
+##echo 10 > /proc/sys/net/ipv4/tcp_keepalive_time
+##echo 5 > /proc/sys/net/ipv4/tcp_keepalive_probes
+##echo 15 >  /proc/sys/net/ipv4/tcp_keepalive_intvl
+##echo 2 > /proc/sys/net/ipv4/tcp_retries2
+##echo 1 > /proc/sys/net/ipv4/tcp_orphan_retries
+##echo 5 > /proc/sys/net/ipv4/tcp_reordering
+##echo 0 > /proc/sys/net/ipv4/tcp_retrans_collapse
 # --
 # Start all init scripts in /etc/init.d
 # executing them in numerical order.
 #
-modprobe i2c_gpio
-BASEBOARD=$(if [ -c "/dev/spidev1.0" ]; then echo "SPIDEV1.0";else echo "NOSPIDEV1.0";fi)
-BASEBOARD=$(if [ -c "/dev/spidev1.1" ]; then echo "SPIDEV1.1";else echo "NOSPIDEV1.1";fi)
-BASEBOARD=$(if [ -c "/dev/rtc1" ]; then echo "DISPLAY002";else echo "DISPLAY001";fi)
+
+DTSNAME=`cat /sys/firmware/devicetree/base/vendorinfo/display_dtb`
+
+if [ "$DTSNAME" != "Display001_cape.dtb" ]; then 
+	modprobe i2c_gpio
+	BASEBOARD=$(if [ -c "/dev/spidev1.0" ]; then echo "SPIDEV1.0";else echo "NOSPIDEV1.0";fi)
+	BASEBOARD=$(if [ -c "/dev/spidev1.1" ]; then echo "SPIDEV1.1";else echo "NOSPIDEV1.1";fi)
+	BASEBOARD=$(if [ -c "/dev/rtc1" ]; then echo "DISPLAY002";else echo "DISPLAY001";fi)
+else
+	BASEBOARD="GFA_RF_CAPE"
+	echo $BASEBOARD > /tmp/BASEBOARD
+fi
 
 modprobe uio
 modprobe pwm_omap_dmtimer
@@ -127,10 +135,10 @@ fi
 #===========================
 # disable all ipv6
 #===========================
-echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6
+##echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6
 #===========================
 #Firewall ppp0, drop all incoming
 #===========================
-iptables -A INPUT -i ppp0 -m state --state RELATED,ESTABLISHED -j ACCEPT
-iptables -A INPUT -i ppp0 -j DROP
+##iptables -A INPUT -i ppp0 -m state --state RELATED,ESTABLISHED -j ACCEPT
+##iptables -A INPUT -i ppp0 -j DROP
 

board/GfA/Display001/rootfs/etc/ppp/peers/gprs

@@ -1,5 +1,3 @@
-#/dev/mux2    # modem port used
-115200        # speed
 defaultroute  # use the cellular network for the default route
 noipdefault
 usepeerdns    # use the DNS servers from the remote network
@@ -14,6 +12,11 @@ local         # don't use Carrier Detect or Data Terminal Ready
 debug
 novj
 novjccomp
+#----
+noccp
+noipx
+receive-all
+noipv6
 # Use the next two lines if you receive the dreaded messages:
 #
 #    No response to n echo-requests

board/GfA/Display001/rootfs/etc/udev/rules.d/20-ttyS-links.rules

@@ -1,4 +1,4 @@
 # symlink to ttyS* from ttyO* for omap compatibility issues
-KERNEL=="ttyS[0-5]*", SUBSYSTEM=="tty", SYMLINK+="ttyO%n"
+KERNEL=="ttyS[1-5]*", SUBSYSTEM=="tty", SYMLINK+="ttyO%n"
 # symlink to ttyO* from ttyS* for omap compatibility issues
-KERNEL=="ttyO[0-5]*", SUBSYSTEM=="tty", SYMLINK+="ttyS%n"
+KERNEL=="ttyO[1-5]*", SUBSYSTEM=="tty", SYMLINK+="ttyS%n"

board/GfA/Display001/rootfs/var/GfA/Display_GSM.ini

@@ -8,7 +8,7 @@ SENTSTART=0
 PING=0
 GPRSACTIVE=0
 GPRSNAIL=5
-TSYNCCMD=/etc/init.d/S99rtc_GfA set
+TSYNCCMD=rdate time.memod.de
 TSYNC=67
 SERDEVINIT=/var/GfA/SerDevInit
 

board/GfA/Display001/rootfs/var/GfA/pppd.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+VENDOR_PATH=$1
+
+echo `date`"++PPPD: start" >> $VENDOR_PATH/pppd_retval.log
+
+shift
+pppd $1 $2 $3 $4 $5 $6 $7
+
+PPPD_RETVAL=$?
+echo "PPPD: Retval = $PPPD_RETVAL"
+echo `date`"--PPPD: Retval = $PPPD_RETVAL" >> $VENDOR_PATH/pppd_retval.log
+
+if [ $PPPD_RETVAL == 8 ];then
+	echo "Modem has error reset"
+	$VENDOR_PATH/gsm_MSQ "*AT+cfun=1,1"
+fi
+if [ $PPPD_RETVAL == 137 ];then
+	echo "Modem has error reset"
+	$VENDOR_PATH/gsm_MSQ "*AT+cfun=1,1"
+fi