From 0ffc1ba8b64287653c59a6ab8beaad6de6029935 Mon Sep 17 00:00:00 2001 From: Christian Gromm Date: Tue, 6 Dec 2016 15:20:06 +0100 Subject: update NetworkManager to v3.0.4 This patch updates the NetworkManager binary to version v3.0.4. Additionally, configuration scripts are added and updated to match the camera setup. Change-Id: I264f5bc88b120269bda576267e2ba7acfb6c2ec7 Signed-off-by: Christian Gromm --- NetworkManager | Bin 270068 -> 297352 bytes camera-os88122-ts.script | 1542 ++++ camera-os88133-ap0100-flash.script | 17020 +++++++++++++++++++++++++++++++++++ camera-os88133-ap0100.script | 928 ++ config-agl.xml | 194 +- i2c-slim-amplifier-v2.3.script | 92 + loadDriver.sh | 20 +- 7 files changed, 19751 insertions(+), 45 deletions(-) create mode 100644 camera-os88122-ts.script create mode 100644 camera-os88133-ap0100-flash.script create mode 100644 camera-os88133-ap0100.script create mode 100644 i2c-slim-amplifier-v2.3.script diff --git a/NetworkManager b/NetworkManager index ce16af9..f4ec949 100644 Binary files a/NetworkManager and b/NetworkManager differ diff --git a/camera-os88122-ts.script b/camera-os88122-ts.script new file mode 100644 index 0000000..5131f04 --- /dev/null +++ b/camera-os88122-ts.script @@ -0,0 +1,1542 @@ + diff --git a/camera-os88133-ap0100-flash.script b/camera-os88133-ap0100-flash.script new file mode 100644 index 0000000..1bfacb3 --- /dev/null +++ b/camera-os88133-ap0100-flash.script @@ -0,0 +1,17020 @@ + diff --git a/camera-os88133-ap0100.script b/camera-os88133-ap0100.script new file mode 100644 index 0000000..baee2a2 --- /dev/null +++ b/camera-os88133-ap0100.script @@ -0,0 +1,928 @@ + diff --git a/config-agl.xml b/config-agl.xml index 97fcb5c..8824aee 100644 --- a/config-agl.xml +++ b/config-agl.xml @@ -1,24 +1,22 @@ - - USB + 3 - CTRL - IN - 8f - - USB - f - CTRL - OUT - f - - 1 - 276 - + 212 + + CTRL + IN + 8f + + + CTRL + OUT + f + + @@ -46,8 +44,8 @@ 4 - - 2 + + 2 USB SYNC @@ -67,8 +65,8 @@ 4 - - 3 + + 3 USB SYNC @@ -88,7 +86,7 @@ 4 - + 4 USB @@ -108,13 +106,33 @@ 188 + + 5 + + USB + ISOC + OUT + 81 + 188 + 32 + 7520 + 2 + V4L + + + MOST + ISOC + IN + 60 + + - + 370 3 - + 1 @@ -137,12 +155,12 @@ - - + + 371 3 - + 1 @@ -165,12 +183,12 @@ - - + + 372 3 - + 1 @@ -193,8 +211,8 @@ - - + + 332 3 @@ -212,8 +230,8 @@ USB ISOC OUT - 7520 - 2 + 7520 + 2 83 188 @@ -238,8 +256,74 @@ 4 + + 3 + + USB + ISOC + OUT + 81 + 188 + 32 + 7520 + 2 + + + MOST + ISOC + IN + 60 + + - + + + + 340 + 3 + + + 1 + + MLB + ISOC + IN + 60 + a + + + MOST + ISOC + OUT + 100 + + + + + + + 321 + 1 + 3072 + + + 1 + + MLB + ISOC + IN + 60 + a + + + MOST + ISOC + OUT + 60 + + + + @@ -253,8 +337,8 @@ 1 - - + + 311 @@ -267,8 +351,8 @@ 1 - - + + 311 @@ -281,8 +365,8 @@ 1 - - + + 311 @@ -300,6 +384,36 @@ 1 - + + + + + 321 + 0 + 1 + + + 340 + 0 + 1 + + + 311 + 0 + 5 + + + 332 + 0 + 3 + + + 332 + 1 + 3 + + + + diff --git a/i2c-slim-amplifier-v2.3.script b/i2c-slim-amplifier-v2.3.script new file mode 100644 index 0000000..af57e67 --- /dev/null +++ b/i2c-slim-amplifier-v2.3.script @@ -0,0 +1,92 @@ + diff --git a/loadDriver.sh b/loadDriver.sh index f0ce5b7..2993614 100755 --- a/loadDriver.sh +++ b/loadDriver.sh @@ -5,9 +5,9 @@ then echo Warning you are not root, expect problems! fi -if [ -d ../../../LinuxDriver ] +if [ -d /home/pi/appsteam/trunk/LinuxDriver ] then - cd ../../../LinuxDriver + cd /home/pi/appsteam/trunk/LinuxDriver echo Switched to folder:$(pwd) else echo Searching driver in folder:$(pwd) @@ -29,6 +29,9 @@ lsmod | grep "^hdm_usb\>" > /dev/null && lsmod | grep "^aim_sound\>" > /dev/null && rmmod aim_sound && echo "unloaded aim_sound" +lsmod | grep "^aim_v4l2\>" > /dev/null && + rmmod aim_v4l2 && echo "unloaded aim_v4l2" + lsmod | grep "^aim_cdev\>" > /dev/null && rmmod aim_cdev && echo "unloaded aim_cdev" @@ -39,7 +42,12 @@ lsmod | grep "^mostcore\>" > /dev/null && rmmod mostcore && echo "unloaded mostcore" echo +#load V4L support +lsmod | grep "^media\>" || + insmod /lib/modules/$(uname -r)/kernel/drivers/media/media.ko +lsmod | grep "^videodev\>" || + insmod /lib/modules/$(uname -r)/kernel/drivers/media/v4l2-core/videodev.ko #load MOST Kernel modules insmod mostcore.ko && echo "loaded mostcore" @@ -49,7 +57,10 @@ insmod aim_cdev.ko && echo "loaded aim_cdev" insmod aim_network.ko && echo "loaded aim_network" [ -e aim_sound.ko ] && - insmod aim_sound.ko && echo "loaded sound" + insmod aim_sound.ko && echo "loaded sound" + +[ -e aim_v4l2.ko ] && + insmod aim_v4l2.ko && echo "loaded v4l2" [ -e hdm_usb.ko ] && insmod hdm_usb.ko && echo "loaded hdm_usb" @@ -78,7 +89,7 @@ SetAsyncChannel() CH_NAME=$2 DIR=dir_$3 BUFSIZE=$4 - + CHANNEL=$DEVS/$MDEV/$CH_NAME [ -e $CHANNEL/set_buffer_size ] || return 1 @@ -110,7 +121,6 @@ StartupEth() then echo Starting up $METH ifconfig $METH up - ETH_ALREADY_SET="" return 2 fi -- cgit 1.2.3-korg