[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-153-g18c5217

[jscheer <js...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  18c5217b822262214d1f1f36fdd1ae326dac0db5 (commit)
      from  c0ff4d1a914607a628db6bdd4caea35363c229f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 18c5217b822262214d1f1f36fdd1ae326dac0db5
Author: Jeremie Scheer <jer...@ar...>
Date:   Fri Dec 3 11:45:46 2010 +0100

    [ROOTFS] Add PPS scripts path in PATH in /etc/profile when compiling a PPS board.
    [ROOTFS] Use generic script gpio_helpers.sh in PPS' S80gpios file to initialize GPIOs.

-----------------------------------------------------------------------

Summary of changes:
 .../etc => target/pps/configs}/profile             |   24 +++++++------
 target/pps/init/S80gpios                           |   34 +-------------------
 target/pps/scripts/init_wpa.sh                     |    2 +-
 3 files changed, 15 insertions(+), 45 deletions(-)
 copy {buildroot/target/device/armadeus/rootfs/target_skeleton/etc => target/pps/configs}/profile (74%)

diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/profile b/target/pps/configs/profile
similarity index 74%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/etc/profile
copy to target/pps/configs/profile
index 417ec26..df1edc2 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/profile
+++ b/target/pps/configs/profile
@@ -6,7 +6,8 @@ export PATH=\
 /usr/bin:\
 /usr/sbin:\
 /usr/bin/X11:\
-/usr/local/bin
+/usr/local/bin:\
+/usr/local/pps/scripts
 
 # If running interactively, then:
 if [ "$PS1" ]; then
@@ -17,11 +18,11 @@ if [ "$PS1" ]; then
 	alias ls='/bin/ls --color=tty -F'
 	export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.png=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:';
     else
-        if [ "`id -u`" -eq 0 ]; then
-	    export PS1='# '
-        else
-	    export PS1='$ '
-        fi
+      if [ "`id -u`" -eq 0 ]; then 
+	export PS1='# '
+      else
+	export PS1='$ '
+      fi
     fi
 
     export USER=`id -un`
@@ -33,15 +34,16 @@ if [ "$PS1" ]; then
     export EDITOR='/bin/vi'
     export INPUTRC=/etc/inputrc
     export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
-    # For Tslib:
-    export TSLIB_TSDEVICE=/dev/input/event0
-    export TSLIB_TSEVENTTYPE=INPUT
-    export TSLIB_CONFFILE=/etc/ts.conf
-    export TSLIB_CALIBFILE=/etc/pointercal
 
     ### Some aliases
     alias ps2='ps facux '
     alias ps1='ps faxo "%U %t %p %a" '
+    alias af='ps af'
     alias cls='clear'
     alias df='df -h'
+    alias indent='indent -bad -bap -bbo -nbc -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -cp33 -cs -d0 -di1 -nfc1 -nfca -hnl -i4 -ip0 -l75 -lp -npcs -npsl -nsc -nsob -nss -ts4 '
+    #alias bc='bc -l'
+    alias minicom='minicom -c on'
+    alias calc='calc -Cd '
+    alias bc='calc -Cd '
 fi;
diff --git a/target/pps/init/S80gpios b/target/pps/init/S80gpios
index bf33950..c760395 100755
--- a/target/pps/init/S80gpios
+++ b/target/pps/init/S80gpios
@@ -6,39 +6,7 @@
 # Fabien Marteau   <fab...@ar...>
 #
 
-GPIO_DEV_DIR=/dev/gpio
-
-setbit()
-{
-	PORT=$1
-	NB=$2
-	VAL=$3
-	cat $PORT | sed "s/[0-1]\([0-1]\{$NB\}\)$/$VAL\1/" > $PORT
-}
-
-gpio_set_value()
-{
-	GPIO=$1
-	VALUE=$2
-	if [ "$VALUE" == "1" ]; then
-		echo -ne "\x01" > $GPIO_DEV_DIR/$GPIO
-	else
-		echo -ne "\x00" > $GPIO_DEV_DIR/$GPIO
-	fi
-}
-
-# Sets $1 as GPIO; $2 == 1 -> outpout, 0 -> input
-gpio_mode()
-{
-	GPIO=`echo $1 | cut -c 3-4`
-	VALUE=$2
-	PORT=`echo $1 | cut -c 2`
-	PORT_DIR="/proc/driver/gpio/port"$PORT"dir"
-	PORT_MODE="/proc/driver/gpio/port"$PORT"mode"
-
-	setbit $PORT_MODE $GPIO 1
-	setbit $PORT_DIR $GPIO $VALUE
-}
+source /usr/bin/gpio_helpers.sh
 
 case "$1" in
 	start)
diff --git a/target/pps/scripts/init_wpa.sh b/target/pps/scripts/init_wpa.sh
index 65fbb81..1d31d96 100644
--- a/target/pps/scripts/init_wpa.sh
+++ b/target/pps/scripts/init_wpa.sh
@@ -38,7 +38,7 @@ psk=\"$PSK\"
 }" > /etc/wpa_supplicant/wpa_supplicant.conf
 
 #Hardware reset of wi2wi chip
-sh reset_wi2wi.sh
+sh /usr/local/pps/scripts/reset_wi2wi.sh
 
 #Load mmc and libertas modules
 modprobe mxcmmc


hooks/post-receive
-- 
armadeus