gsm: remove machine specific settings for gta01 and gta02

* use the same default and gsmd for gta01 and gta02
* this only works with kernel 2.6.24

8 files changed, 5 insertions, 149 deletions

diff --git a/packages/gsm/files/default b/packages/gsm/files/default
index f113d8bab0..ffff4399cc 100644
--- a/packages/gsm/files/default
+++ b/packages/gsm/files/default
@@ -5,8 +5,9 @@
 case `machine_id` in
 	"gta01"|"gta02")
 		GSMD_OPTS="-s 115200 -F"
-		GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
-		GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
+		GSM_POW="/sys/bus/platform/devices/neo1973-pm-gsm.0/power_on"
+		GSM_RES="/sys/bus/platform/devices/neo1973-pm-gsm.0/reset"
+		GSM_DL="/sys/bus/platform/devices/neo1973-pm-gsm.0/download"
 		GSM_DEV="/dev/ttySAC0"
 		;;
 	"htc_apache"|"htc_blueangel"|"htc_universal")
diff --git a/packages/gsm/files/fic-gta01/.mtn2git_empty b/packages/gsm/files/fic-gta01/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gsm/files/fic-gta01/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd
deleted file mode 100644
index d8323e202c..0000000000
--- a/packages/gsm/files/fic-gta01/gsmd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# gsmd  This shell script starts and stops gsmd.
-#
-# chkconfig: 345 90 40
-# description: Gsmd manages access to a serial- or USB-connected GSM
-# processname: gsmd
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-[ -f /etc/default/gsmd ] && . /etc/default/gsmd
-
-case "$1" in
-    start)
-        stty -F "$GSM_DEV" -crtscts
-        [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
-        stty -F "$GSM_DEV" -echo
-        [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
-        [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
-        [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
-
-        echo -n "Starting GSM daemon: "
-        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
-
-        if [ $? = 0 ]; then
-            echo "gsmd."
-        else
-            echo "(failed.)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping GSM daemon: "
-        start-stop-daemon -K -x /usr/sbin/gsmd
-        stty -F "$GSM_DEV" -crtscts
-        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
-        echo "gsmd."
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/packages/gsm/files/fic-gta02/.mtn2git_empty b/packages/gsm/files/fic-gta02/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gsm/files/fic-gta02/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gsm/files/fic-gta02/default b/packages/gsm/files/fic-gta02/default
deleted file mode 100644
index ffff4399cc..0000000000
--- a/packages/gsm/files/fic-gta02/default
+++ /dev/null
@@ -1,49 +0,0 @@
-# gsmd	This shell script configures for the gsmd init script.
-
-. /etc/init.d/functions
-
-case `machine_id` in
-	"gta01"|"gta02")
-		GSMD_OPTS="-s 115200 -F"
-		GSM_POW="/sys/bus/platform/devices/neo1973-pm-gsm.0/power_on"
-		GSM_RES="/sys/bus/platform/devices/neo1973-pm-gsm.0/reset"
-		GSM_DL="/sys/bus/platform/devices/neo1973-pm-gsm.0/download"
-		GSM_DEV="/dev/ttySAC0"
-		;;
-	"htc_apache"|"htc_blueangel"|"htc_universal")
-		GSMD_OPTS="-s 115200 -F"
-		GSM_DEV="/dev/ttyS0"
-		;;
-	"htc_himalaya")
-		GSMD_OPTS="-s 115200 -F"
-		GSM_DEV="/dev/ttyS2"
-		;;
-	"htc_magician")
-		GSMD_OPTS="-s 115200 -F"
-		GSM_DEV="/dev/ttyS1"
-		;;
-	"palm_treo_650")
-		GSMD_OPTS="-s 460800 -F -w 1"
-		GSM_DEV="/dev/ttyS0"
-		;;
-        "motorola_ezx_platform")
-                GSMD_OPTS="-s 115200 -F -v ti"
-                GSM_DEV="/dev/mux0"
-                ;;
-	*)
-		# Unknown board
-
-		# If you must specify special options, uncomment and modify the next line
-		#GSMD_OPTS="-s 115200 -F"
-
-		# If your GSM device needs to be powered up, uncomment and modify the next line
-		#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
-
-		# If your GSM device then needs to be reset, uncomment and modify the next line
-		#GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
-
-		# This should be in a common /etc/default/serial, together with
-		# BT_DEV and IR_DEV for devices that have those on a serial port
-		#GSM_DEV="/dev/ttyS1"
-		;;
-esac
diff --git a/packages/gsm/files/fic-gta02/gsmd b/packages/gsm/files/fic-gta02/gsmd
deleted file mode 100644
index fadae76aee..0000000000
--- a/packages/gsm/files/fic-gta02/gsmd
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-#
-# gsmd  This shell script starts and stops gsmd.
-#
-# chkconfig: 345 90 40
-# description: Gsmd manages access to a serial- or USB-connected GSM
-# processname: gsmd
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-[ -f /etc/default/gsmd ] && . /etc/default/gsmd
-
-case "$1" in
-    start)
-        [ -n "$GSM_DL" ] && ( echo "1" >$GSM_DL; sleep 1 )
-        [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
-        [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
-        [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
-        [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
-
-        echo -n "Starting GSM daemon: "
-        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
-
-        if [ $? = 0 ]; then
-            echo "gsmd."
-        else
-            echo "(failed.)"
-        fi
-        ;;
-    stop)
-        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
-
-        echo -n "Stopping GSM daemon: "
-        start-stop-daemon -K -x /usr/sbin/gsmd
-        echo "gsmd."
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd
index 9257b901ad..fadae76aee 100644
--- a/packages/gsm/files/gsmd
+++ b/packages/gsm/files/gsmd
@@ -13,6 +13,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
 case "$1" in
     start)
+        [ -n "$GSM_DL" ] && ( echo "1" >$GSM_DL; sleep 1 )
         [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
         [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
         [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc
index a6b6fb7a6a..5e47847d74 100644
--- a/packages/gsm/gsmd.inc
+++ b/packages/gsm/gsmd.inc
@@ -5,7 +5,7 @@ SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
-PR = "r41"
+PR = "r42"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \