armadeus-commitlog Mailing List for armadeus (Page 69)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julien B a. A. <ar...@us...> - 2012-10-12 17:41:57
|
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 5bce0b8d410b72e8272fff8c34fce3da9d33d517 (commit)
from 67c644ae35136d799305c2787e6c2beeb9d06402 (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 5bce0b8d410b72e8272fff8c34fce3da9d33d517
Author: Julien Boibessot <jul...@ar...>
Date: Fri Oct 12 19:38:41 2012 +0200
[LINUX] 3.6: APF28, fixes NAND partitions size
-----------------------------------------------------------------------
Summary of changes:
.../3.6/0403-armadeus-Add-apf28-support-dts.patch | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch b/patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch
index 2b028c0..2a5614a 100644
--- a/patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch
+++ b/patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch
@@ -48,7 +48,7 @@ Index: linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28.dts
+ };
+ partition@2 {
+ label = "env2";
-+ reg = <0x380000 0x20000>;
++ reg = <0x380000 0x80000>;
+ };
+ partition@3 {
+ label = "dtb";
@@ -56,7 +56,7 @@ Index: linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28.dts
+ };
+ partition@4 {
+ label = "splash";
-+ reg = <0x480000 0x20000>;
++ reg = <0x480000 0x80000>;
+ };
+ partition@5 {
+ label = "kernel";
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-11 10:44:04
|
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 67c644ae35136d799305c2787e6c2beeb9d06402 (commit)
from e1b4fcd8745bb954a137cd797dbbfdf5aa712d95 (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 67c644ae35136d799305c2787e6c2beeb9d06402
Author: Eric Jarrige <eri...@ar...>
Date: Thu Oct 11 12:23:56 2012 +0200
[OTHER] start software GIT development for the next release
-----------------------------------------------------------------------
Summary of changes:
.../rootfs/target_skeleton/etc/armadeus-version | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
index ef425ca..24c650a 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
@@ -1 +1 @@
-5.2
+5.3-devt-git
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-11 09:59:01
|
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 annotated tag, armadeus-5.2 has been created
at f9c16b2f2aceb051e43ee7d8ca2d9e0a35735af1 (tag)
tagging e1b4fcd8745bb954a137cd797dbbfdf5aa712d95 (commit)
replaces armadeus-5.1
tagged by Eric Jarrige
on Thu Oct 11 12:02:11 2012 +0200
- Log -----------------------------------------------------------------
Creating TAG for armadeus-5.2 release
Eric Jarrige (7):
[OTHER] start software GIT development for the next release
[UBOOT] pps: fix wi2wi sdio init
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[BUILDROOT] pps: recover wi2wi firmware and bridge utilities configuration
[LINUX]: enable test kernel watchdog driver
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Update release files for Armadeus-5.2
Fabien Marteau (1):
[target][test][test_rs232] So much exclamations points give me a headache
Jeremie Scheer (4):
[PACKAGES][AS_DEVICES] Doxyfile for As Devices.
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[PACKAGES][AS_DEVICES] C and C++ wrapper for I2C EEPROM.
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Julien Boibessot (2):
[LINUX] apf28: 3.6.1 is out, so use it as experimental kernel
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
-----------------------------------------------------------------------
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-11 09:58:59
|
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 e1b4fcd8745bb954a137cd797dbbfdf5aa712d95 (commit)
from 2e8a5329b0e61c5f477c80d3508629036b9e1e3c (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 e1b4fcd8745bb954a137cd797dbbfdf5aa712d95
Author: Eric Jarrige <eri...@ar...>
Date: Thu Oct 11 12:01:36 2012 +0200
Update release files for Armadeus-5.2
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 +++++++++++--
.../rootfs/target_skeleton/etc/armadeus-version | 2 +-
scripts/release/changes.sh | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 610e68e..a8191ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,18 @@
----
-Changes in armadeus-5.1 (Mon Oct 8 15:02:31 CEST 2012)
+Changes in armadeus-5.2 (released on October 11th 2012)
-* Wiki dump available here: http://www.armadeus.com/assos_downloads/wiki/armadeus-5.1_wiki_dump.tar.gz
+* Wiki dump available here: http://www.armadeus.com/assos_downloads/wiki/armadeus-5.2_wiki_dump.tar.gz
* Corrected Tickets/Bugs:
+ - Revoke Armadeus release 5.1 to fix PPS software
- #3573311 Suggestion: Py_BEGIN_ALLOW_THREADS in blockingGetPinValue
- #3573310 AsDevices as_gpio_wait_event opens file but does not close
- #3569139 AsGpio.blockingGetPinValue: incorrect parameters to wrapper
* Buildroot:
+ - pps: recover wi2wi firmware and bridge utilities configuration
+ -[AS_DEVICES] C++ wrapper for PWM device.
- linux-firmware: add new version of wl12xx firmware
- Fixes pppd build with recent linux kernels (BR mainline backport)
- update BR cleanup script
@@ -22,6 +25,8 @@ Changes in armadeus-5.1 (Mon Oct 8 15:02:31 CEST 2012)
- start APF28 migration to kernel 3.6
List of all changes:
+ - apf9328: enable test kernel watchdog driver
+ - apf28: 3.6.1 is out, so use it as experimental kernel
- apf28: fix SD/MMC reliability and capalities
- apf28: fix kernel 2.6.35 video flickering
- Removes useless 3.5 patches
@@ -66,6 +71,7 @@ Changes in armadeus-5.1 (Mon Oct 8 15:02:31 CEST 2012)
- Add pod_pwm driver to virtual_components
* U-Boot:
+ - pps: fix wi2wi sdio init
- 2012.04: fix bug when programming huge files (>32MiB) to NAND
* Firmware:
@@ -76,6 +82,7 @@ Changes in armadeus-5.1 (Mon Oct 8 15:02:31 CEST 2012)
- imxregs: add imx28 USB registers
* Test:
+ - [test_rs232] So much exclamations points give me a headache
- apf28: update BSP testsuite
- apf28: update BSP testsuite
- apf28: update linux testsuite
@@ -87,6 +94,8 @@ Changes in armadeus-5.1 (Mon Oct 8 15:02:31 CEST 2012)
- apf28: update uboot_recover with uboot 2012.04.01 patch 1.7
* As_Devices:
+ - C and C++ wrapper for I2C EEPROM.
+ - Doxyfile for As Devices.
- Test scripts for backlight, eeprom and PWM C++ wrappers.
- C++ wrapper for 93LCXX EEPROM device.
- allow blockingGetPinValue function to be used under python thread
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
index c9e0504..ef425ca 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
@@ -1 +1 @@
-5.2-devt-git
+5.2
diff --git a/scripts/release/changes.sh b/scripts/release/changes.sh
index 01f0362..147d110 100755
--- a/scripts/release/changes.sh
+++ b/scripts/release/changes.sh
@@ -15,7 +15,7 @@ CHANGES_TOOLS=$TEMP_DIR/tools.log
CHANGES_ASDEVICES=$TEMP_DIR/asdevices.log
CHANGES_OTHER=$TEMP_DIR/other.log
-LATEST_RELEASE_DATE="2012-08-12"
+LATEST_RELEASE_DATE="2012-10-11"
usage()
{
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-10 14:14:25
|
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 2e8a5329b0e61c5f477c80d3508629036b9e1e3c (commit)
via eefb0f3c759247fe470894c4e06afb9d07e7a48c (commit)
from dd37705384138b960c74eec39dc01af5f986bd88 (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 2e8a5329b0e61c5f477c80d3508629036b9e1e3c
Merge: eefb0f3 dd37705
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 10 16:17:04 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit eefb0f3c759247fe470894c4e06afb9d07e7a48c
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 10 16:14:01 2012 +0200
[LINUX]: enable test kernel watchdog driver
-----------------------------------------------------------------------
Summary of changes:
.../apf9328/apf9328test-linux-2.6.29.config | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config b/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config
index 21c2630..78340fb 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf9328/apf9328test-linux-2.6.29.config
@@ -831,7 +831,19 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_W83627EHF is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_IMX_WDT=y
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y
#
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2012-10-10 12:39:04
|
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 dd37705384138b960c74eec39dc01af5f986bd88 (commit)
from 64c495ca2be6ce558435ce901a7362295ac8e8fa (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 dd37705384138b960c74eec39dc01af5f986bd88
Author: Fabien Marteau <fab...@ar...>
Date: Wed Oct 10 14:38:48 2012 +0200
[target][test][test_rs232] So much exclamations points give me a headache
-----------------------------------------------------------------------
Summary of changes:
target/test/test_rs232.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/target/test/test_rs232.sh b/target/test/test_rs232.sh
index 8f04961..4a83cfd 100755
--- a/target/test/test_rs232.sh
+++ b/target/test/test_rs232.sh
@@ -50,7 +50,7 @@ test_serial_port()
pid=$!
echo -n "."; sleep 1
# Send data
- echo "Serial Port N°$1 ($SERIAL_DEVICE) is working !!!!!!!!!!" > $SERIAL_DEVICE
+ echo "Serial Port N°$1 ($SERIAL_DEVICE) is working." > $SERIAL_DEVICE
echo -n "."; sleep 1; echo
cat /proc/interrupts | grep uart
kill $pid
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-10 11:33:49
|
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 64c495ca2be6ce558435ce901a7362295ac8e8fa (commit)
from 34c060d518069714f6f9890e1adce6c486b43b62 (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 64c495ca2be6ce558435ce901a7362295ac8e8fa
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 10 13:36:56 2012 +0200
[BUILDROOT] pps: recover wi2wi firmware and bridge utilities configuration
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/pps_defconfig | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 3e4c7f5..d46b1e7 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -38,9 +38,10 @@ BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_PPS=y
BR2_PACKAGE_PPS_TEST_SCRIPTS=y
BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_FIRMWARE=y
-BR2_PACKAGE_FIRMWARE_88W8686=y
BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_88W8686=y
+BR2_PACKAGE_LINUX_FIRMWARE_88W8686_V8=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
@@ -48,7 +49,7 @@ BR2_PACKAGE_MTD_SUMTOOL=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_OPENSSL_BIN=y
BR2_PACKAGE_BOA=y
-BR2_PACKAGE_BRIDGE=y
+BR2_PACKAGE_BRIDGE_UTILS=y
BR2_PACKAGE_ETHTOOL=y
BR2_PACKAGE_IPSEC_TOOLS=y
BR2_PACKAGE_IPSEC_TOOLS_NATT=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-10 01:51:10
|
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 34c060d518069714f6f9890e1adce6c486b43b62 (commit)
via 1cb7df73afdde89930935a2443642e0aebd94c8c (commit)
from eda9897bd608cce07978c8dbb6bf0be9a5a18efc (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 34c060d518069714f6f9890e1adce6c486b43b62
Merge: 1cb7df7 eda9897
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 10 03:54:31 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 1cb7df73afdde89930935a2443642e0aebd94c8c
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 10 03:50:45 2012 +0200
[UBOOT] pps: fix wi2wi sdio init
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/pps/pps-u-boot-2012.04.h | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
index 2a6b3a5..ff1bc97 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
@@ -24,8 +24,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "3.2"
-#define CONFIG_IDENT_STRING " pps patch 3.7"
+#define CONFIG_ENV_VERSION "3.3"
+#define CONFIG_IDENT_STRING " pps patch 3.8"
#define CONFIG_BOARD_NAME pps
/*
@@ -83,12 +83,12 @@
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DNS
/*#define CONFIG_CMD_EEPROM */ /* EEPROM read/write support */
-#define CONFIG_CMD_EXT2
+/*#define CONFIG_CMD_EXT2*/
#define CONFIG_CMD_FAT /* FAT support */
/*#define CONFIG_CMD_I2C */ /* I2C serial bus support */
#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
#define CONFIG_CMD_MII /* MII support */
-#define CONFIG_CMD_MMC
+/*#define CONFIG_CMD_MMC*/
#define CONFIG_CMD_MTDPARTS /* MTD partition support */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK
@@ -208,6 +208,7 @@
"rootfs_addr=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0" \
"board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
"kernel_addr_r=A0000000\0" \
+ "extrabootargs=otg_mode=device\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
"addubifsargs=setenv bootargs ${bootargs} " \
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2012-10-09 13:54:31
|
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 eda9897bd608cce07978c8dbb6bf0be9a5a18efc (commit)
via 8c41bffa58d0c75b24bfe9ce2ef60af30a245eef (commit)
from 2ace8d34b8277745533592480308414a90c3beb1 (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 eda9897bd608cce07978c8dbb6bf0be9a5a18efc
Merge: 8c41bff 2ace8d3
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Oct 9 15:54:02 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 8c41bffa58d0c75b24bfe9ce2ef60af30a245eef
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Oct 9 15:53:24 2012 +0200
[PACKAGES][AS_DEVICES] C and C++ wrapper for I2C EEPROM.
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/Makefile | 1 +
target/packages/as_devices/c/as_i2c_eeprom.c | 193 ++++++++++++++++++++
target/packages/as_devices/c/as_i2c_eeprom.h | 100 ++++++++++
target/packages/as_devices/cpp/Makefile | 1 +
.../cpp/{as_backlight.cpp => as_i2c_eeprom.cpp} | 46 ++----
.../cpp/{as_backlight.hpp => as_i2c_eeprom.hpp} | 52 +++---
target/packages/as_devices/main.c | 5 +-
target/packages/as_devices/test_c.h | 166 +++++++++++++++++
target/packages/as_devices/test_cpp.h | 165 +++++++++++++++++
9 files changed, 668 insertions(+), 61 deletions(-)
create mode 100644 target/packages/as_devices/c/as_i2c_eeprom.c
create mode 100644 target/packages/as_devices/c/as_i2c_eeprom.h
copy target/packages/as_devices/cpp/{as_backlight.cpp => as_i2c_eeprom.cpp} (52%)
copy target/packages/as_devices/cpp/{as_backlight.hpp => as_i2c_eeprom.hpp} (50%)
diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index 12014cc..2aab51f 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -22,6 +22,7 @@ OBJ += as_as1531.o
OBJ += as_max1027.o
OBJ += as_max5821.o
OBJ += as_backlight.o
+OBJ += as_i2c_eeprom.o
OBJ += as_helpers.o
LIBRARY=as_devices
diff --git a/target/packages/as_devices/c/as_i2c_eeprom.c b/target/packages/as_devices/c/as_i2c_eeprom.c
new file mode 100644
index 0000000..3f5a165
--- /dev/null
+++ b/target/packages/as_devices/c/as_i2c_eeprom.c
@@ -0,0 +1,193 @@
+/*
+** THE ARMadeus Systems
+**
+** Copyright (C) 2012 The armadeus systems team
+** Jérémie Scheer <jer...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "as_i2c_eeprom.h"
+
+//#define DEBUG
+#ifdef DEBUG
+# define ERROR(fmt, ...) printf(fmt, ##__VA_ARGS__)
+#else
+# define ERROR(fmt, ...) /*fmt, ##__VA_ARGS__*/
+#endif
+
+/*------------------------------------------------------------------------------*/
+
+struct as_i2c_eeprom_device * as_i2c_eeprom_open(int aBusNumber,
+ uint32_t anEeprom_addr,
+ uint32_t anAddr_width,
+ uint32_t aPage_buffer_size,
+ uint16_t aNumber_pages,
+ uint16_t aPage_size)
+{
+ struct as_i2c_eeprom_device *dev;
+
+ /* Open I2C bus */
+ struct as_i2c_device *i2c_dev;
+ i2c_dev = as_i2c_open(aBusNumber);
+ if (i2c_dev == NULL) {
+ ERROR("Can't open I2C device");
+ return NULL;
+ }
+
+ if (as_i2c_set_slave_addr(i2c_dev, anEeprom_addr) < 0)
+ {
+ ERROR("Can't set EEPROM address on I2C\n");
+ return NULL;
+ }
+
+ /* verify datas */
+ if (!((anAddr_width == 8) || (anAddr_width == 16)))
+ return NULL;
+ if (!((aPage_buffer_size == 16) || (aPage_buffer_size == 32)))
+ return NULL;
+ if (!((aNumber_pages == 1) || (aNumber_pages == 2) || (aNumber_pages == 4)))
+ return NULL;
+ if (!((aPage_size == 256) || (aPage_size == 8*1024)))
+ return NULL;
+
+ dev = (struct as_i2c_eeprom_device *)malloc(sizeof(struct as_i2c_eeprom_device));
+ if (dev == NULL)
+ {
+ ERROR("Can't allocate memory for I2C eeprom structure device\n");
+ return NULL;
+ }
+
+ /* fill in spidev structure */
+ dev->i2c_dev = i2c_dev;
+ dev->eeprom_addr = anEeprom_addr;
+ dev->addr_width = anAddr_width;
+ dev->page_buffer_size = aPage_buffer_size;
+ dev->number_pages = aNumber_pages;
+ dev->page_size = aPage_size;
+
+ return dev;
+}
+
+/** @brief close the device
+ *
+ * @param aDev i2c eeprom structure
+ *
+ */
+void as_i2c_eeprom_close(struct as_i2c_eeprom_device *aDev)
+{
+ as_i2c_close(aDev->i2c_dev);
+ free(aDev);
+}
+
+int32_t as_i2c_eeprom_read(struct as_i2c_eeprom_device *aDev, uint16_t aPage_number, uint8_t* aBuffer)
+{
+ int16_t len = 0;
+ uint8_t buffer[8*1024];
+
+ if (aPage_number > aDev->number_pages) {
+ aPage_number = aDev->number_pages;
+ ERROR("Wrong page number\n");
+ }
+
+ if (aDev->addr_width == 8) {
+ buffer[0] = 0;
+ len = 1;
+ } else { // 16
+ buffer[0] = 0;
+ buffer[1] = 0;
+ len = 2;
+ }
+
+ if (as_i2c_set_slave_addr(aDev->i2c_dev, aDev->eeprom_addr) < 0)
+ {
+ ERROR("Can't set EEPROM address on I2C\n");
+ return -1;
+ }
+
+ if (as_i2c_write(aDev->i2c_dev, buffer, len) < 0)
+ {
+ ERROR("Can't write on I2C EEPROM\n");
+ return -1;
+ }
+
+ if (as_i2c_set_slave_addr(aDev->i2c_dev, aDev->eeprom_addr|aPage_number) < 0)
+ {
+ ERROR("Can't set EEPROM address on I2C\n");
+ return -1;
+ }
+
+ if (as_i2c_read(aDev->i2c_dev, buffer, 256) < 0)
+ {
+ ERROR("Can't read on I2C EEPROM\n");
+ return -1;
+ }
+
+ memcpy( aBuffer, buffer, 256 );
+
+ return 0;
+}
+
+int32_t as_i2c_eeprom_write(struct as_i2c_eeprom_device *aDev, uint16_t aPage_number, uint8_t* aBuffer, uint16_t aBuffer_size)
+{
+ int16_t nb_it = 0;
+ int16_t current_pos = 0;
+ int16_t msg_size = 0;
+ uint8_t buffer[8*1024];
+
+ if (aBuffer_size > aDev->page_size) {
+ ERROR("Size too long -> truncated to page size\n");
+ aBuffer_size = aDev->page_size;
+ }
+ // Only buffer size write (16 or 32) are taken into account
+ nb_it = aBuffer_size / aDev->page_buffer_size;
+
+ int16_t i;
+ for (i = 0; i < nb_it; i++)
+ {
+ if (aDev->addr_width == 8) {
+ buffer[0] = current_pos;
+ memcpy( buffer+1, aBuffer + current_pos, aDev->page_buffer_size );
+ msg_size = aDev->page_buffer_size+1;
+ } else { // 16
+ buffer[0] = 0;
+ buffer[1] = current_pos;
+ memcpy( buffer+2, aBuffer + current_pos, aDev->page_buffer_size );
+ msg_size = aDev->page_buffer_size+2;
+ }
+
+ if (as_i2c_set_slave_addr(aDev->i2c_dev, aDev->eeprom_addr|aPage_number) < 0)
+ {
+ ERROR("Can't set EEPROM address on I2C\n");
+ return -1;
+ }
+
+ if (as_i2c_write(aDev->i2c_dev, buffer, msg_size) < 0)
+ {
+ ERROR("Can't write on I2C EEPROM\n");
+ return -1;
+ }
+
+ usleep(3000);
+
+ current_pos += aDev->page_buffer_size;
+ }
+
+ return 0;
+}
diff --git a/target/packages/as_devices/c/as_i2c_eeprom.h b/target/packages/as_devices/c/as_i2c_eeprom.h
new file mode 100644
index 0000000..74d20db
--- /dev/null
+++ b/target/packages/as_devices/c/as_i2c_eeprom.h
@@ -0,0 +1,100 @@
+/*
+** THE ARMadeus Systems
+**
+** Copyright (C) 2012 The armadeus systems team
+** Jérémie Scheer <jer...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#ifndef AS_I2C_EEPROM_H_
+#define AS_I2C_EEPROM_H_
+
+
+/** @file
+ * @brief Provide standard commands to drive i2c eeprom (from microchip)
+ *
+ *
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <inttypes.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "as_i2c.h"
+
+/**
+ * Store eeprom parameters
+ */
+struct as_i2c_eeprom_device {
+ struct as_i2c_device *i2c_dev;
+ uint32_t eeprom_addr;
+ uint32_t addr_width;
+ uint32_t page_buffer_size;
+ uint16_t number_pages;
+ uint16_t page_size;
+};
+
+/** @brief open the device
+ *
+ * @param aBusNumber number of I2C bus used by EEPROM
+ * @param anEeprom_addr EEPROM address on I2C bus
+ * @param anAddr_width width of EEPROM address
+ * @param aPage_buffer_size size of the page write buffer
+ * @param aNumber_pages number of pages in EEPROM
+ * @param aPage_size page size
+ */
+struct as_i2c_eeprom_device * as_i2c_eeprom_open(int aBusNumber,
+ uint32_t anEeprom_addr,
+ uint32_t anAddr_width,
+ uint32_t aPage_buffer_size,
+ uint16_t aNumber_pages,
+ uint16_t aPage_size);
+
+/** @brief close the device
+ *
+ * @param aDev spidev structure
+ *
+ */
+void as_i2c_eeprom_close(struct as_i2c_eeprom_device *aDev);
+
+/** @brief Read an EEPROM page
+ *
+ * @param aDev EEPROM structure
+ * @param aPage_number page to read on
+ * @param aBuffer data buffer
+ */
+int32_t as_i2c_eeprom_read(struct as_i2c_eeprom_device *aDev, uint16_t aPage_number, uint8_t* aBuffer);
+
+/** @brief Write on an EEPROM page
+ *
+ * @param aDev EEPROM structure
+ * @param aPage_number page to write on
+ * @param aBuffer data buffer
+ * @param aBuffer_size data buffer size
+ */
+int32_t as_i2c_eeprom_write(struct as_i2c_eeprom_device *aDev, uint16_t aPage_number, uint8_t* aBuffer, uint16_t aBuffer_size);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* AS_I2C_EEPROM_H_ */
+
diff --git a/target/packages/as_devices/cpp/Makefile b/target/packages/as_devices/cpp/Makefile
index 592fbdb..c1344fc 100644
--- a/target/packages/as_devices/cpp/Makefile
+++ b/target/packages/as_devices/cpp/Makefile
@@ -14,6 +14,7 @@ OBJS += as_adc.o
OBJS += as_pwm.o
OBJS += as_backlight.o
OBJS += as_93lcxx.o
+OBJS += as_i2c_eeprom.o
OBJS += as_spi.o
diff --git a/target/packages/as_devices/cpp/as_backlight.cpp b/target/packages/as_devices/cpp/as_i2c_eeprom.cpp
similarity index 52%
copy from target/packages/as_devices/cpp/as_backlight.cpp
copy to target/packages/as_devices/cpp/as_i2c_eeprom.cpp
index 451bafa..7d8768c 100644
--- a/target/packages/as_devices/cpp/as_backlight.cpp
+++ b/target/packages/as_devices/cpp/as_i2c_eeprom.cpp
@@ -2,7 +2,7 @@
** THE ARMadeus Systems
**
** Copyright (C) 2012 The armadeus systems team
-** Jérémie Scheer <jer...@ar...>
+** Jérémie Scheer <jer...@ar...>
**
** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public
@@ -20,67 +20,49 @@
**
*/
-#include "as_backlight.hpp"
+#include "as_i2c_eeprom.hpp"
#include <iostream>
-AsBacklight::AsBacklight()
+AsI2CEeprom::AsI2CEeprom(int aBusNumber, unsigned long anEepromAddr, unsigned long anAddrWidth, \
+unsigned long aPageBufferSize, unsigned int aNumberPages, unsigned int aPageSize)
{
- mDev = as_backlight_open();
+ mDev = as_i2c_eeprom_open(aBusNumber, anEepromAddr, anAddrWidth, aPageBufferSize, aNumberPages, aPageSize);
}
-AsBacklight::~AsBacklight()
+AsI2CEeprom::~AsI2CEeprom()
{
- int ret;
-
if (mDev != NULL)
{
- ret = as_backlight_close(mDev);
- if (ret < 0)
- {
- std::cout<<"AsBacklight destruction error"<<std::endl;
- }
+ as_i2c_eeprom_close(mDev);
}
else
{
- std::cerr<<"AsBacklight device structure not allocated"<<std::endl;
- }
-}
-
-long AsBacklight::getActualBrightness() const
-{
- if (mDev != NULL)
- {
- return as_backlight_get_actual_brightness(mDev);
- }
- else
- {
- std::cerr<<"AsBacklight device structure not allocated"<<std::endl;
- return -1;
+ std::cerr<<"AsI2CEeprom device structure not allocated"<<std::endl;
}
}
-long AsBacklight::getMaxBrightness() const
+long AsI2CEeprom::read(unsigned int aPageNumber, unsigned char* aBuffer)
{
if (mDev != NULL)
{
- return as_backlight_get_max_brightness(mDev);
+ return as_i2c_eeprom_read(mDev, aPageNumber, aBuffer);
}
else
{
- std::cerr<<"AsBacklight device structure not allocated"<<std::endl;
+ std::cerr<<"AsI2CEeprom device structure not allocated"<<std::endl;
return -1;
}
}
-long AsBacklight::setBrightness(int aBrightness)
+long AsI2CEeprom::write(unsigned int aPageNumber, unsigned char* aBuffer, unsigned int aBufferSize)
{
if (mDev != NULL)
{
- return as_backlight_set_brightness(mDev, aBrightness);
+ return as_i2c_eeprom_write(mDev, aPageNumber, aBuffer, aBufferSize);
}
else
{
- std::cerr<<"AsBacklight device structure not allocated"<<std::endl;
+ std::cerr<<"AsI2CEeprom device structure not allocated"<<std::endl;
return -1;
}
}
diff --git a/target/packages/as_devices/cpp/as_backlight.hpp b/target/packages/as_devices/cpp/as_i2c_eeprom.hpp
similarity index 50%
copy from target/packages/as_devices/cpp/as_backlight.hpp
copy to target/packages/as_devices/cpp/as_i2c_eeprom.hpp
index b30904b..0c90d2c 100644
--- a/target/packages/as_devices/cpp/as_backlight.hpp
+++ b/target/packages/as_devices/cpp/as_i2c_eeprom.hpp
@@ -2,7 +2,7 @@
** THE ARMadeus Systems
**
** Copyright (C) 2012 The armadeus systems team
-** Jérémie Scheer <jer...@ar...>
+** Jérémie Scheer <jer...@ar...>
**
** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public
@@ -20,45 +20,41 @@
**
*/
-#ifndef AS_BACKLIGHT__HPP__
-#define AS_BACKLIGHT__HPP__
+#ifndef AS_I2C_EEPROM__HPP__
+#define AS_I2C_EEPROM__HPP___
-#include "as_backlight.h"
+#include "as_i2c_eeprom.h"
/**
- * C++ wrapper for Backlight device
+ * C++ wrapper for I2C EEPROM device
*/
-class AsBacklight
+class AsI2CEeprom
{
public:
/**
* Constructor
*/
- AsBacklight();
- virtual ~AsBacklight();
-
- /** @brief Get actual brightness
- *
- * @return actual brightness value, negative value on error
- */
- long getActualBrightness() const;
-
- /** @brief Get maximum brightness
- *
- * @return maximum allowed brightness, negative value on error
+ AsI2CEeprom(int aBusNumber, unsigned long anEepromAddr, unsigned long anAddrWidth, \
+unsigned long aPageBufferSize, unsigned int aNumberPages, unsigned int aPageSize);
+ virtual ~AsI2CEeprom();
+
+ /** @brief Read an EEPROM page
+ *
+ * @param aPageNumber page to read on
+ * @param aBuffer data buffer
*/
- long getMaxBrightness() const;
+ long read(unsigned int aPageNumber, unsigned char* aBuffer);
- /** @bief Set brightness
- *
- * @param aBrightness backlight brightness
- *
- * @return negative value on error
- */
- long setBrightness(int aBrightness);
+ /** @brief Write on an EEPROM page
+ *
+ * @param aPageNumber page to write on
+ * @param aBuffer data buffer
+ * @param aBufferSize data buffer size
+ */
+ long write(unsigned int aPageNumber, unsigned char* aBuffer, unsigned int aBufferSize);
protected:
- mutable struct as_backlight_device *mDev;
+ mutable struct as_i2c_eeprom_device *mDev;
};
-#endif // AS_BACKLIGHT__HPP__
+#endif // AS_I2C_EEPROM__HPP__
diff --git a/target/packages/as_devices/main.c b/target/packages/as_devices/main.c
index b0debbf..a87afbf 100644
--- a/target/packages/as_devices/main.c
+++ b/target/packages/as_devices/main.c
@@ -45,7 +45,8 @@ int main(int argc, char ** argv)
printf(" 6) max1027\n");
printf(" 7) max5821\n");
printf(" 8) as1531\n");
- printf(" 9) backlight\n");
+ printf(" 9) backlight\n");
+ printf(" a) i2c eeprom\n");
printf("> ");
scanf("%s",buffer);
@@ -69,6 +70,8 @@ int main(int argc, char ** argv)
break;
case '9' : test_backlight();
break;
+ case 'a': test_i2c_eeprom();
+ break;
default : break;
}
}
diff --git a/target/packages/as_devices/test_c.h b/target/packages/as_devices/test_c.h
index 3f9d8aa..859118c 100644
--- a/target/packages/as_devices/test_c.h
+++ b/target/packages/as_devices/test_c.h
@@ -31,6 +31,7 @@
#include "as_adc.h"
#include "as_dac.h"
#include "as_backlight.h"
+#include "as_i2c_eeprom.h"
#include "as_helpers.h"
#define PWM_NUM 0
@@ -869,3 +870,168 @@ void test_backlight(void)
return;
}
}
+
+void test_i2c_eeprom()
+{
+ unsigned char page_buffer[500];
+ char buffer[50];
+ int i;
+
+ /* defaults values */
+ int bus_number = 0;
+ unsigned long eeprom_addr = 0x50;
+ unsigned long addr_width = 8;
+ unsigned long page_buffer_size = 16;
+ unsigned int number_pages = 2;
+ unsigned int page_size = 256;
+
+ struct as_i2c_eeprom_device *dev;
+
+ int value, value2;
+ int initialized=0;
+
+ while(buffer[0] != 'q')
+ {
+ system("clear");
+ printf("*********************************\n");
+ printf("* Testing I2C EEPROM menu *\n");
+ printf("*********************************\n");
+ printf("Choose ('q' to quit):\n");
+ if (initialized == 0)
+ {
+ printf(" 1) Change I2C bus number (%d)\n", bus_number);
+ printf(" 2) Change eeprom address (%d)\n", eeprom_addr);
+ printf(" 3) Change eeprom address width (%d)\n", addr_width);
+ printf(" 4) Change page write buffer size (%d)\n", page_buffer_size);
+ printf(" 5) Change number of pages (%d)\n", number_pages);
+ printf(" 6) Change page size (%d)\n", page_size);
+ printf(" 7) Initialize eeprom\n");
+ } else {
+ printf(" 1) Close eeprom\n");
+ printf(" 2) Read specific page\n");
+ printf(" 3) Write on specific page\n");
+ }
+
+ printf("> ");
+ scanf("%s",buffer);
+
+ if (initialized == 0)
+ {
+ switch(buffer[0])
+ {
+ case '1' : printf("Give new I2C bus number (0 or 1): ");
+ scanf("%d", &value);
+ if ( (value != 0) && (value != 1) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ bus_number = value;
+ printf("Bus number changed to %d\n", bus_number);
+ }
+ break;
+ case '2' : printf("Give eeprom address: ");
+ scanf("%d", &value);
+ eeprom_addr = value;
+ printf("Eeprom address changed to %d\n", eeprom_addr);
+ break;
+ case '3' : printf("Give eeprom address width: ");
+ scanf("%d", &value);
+ if ( (value != 8) && (value != 16) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ addr_width = value;
+ printf("Eeprom address width changed to %d\n", addr_width);
+ }
+ break;
+ case '4' : printf("Give new page write buffer size (16 or 32): ");
+ scanf("%d", &value);
+ if ( (value != 16) && (value != 32) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ page_buffer_size = value;
+ printf("Page write buffer size changed to %d\n", page_buffer_size);
+ }
+ break;
+ case '5' : printf("Give number of pages: \n");
+ scanf("%d", &value);
+ if ( (value != 1) && (value != 2) && (value != 4) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ number_pages = value;
+ printf("Number of pages changed to %d\n", number_pages);
+ }
+ break;
+ case '6' : printf("Give page size: \n");
+ scanf("%d", &value);
+ page_size = value;
+ printf("Page size changed to %d\n", page_size);
+ break;
+ case '7' : dev = as_i2c_eeprom_open(bus_number, eeprom_addr, addr_width, page_buffer_size, number_pages, page_size);
+ if (dev == NULL)
+ {
+ printf("Error, can't initialize eeprom.\n");
+ } else {
+ initialized = 1;
+ }
+ pressEnterToContinue();
+ break;
+ default : break;
+ }
+ } else {
+ switch(buffer[0])
+ {
+ case '1' : as_i2c_eeprom_close(dev);
+ printf("eeprom closed\n");
+ initialized = 0;
+ pressEnterToContinue();
+ break;
+ case '2' : printf(" Read specific page\n");
+ printf("Give page number (max. %d):",
+ number_pages);
+ scanf("%d",&value);
+ if (value > number_pages)
+ {
+ printf(" Error, wrong page number\n");
+ } else {
+ value2 = as_i2c_eeprom_read(dev, value, page_buffer);
+ if (value2 < 0)
+ {
+ printf("Error, can't read eeprom page\n");
+ } else {
+ printf(" Read %s at page %d", page_buffer, value );
+ }
+ }
+ pressEnterToContinue();
+ break;
+ case '3' : printf("Write on specific page\n");
+ printf("Give page number (max. %d):",
+ number_pages);
+ scanf("%d",&value);
+ if (value > number_pages)
+ {
+ printf(" Error, wrong page number\n");
+ pressEnterToContinue();
+ break;
+ }
+ printf("Give data to write :");
+ scanf("%s",page_buffer);
+ value2 = as_i2c_eeprom_write(dev, value, page_buffer, 500);
+ if (value2 < 0)
+ {
+ printf("Error, can't write on page\n");
+ }
+ pressEnterToContinue();
+ break;
+ default : break;
+ }
+ }
+ }
+}
+
diff --git a/target/packages/as_devices/test_cpp.h b/target/packages/as_devices/test_cpp.h
index a3c0be1..934b325 100644
--- a/target/packages/as_devices/test_cpp.h
+++ b/target/packages/as_devices/test_cpp.h
@@ -33,6 +33,7 @@
#include "as_pwm.hpp"
#include "as_93lcxx.hpp"
#include "as_backlight.hpp"
+#include "as_i2c_eeprom.hpp"
#define _STR(x) #x
@@ -904,3 +905,167 @@ void test_as1531(void)
pressEnterToContinue();
}
+void test_i2c_eeprom()
+{
+ unsigned char page_buffer[500];
+ char buffer[50];
+ int i;
+
+ /* defaults values */
+ int bus_number = 0;
+ unsigned long eeprom_addr = 0x50;
+ unsigned long addr_width = 8;
+ unsigned long page_buffer_size = 16;
+ unsigned int number_pages = 2;
+ unsigned int page_size = 256;
+
+ AsI2CEeprom* dev = NULL;
+
+ int value, value2;
+ int initialized=0;
+
+ while(buffer[0] != 'q')
+ {
+ system("clear");
+ printf("*********************************\n");
+ printf("* Testing I2C EEPROM menu *\n");
+ printf("*********************************\n");
+ printf("Choose ('q' to quit):\n");
+ if (initialized == 0)
+ {
+ printf(" 1) Change I2C bus number (%d)\n", bus_number);
+ printf(" 2) Change eeprom address (%d)\n", eeprom_addr);
+ printf(" 3) Change eeprom address width (%d)\n", addr_width);
+ printf(" 4) Change page write buffer size (%d)\n", page_buffer_size);
+ printf(" 5) Change number of pages (%d)\n", number_pages);
+ printf(" 6) Change page size (%d)\n", page_size);
+ printf(" 7) Initialize eeprom\n");
+ } else {
+ printf(" 1) Close eeprom\n");
+ printf(" 2) Read specific page\n");
+ printf(" 3) Write on specific page\n");
+ }
+
+ printf("> ");
+ scanf("%s",buffer);
+
+ if (initialized == 0)
+ {
+ switch(buffer[0])
+ {
+ case '1' : printf("Give new I2C bus number (0 or 1): ");
+ scanf("%d", &value);
+ if ( (value != 0) && (value != 1) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ bus_number = value;
+ printf("Bus number changed to %d\n", bus_number);
+ }
+ break;
+ case '2' : printf("Give eeprom address: ");
+ scanf("%d", &value);
+ eeprom_addr = value;
+ printf("Eeprom address changed to %d\n", eeprom_addr);
+ break;
+ case '3' : printf("Give eeprom address width: ");
+ scanf("%d", &value);
+ if ( (value != 8) && (value != 16) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ addr_width = value;
+ printf("Eeprom address width changed to %d\n", addr_width);
+ }
+ break;
+ case '4' : printf("Give new page write buffer size (16 or 32): ");
+ scanf("%d", &value);
+ if ( (value != 16) && (value != 32) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ page_buffer_size = value;
+ printf("Page write buffer size changed to %d\n", page_buffer_size);
+ }
+ break;
+ case '5' : printf("Give number of pages: \n");
+ scanf("%d", &value);
+ if ( (value != 1) && (value != 2) && (value != 4) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ number_pages = value;
+ printf("Number of pages changed to %d\n", number_pages);
+ }
+ break;
+ case '6' : printf("Give page size: \n");
+ scanf("%d", &value);
+ page_size = value;
+ printf("Page size changed to %d\n", page_size);
+ break;
+ case '7' : dev = new AsI2CEeprom(bus_number, eeprom_addr, addr_width, page_buffer_size, number_pages, page_size);
+ if (dev == NULL)
+ {
+ printf("Error, can't initialize eeprom.\n");
+ } else {
+ initialized = 1;
+ }
+ pressEnterToContinue();
+ break;
+ default : break;
+ }
+ } else {
+ switch(buffer[0])
+ {
+ case '1' : ;
+ printf("eeprom closed\n");
+ delete dev;
+ initialized = 0;
+ pressEnterToContinue();
+ break;
+ case '2' : printf(" Read specific page\n");
+ printf("Give page number (max. %d):",
+ number_pages);
+ scanf("%x",&value);
+ if (value > number_pages)
+ {
+ printf(" Error, wrong page number\n");
+ } else {
+ value2 = dev->read(value, page_buffer);
+ if (value2 < 0)
+ {
+ printf("Error, can't read eeprom page\n");
+ } else {
+ printf(" Read %s at page %d", page_buffer, value );
+ }
+ }
+ pressEnterToContinue();
+ break;
+ case '3' : printf("Write on specific page\n");
+ printf("Give page number (max. %d):",
+ number_pages);
+ scanf("%d",&value);
+ if (value > number_pages)
+ {
+ printf(" Error, wrong page number\n");
+ pressEnterToContinue();
+ break;
+ }
+ printf("Give data to write :");
+ scanf("%s",page_buffer);
+ value2 = dev->write(value, page_buffer, 500);
+ if (value2 < 0)
+ {
+ printf("Error, can't write on page\n");
+ }
+ pressEnterToContinue();
+ break;
+ default : break;
+ }
+ }
+ }
+}
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-10-08 18:59:14
|
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 2ace8d34b8277745533592480308414a90c3beb1 (commit)
via 3f8405d9ef3b07e318e41fc71f3b2d16bfa1f7fc (commit)
from 8edff5963f1d2d5fbaa270e023d64cf1a330280d (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 2ace8d34b8277745533592480308414a90c3beb1
Merge: 3f8405d 8edff59
Author: Julien Boibessot <jul...@ar...>
Date: Mon Oct 8 20:58:21 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 3f8405d9ef3b07e318e41fc71f3b2d16bfa1f7fc
Author: Julien Boibessot <jul...@ar...>
Date: Mon Oct 8 20:36:36 2012 +0200
[LINUX] apf28: 3.6.1 is out, so use it as experimental kernel
-----------------------------------------------------------------------
Summary of changes:
...nux-3.6-rc6.config => apf28-linux-3.6.1.config} | 0
patches/linux/{3.6-rc6 => 3.6.1} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.6-rc6.config => apf28-linux-3.6.1.config} (100%)
rename patches/linux/{3.6-rc6 => 3.6.1} (100%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6-rc6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.6-rc6.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.6.1.config
diff --git a/patches/linux/3.6-rc6 b/patches/linux/3.6.1
similarity index 100%
rename from patches/linux/3.6-rc6
rename to patches/linux/3.6.1
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2012-10-08 14:25:31
|
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 8edff5963f1d2d5fbaa270e023d64cf1a330280d (commit)
via 2fe60551c87e1937fe5a3b3dbfecb1a302a46875 (commit)
from ea61c311139e6cdf810f428d673b986d06d91985 (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 8edff5963f1d2d5fbaa270e023d64cf1a330280d
Merge: 2fe6055 ea61c31
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Oct 8 16:24:49 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 2fe60551c87e1937fe5a3b3dbfecb1a302a46875
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Oct 8 16:24:10 2012 +0200
[PACKAGES][AS_DEVICES] Doxyfile for As Devices.
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/Doxyfile | 1572 +++++++++++++++++++++++++++++++++++
1 files changed, 1572 insertions(+), 0 deletions(-)
create mode 100644 target/packages/as_devices/Doxyfile
diff --git a/target/packages/as_devices/Doxyfile b/target/packages/as_devices/Doxyfile
new file mode 100644
index 0000000..cbca69b
--- /dev/null
+++ b/target/packages/as_devices/Doxyfile
@@ -0,0 +1,1572 @@
+# Doxyfile 1.6.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME = Armadeus BSP - As Devices
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER = 1.0
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY =
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF = "The $name class" \
+ "The $name widget" \
+ "The $name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH = ./
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses.
+# With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this tag.
+# The format is ext=language, where ext is a file extension, and language is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
+# doxygen. The layout file controls the global structure of the generated output files
+# in an output format independent way. The create the layout file that represents
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name
+# of the layout file.
+
+LAYOUT_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT = .
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS = *.c \
+ *.cc \
+ *.cxx \
+ *.cpp \
+ *.c++ \
+ *.d \
+ *.java \
+ *.ii \
+ *.ixx \
+ *.ipp \
+ *.i++ \
+ *.inl \
+ *.h \
+ *.hh \
+ *.hxx \
+ *.hpp \
+ *.h++ \
+ *.idl \
+ *.odl \
+ *.cs \
+ *.php \
+ *.php3 \
+ *.inc \
+ *.m \
+ *.mm \
+ *.dox \
+ *.py \
+ *.C \
+ *.CC \
+ *.C++ \
+ *.II \
+ *.I++ \
+ *.H \
+ *.HH \
+ *.H++ \
+ *.CS \
+ *.PHP \
+ *.PHP3 \
+ *.M \
+ *.MM \
+ *.PY \
+ *.C \
+ *.H \
+ *.tlh \
+ *.diff \
+ *.patch \
+ *.moc \
+ *.xpm \
+ *.dox
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 10
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = ./documentation
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = YES
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
+# are set, an additional index file will be generated that can be used as input for
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
+# HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE =
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
+# For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION =
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW = NO
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE = 10
+
+# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
+# there is already a search function so this one should typically
+# be disabled.
+
+SEARCHENGINE = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE = scf.tag
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2012-10-08 13:49:55
|
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 ea61c311139e6cdf810f428d673b986d06d91985 (commit)
from ae2fe75b0934aa47540949bebf464a644db87411 (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 ea61c311139e6cdf810f428d673b986d06d91985
Author: Eric Jarrige <eri...@ar...>
Date: Mon Oct 8 15:53:07 2012 +0200
[OTHER] start software GIT development for the next release
-----------------------------------------------------------------------
Summary of changes:
.../rootfs/target_skeleton/etc/armadeus-version | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
index a75b92f..c9e0504 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
@@ -1 +1 @@
-5.1
+5.2-devt-git
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-08 13:43:11
|
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 annotated tag, armadeus-5.1 has been created
at 228f70bf668d553f4ddc066f5c6727a72361729a (tag)
tagging ae2fe75b0934aa47540949bebf464a644db87411 (commit)
replaces armadeus-5.0
tagged by Eric Jarrige
on Mon Oct 8 15:45:03 2012 +0200
- Log -----------------------------------------------------------------
Create TAG for release armadeus-5.1
Eric Jarrige (30):
[LINUX] apf28: cleanup USB patchwork
[LINUX] apf28: Support RAM frequency scaling options: DDR2, mDDR and disable RAM frequency scaling
[LINUX] apf28: Disable RAM frequency scaling - Fix USB, ethernet.. random crashes - Use CPUFreq governor ondemand as default config
[BUILDROOT] update BR cleanup script
[LINUX] APF28: update kernel 2.6.35 up to fresscale tag rel_imx_2.6.35_11.09.01
[LINUX] APF28: Support kernel 2.6.35 USB OTG
[LINUX] apf28: Fix mx28 16 bits video modes (blue pingouin issue)
[LINUX] apf28: add mx28 pwm driver
[LINUX] apf28: add armadeus custom drivers
[LINUX] apf28: enable PWM 4 on connector J10 pin 26
[LINUX] apf27: linux 2.6.38: Apply patch 344 from kernel 2.6.29 - fix potential UART hang up on shutdown (Thx Gael)
[linux] apf27 default config for kernel 2.6.29
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[UBOOT] 2012.04: fix bug when programming huge files (>32MiB) to NAND
[LINUX] apf28: add MXS lradc hwmon driver for kernel 2.6.35
[LINUX] apf28: 2.6.35.3: enable ADC feature on pins LRADC0 and LRADC1
[LINUX] apf28: 2.6.35: fix USB connection hang after system supsend/resume
[LINUX] apf28: 2.6.35: add armadeus project tux logo
[DEBUG] imxregs: add imx28 USB registers
[TOOLS] apf28: update uboot_recover with uboot 2012.04.01 patch 1.7
[TOOLS] apf27: update uboot_recover with uboot 2012.04.01 patch 3.7
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[TOOLS] apf51: update uboot_recover with uboot 2012.04.01 patch 1.7
[TOOLS] apf9328: update uboot_recover with uboot 2012.04.01 patch 5.7
[LINUX] apf28: fix kernel 2.6.35 video flickering
[TEST] apf28: update linux testsuite
[TEST] apf28: update BSP testsuite
[LINUX] apf28: fix SD/MMC reliability and capalities
[TEST] apf28: update BSP testsuite
Update release files for Armadeus-5.1
Fabien Marteau (5):
[as_devices] fix blockingGetPinValue parameters in ms
[kernel][fpga][virtual_component] delete useless temporarly file
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[as_devices] Fix closing file bug in as_gpio_wait_event, thanks to brett.muir
[as_devices] replace TAB by four spaces
Gwenhael Goavec-Merou (17):
[LINUX][3.5] mx28: enable fec phy clock
[LINUX][3.5] apf28 dts: add fec reset gpio definition
[LINUX][3.5] imx28: renames gpmi-nand clock
[LINUX][3.5] apf28 dts: add nand partitions definition
[LINUX][3.5] imx28: suppress now useless 0001 patch
[LINUX][3.5] apf28 config: selects GPMI NAND by default
[LINUX][3.5] APF28: Backport patches for SPI drivers integration
[LINUX][3.5] mx28: Select MXS_HAVE_PLATFORM_MXS_SPI for SOC_IMX28
[LINUX][3.5] apf28 dts: Add support for ssp0 as MMC and ssp2 as SPI
[LINUX][3.5] apf28 config: Select SPI by default
[LINUX][3.6] 0404 source cleanup
[LINUX][3.6] suppress useless patch 0405
[LINUX][3.6] import patches 0406, 0407, 0408, 0409, 0412, 0414, 0415, 0416, 0417 from 3.5
[LINUX][3.6] adapt patches 0410, 0411, 0413 from 3.5
[LINUX][3.6] mx28: Backport patches for LRADC integration
[LINUX][3.6] apf28-dev dts: Add support for LRADC
[LINUX][3.6] apf28 config: Select IIO, staging and LRADC by default
Jeremie Scheer (7):
[BUILDROOT] Remove QWS_CURSOR option in Qt package - patch 132.
[BUILDROOT][AS_DEVICES] C++ wrapper for PWM device.
[PACKAGE][AS_DEVICES] Fix PWM C++ source indentations.
[PACKAGES][AS_DEVICES] Backlight device manager and C++ wrapper.
[PACKAGES][AS_DEVICES] C++ wrapper for 93LCXX EEPROM device.
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[PACKAGES][AS_DEVICES] Test scripts for backlight, eeprom and PWM C++ wrappers.
Julien Boibessot (11):
After release stuff
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Move 3.x support to 3.6-rc6 (part 1)
[LINUX] Move 3.x support to 3.6-rc6 (part 2)
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] 3.6: add apf28dev support (LCD, backlight & USB host working). APF28 & APF28Dev now have disctincts DTS
[LINUX] 3.6 APF28Dev DT: Fixes MMC declaration and do not put SPI2 in spidev mode by default
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[LINUX] Removes useless 3.5 patches
[BUILDROOT] Fixes pppd build with recent linux kernels (BR mainline backport)
[BUILDROOT] linux-firmware: add new version of wl12xx firmware
Kevin JOLY (2):
Add pod_pwm driver to virtual_components
Add pod_servo driver to virtual_components
Samuel Martin (1):
fix host-tar and host-m4 build on systems based on glibc-2.16 or later
brett.muir (1):
[as_devices] allow blockingGetPinValue function to be used under python thread
-----------------------------------------------------------------------
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-08 13:43:08
|
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 ae2fe75b0934aa47540949bebf464a644db87411 (commit)
from def71f177c47b880986104506a5db6ad56adf5a8 (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 ae2fe75b0934aa47540949bebf464a644db87411
Author: Eric Jarrige <eri...@ar...>
Date: Mon Oct 8 15:43:07 2012 +0200
Update release files for Armadeus-5.1
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 98 ++++++++++++++++++++
.../rootfs/target_skeleton/etc/armadeus-version | 2 +-
2 files changed, 99 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d2c1d97..610e68e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,101 @@
+----
+
+Changes in armadeus-5.1 (Mon Oct 8 15:02:31 CEST 2012)
+
+* Wiki dump available here: http://www.armadeus.com/assos_downloads/wiki/armadeus-5.1_wiki_dump.tar.gz
+
+* Corrected Tickets/Bugs:
+ - #3573311 Suggestion: Py_BEGIN_ALLOW_THREADS in blockingGetPinValue
+ - #3573310 AsDevices as_gpio_wait_event opens file but does not close
+ - #3569139 AsGpio.blockingGetPinValue: incorrect parameters to wrapper
+
+* Buildroot:
+ - linux-firmware: add new version of wl12xx firmware
+ - Fixes pppd build with recent linux kernels (BR mainline backport)
+ - update BR cleanup script
+ - Remove QWS_CURSOR option in Qt package - patch 132.
+ - fix host-tar and host-m4 build on systems based on glibc-2.16 or later
+
+* Linux:
+ Main changes:
+ - finalize reference linux kernel 2.6.35 for the APF28
+ - start APF28 migration to kernel 3.6
+
+ List of all changes:
+ - apf28: fix SD/MMC reliability and capalities
+ - apf28: fix kernel 2.6.35 video flickering
+ - Removes useless 3.5 patches
+ - 3.6 APF28Dev DT: Fixes MMC declaration and do not put SPI2 in spidev mode by default
+ -[3.6] apf28 config: Select IIO, staging and LRADC by default
+ -[3.6] apf28-dev dts: Add support for LRADC
+ -[3.6] mx28: Backport patches for LRADC integration
+ - apf28: 2.6.35: add armadeus project tux logo
+ - apf28: 2.6.35: fix USB connection hang after system supsend/resume
+ - 3.6: add apf28dev support (LCD, backlight & USB host working). APF28 & APF28Dev now have disctincts DTS
+ -[3.6] adapt patches 0410, 0411, 0413 from 3.5
+ -[3.6] import patches 0406, 0407, 0408, 0409, 0412, 0414, 0415, 0416, 0417 from 3.5
+ -[3.6] suppress useless patch 0405
+ -[3.6] 0404 source cleanup
+ - Move 3.x support to 3.6-rc6 (part 2)
+ -[3.5] apf28 config: Select SPI by default
+ -[3.5] apf28 dts: Add support for ssp0 as MMC and ssp2 as SPI
+ -[3.5] mx28: Select MXS_HAVE_PLATFORM_MXS_SPI for SOC_IMX28
+ -[3.5] APF28: Backport patches for SPI drivers integration
+ - Move 3.x support to 3.6-rc6 (part 1)
+ - apf28: 2.6.35.3: enable ADC feature on pins LRADC0 and LRADC1
+ - apf28: add MXS lradc hwmon driver for kernel 2.6.35
+ - apf27 default config for kernel 2.6.29
+ - apf27: linux 2.6.38: Apply patch 344 from kernel 2.6.29 - fix potential UART hang up on shutdown (Thx Gael)
+ - apf28: enable PWM 4 on connector J10 pin 26
+ - apf28: add armadeus custom drivers
+ - apf28: add mx28 pwm driver
+ - apf28: Fix mx28 16 bits video modes (blue pingouin issue)
+ - APF28: Support kernel 2.6.35 USB OTG
+ - APF28: update kernel 2.6.35 up to fresscale tag rel_imx_2.6.35_11.09.01
+ -[3.5] apf28 config: selects GPMI NAND by default
+ -[3.5] imx28: suppress now useless 0001 patch
+ -[3.5] apf28 dts: add nand partitions definition
+ -[3.5] imx28: renames gpmi-nand clock
+ -[3.5] apf28 dts: add fec reset gpio definition
+ -[3.5] mx28: enable fec phy clock
+ - apf28: Disable RAM frequency scaling - Fix USB, ethernet.. random crashes - Use CPUFreq governor ondemand as default config
+ - apf28: Support RAM frequency scaling options: DDR2, mDDR and disable RAM frequency scaling
+ - apf28: cleanup USB patchwork
+ - [kernel][fpga][virtual_component] delete useless temporarly file
+ - Add pod_servo driver to virtual_components
+ - Add pod_pwm driver to virtual_components
+
+* U-Boot:
+ - 2012.04: fix bug when programming huge files (>32MiB) to NAND
+
+* Firmware:
+
+* Demos:
+
+* Debug:
+ - imxregs: add imx28 USB registers
+
+* Test:
+ - apf28: update BSP testsuite
+ - apf28: update BSP testsuite
+ - apf28: update linux testsuite
+
+* Tools:
+ - apf9328: update uboot_recover with uboot 2012.04.01 patch 5.7
+ - apf51: update uboot_recover with uboot 2012.04.01 patch 1.7
+ - apf27: update uboot_recover with uboot 2012.04.01 patch 3.7
+ - apf28: update uboot_recover with uboot 2012.04.01 patch 1.7
+
+* As_Devices:
+ - Test scripts for backlight, eeprom and PWM C++ wrappers.
+ - C++ wrapper for 93LCXX EEPROM device.
+ - allow blockingGetPinValue function to be used under python thread
+ - Backlight device manager and C++ wrapper.
+ - replace TAB by four spaces
+ - Fix closing file bug in as_gpio_wait_event, thanks to brett.muir
+ - Fix PWM C++ source indentations.
+ - fix blockingGetPinValue parameters in ms
+ - C++ wrapper for PWM device.
----
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
index 0ccb242..a75b92f 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
@@ -1 +1 @@
-5.1-devt-git
+5.1
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-08 12:39:12
|
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 def71f177c47b880986104506a5db6ad56adf5a8 (commit)
from 1d49681bf7a89cfff62139808d1a10b01360069d (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 def71f177c47b880986104506a5db6ad56adf5a8
Author: Eric Jarrige <eri...@ar...>
Date: Mon Oct 8 14:42:22 2012 +0200
[TEST] apf28: update BSP testsuite
-----------------------------------------------------------------------
Summary of changes:
target/test/test_adc.sh | 17 +++++++++++++++++
target/test/test_gpio.sh | 15 ++++++++++++---
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/target/test/test_adc.sh b/target/test/test_adc.sh
index 495be82..fd7e378 100755
--- a/target/test/test_adc.sh
+++ b/target/test/test_adc.sh
@@ -27,6 +27,8 @@ test_setup()
elif [ "$1" == "APF51" ]; then
modprobe hwmon
modprobe as1531
+ elif [ "$1" == "APF28" ]; then
+ ask_user "Connect (jumper) pin 38 (LRADC0) and 40 (GND) of the connector j10, then press ENTER"
else
echo "Platform not supported by this test"
fi
@@ -72,6 +74,19 @@ test_running_as1531()
return 0
}
+test_running_lradc()
+{
+ VALUE=`cat /sys/class/hwmon/hwmon0/device/in0_input`
+ if [ "$VALUE" -gt 15 ]; then
+ exit_failed
+ fi
+ VALUE=`cat /sys/class/hwmon/hwmon0/device/in1_input`
+ if [ "$VALUE" -lt 16 ]; then
+ exit_failed
+ fi
+ return 0
+}
+
test_running()
{
if [ "$1" == "APF9328" ]; then
@@ -80,6 +95,8 @@ test_running()
test_running_max1027
elif [ "$1" == "APF51" ]; then
test_running_as1531
+ elif [ "$1" == "APF28" ]; then
+ test_running_lradc
else
echo "Platform not supported by this test"
fi
diff --git a/target/test/test_gpio.sh b/target/test/test_gpio.sh
index 9c4c3bf..567d9ef 100755
--- a/target/test/test_gpio.sh
+++ b/target/test/test_gpio.sh
@@ -22,7 +22,7 @@ load_module()
echo "Module failed to load"
exit_failed
fi
- elif [ "$1" == "APF51" ]; then
+ elif [ "$1" == "APF51" ] || [ "$1" == "APF28" ]; then
echo
else
echo "Platform not supported by this test"
@@ -34,7 +34,7 @@ unload_module()
{
if [ "$1" == "APF9328" ] || [ "$1" == "APF27" ]; then
rmmod gpio
- elif [ "$1" == "APF51" ]; then
+ elif [ "$1" == "APF51" ] || [ "$1" == "APF28" ]; then
echo
else
echo "Platform not supported by this test"
@@ -88,6 +88,15 @@ blink_led()
elif [ "$1" == "APF51" ]; then
LED_NAME="i.MX"
blink_led_gpiolib 2
+ elif [ "$1" == "APF28" ]; then
+ echo gpio > /sys/class/leds/apfdev\:green\:user/trigger
+ echo 1 > /sys/class/leds/apfdev\:green\:user/gpio
+ for i in `seq 0 5`; do
+ echo 0 > /sys/class/leds/apfdev\:green\:user/brightness
+ usleep 500000
+ cat /sys/class/leds/apfdev\:green\:user/max_brightness > /sys/class/leds/apfdev\:green\:user/brightness
+ usleep 500000
+ done
else
echo "Platform not supported by this test"
fi
@@ -105,7 +114,7 @@ check_button()
if [ "$?" != 0 ]; then
exit_failed
fi
- elif [ "$1" == "APF51" ]; then
+ elif [ "$1" == "APF51" ] || [ "$1" == "APF28" ]; then
echo "TBDL"
else
echo "Platform not supported by this test"
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-08 10:34:04
|
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 1d49681bf7a89cfff62139808d1a10b01360069d (commit)
from 095aac27d5b3fd0baeb0eee052659339627dcfb2 (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 1d49681bf7a89cfff62139808d1a10b01360069d
Author: Eric Jarrige <eri...@ar...>
Date: Mon Oct 8 12:36:45 2012 +0200
[LINUX] apf28: fix SD/MMC reliability and capalities
-----------------------------------------------------------------------
Summary of changes:
...1-armadeus-add_apf28dev_baseboard_support.patch | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index 3083e19..8144466 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -354,7 +354,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ .name = "SSP0_SCK",
+ .id = PINID_SSP0_SCK,
+ .fun = PIN_FUN1,
-+ .strength = PAD_8MA,
++ .strength = PAD_12MA,
+ .voltage = PAD_3_3V,
+ .pullup = 0,
+ .drive = 1,
@@ -1031,7 +1031,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+static struct mxs_mmc_platform_data mmc0_data = {
+ .cmd_pullup = mxs_mmc_cmd_pullup_ssp0,
+ .setclock = mxs_mmc_setclock_ssp0,
-+ .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA
++ .caps = MMC_CAP_4_BIT_DATA
+ | MMC_CAP_DATA_DDR,
+ .min_clk = 400000,
+ .max_clk = 48000000,
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-04 15:23:48
|
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 095aac27d5b3fd0baeb0eee052659339627dcfb2 (commit)
from b2f35a5763cc220ff59844877d1140012041b64d (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 095aac27d5b3fd0baeb0eee052659339627dcfb2
Author: Eric Jarrige <eri...@ar...>
Date: Thu Oct 4 17:26:58 2012 +0200
[TEST] apf28: update BSP testsuite
-----------------------------------------------------------------------
Summary of changes:
target/test/test_rs232.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/target/test/test_rs232.sh b/target/test/test_rs232.sh
index 074bc27..8f04961 100755
--- a/target/test/test_rs232.sh
+++ b/target/test/test_rs232.sh
@@ -91,7 +91,7 @@ PORTS="$1"
if [ "$1" == "" ]; then
echo "Please give the port number to test !"
execute_for_target echo_available_ports
- read -p "> " PORT
+ read -p "> " PORTS
[ "$PORTS" == "" ] && exit_failed
fi
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-04 15:05:13
|
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 b2f35a5763cc220ff59844877d1140012041b64d (commit)
from ff186dd6969eba5d3500984b685ec063971f4d53 (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 b2f35a5763cc220ff59844877d1140012041b64d
Author: Eric Jarrige <eri...@ar...>
Date: Thu Oct 4 17:08:27 2012 +0200
[TEST] apf28: update linux testsuite
-----------------------------------------------------------------------
Summary of changes:
target/test/test_audio.sh | 1 +
target/test/test_ethernet.sh | 3 +--
target/test/test_pwm.sh | 8 ++++++++
target/test/test_rs232.sh | 11 +++++++----
target/test/test_usb_device.sh | 2 +-
target/test/test_usb_host.sh | 4 ++++
6 files changed, 22 insertions(+), 7 deletions(-)
mode change 100644 => 100755 target/test/test_backlight.sh
mode change 100644 => 100755 target/test/test_helpers.sh
diff --git a/target/test/test_audio.sh b/target/test/test_audio.sh
index c40f6f3..7e2655c 100755
--- a/target/test/test_audio.sh
+++ b/target/test/test_audio.sh
@@ -32,6 +32,7 @@ test_init()
amixer cset numid=5 116,116 # Headphone Playback Volume
else
echo "Platform not supported by this test"
+ exit 0
fi
}
diff --git a/target/test/test_backlight.sh b/target/test/test_backlight.sh
old mode 100644
new mode 100755
diff --git a/target/test/test_ethernet.sh b/target/test/test_ethernet.sh
index 87185ca..8ef0515 100755
--- a/target/test/test_ethernet.sh
+++ b/target/test/test_ethernet.sh
@@ -67,9 +67,8 @@ test_ethernet()
echo " Uploading"
time tftp -p -l $TEMP_FILE -r `basename $TEMP_FILE` $SERVER_IP 2>/tmp/writetime
sleep 3 # For TFTP server on windoze
- if [ "$?" == 0 ]; then
+ if [ "$?" != 0 ]; then
rm $TEMP_FILE
- else
exit_failed
fi
echo " Downloading"
diff --git a/target/test/test_helpers.sh b/target/test/test_helpers.sh
old mode 100644
new mode 100755
diff --git a/target/test/test_pwm.sh b/target/test/test_pwm.sh
index 4575c7f..8f8e628 100755
--- a/target/test/test_pwm.sh
+++ b/target/test/test_pwm.sh
@@ -33,6 +33,12 @@ load_driver()
echo "can't find /sys/ interface"
exit_failed
fi
+ elif [ "$1" == "APF28" ]; then
+ SYS_DIR="/sys/class/pwm/pwm4/"
+ if [ ! -d "$SYS_DIR" ]; then
+ echo "can't find /sys/ interface"
+ exit_failed
+ fi
else
echo "Platform not supported by this test"
exit 0
@@ -47,6 +53,8 @@ prepare_test()
ask_user "Please connect your oscilloscope probe to pin 4 of J22 connector (GND is on pin 6 or 40), then press ENTER when ready"
elif [ "$1" == "APF51" ]; then
ask_user "Please connect your oscilloscope probe to pin 6 of J35 (Extension) connector (GND is on pin 9 or 10), then press ENTER when ready\n (you can also watch i.MX LED; requires a custom built kernel)"
+ elif [ "$1" == "APF28" ]; then
+ ask_user "Please connect your oscilloscope probe to pin 26 of J10 connector (GND is on pin 32 or 34), then press ENTER when ready"
else
echo "Platform not supported by this test"
fi
diff --git a/target/test/test_rs232.sh b/target/test/test_rs232.sh
index 127fe11..074bc27 100755
--- a/target/test/test_rs232.sh
+++ b/target/test/test_rs232.sh
@@ -24,7 +24,7 @@ echo_jumper_help()
elif [ "$1" == "APF51" ]; then
echo " (Pin 2 & 3 of RS-232 connector)"
elif [ "$1" == "APF28" ]; then
- echo " (Pin ? & ? of ? connector)"
+ echo " (Pin 21 & 23 and 25 & 27 of j9 connector)"
else
echo "Platform not supported by this test"
fi
@@ -87,13 +87,16 @@ echo_available_ports()
}
show_test_banner "Serial ports"
-PORT="$1"
+PORTS="$1"
if [ "$1" == "" ]; then
echo "Please give the port number to test !"
execute_for_target echo_available_ports
read -p "> " PORT
- [ "$PORT" == "" ] && exit_failed
+ [ "$PORTS" == "" ] && exit_failed
fi
-test_serial_port $PORT
+for PORT in $PORTS; do
+ test_serial_port $PORT
+done
+
diff --git a/target/test/test_usb_device.sh b/target/test/test_usb_device.sh
index 870f25a..9ae468f 100755
--- a/target/test/test_usb_device.sh
+++ b/target/test/test_usb_device.sh
@@ -22,7 +22,7 @@ check_driver()
elif [ "$1" == "APF27" ]; then
echo "APF27 do not support USB device mode"
exit 0
- elif [ "$1" == "APF51" ]; then
+ elif [ "$1" == "APF51" ] || [ "$1" == "APF28" ]; then
dmesg | grep "USB" | grep "Device"
STORAGE_DRIVER=g_mass_storage
else
diff --git a/target/test/test_usb_host.sh b/target/test/test_usb_host.sh
index 9a1ed06..87df2d3 100755
--- a/target/test/test_usb_host.sh
+++ b/target/test/test_usb_host.sh
@@ -75,6 +75,10 @@ test_usb_host()
wait_key_insertion "the"
check_usb_key
wait_key_removal
+
+ wait_key_insertion "the mini"
+ check_usb_key
+ wait_key_removal
else
wait_key_insertion "the UPPER"
check_usb_key
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-10-03 18:07:19
|
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 ff186dd6969eba5d3500984b685ec063971f4d53 (commit)
from bc1a898b4580ff793a0b85953bdb7445f43ec569 (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 ff186dd6969eba5d3500984b685ec063971f4d53
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 3 20:10:20 2012 +0200
[LINUX] apf28: fix kernel 2.6.35 video flickering
-----------------------------------------------------------------------
Summary of changes:
.../459-armadeus-mx28_fix_16bits_video.patch | 34 +++++++-
...eus-support_ram_frequency_scaling_options.patch | 93 +++++++++++++++++++-
2 files changed, 123 insertions(+), 4 deletions(-)
diff --git a/patches/linux/2.6.35/459-armadeus-mx28_fix_16bits_video.patch b/patches/linux/2.6.35/459-armadeus-mx28_fix_16bits_video.patch
index da428d4..a19d86e 100644
--- a/patches/linux/2.6.35/459-armadeus-mx28_fix_16bits_video.patch
+++ b/patches/linux/2.6.35/459-armadeus-mx28_fix_16bits_video.patch
@@ -1,4 +1,5 @@
-Fix mx28 16 bits video modes of freescale mxs framebuffer driver
+- Fix mx28 16 bits video modes of freescale mxs framebuffer driver
+- Fix mx28 video flickering
Signed-off-by: Eric Jarrige <eri...@ar...>
@@ -36,3 +37,34 @@ Index: linux-2.6.35.3/drivers/video/mxs/mxsfb.c
var->transp.offset = 0;
var->transp.length = 0;
}
+@@ -620,7 +620,7 @@ static void init_timings(struct mxs_fb_d
+ __raw_writel(timings, data->regbase + HW_LCDIF_TIMING);
+ }
+
+-#ifdef CONFIG_CPU_FREQ
++#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_MXS_RAM_FREQ_SCALING)
+
+ struct mxsfb_notifier_block {
+ struct mxs_fb_data *fb_data;
+@@ -665,7 +665,7 @@ static struct mxsfb_notifier_block mxsfb
+ .notifier_call = mxsfb_notifier,
+ },
+ };
+-#endif /* CONFIG_CPU_FREQ */
++#endif /* CONFIG_CPU_FREQ && CONFIG_MXS_RAM_FREQ_SCALING*/
+
+ static int get_max_memsize(struct mxs_platform_fb_entry *pentry,
+ void *data, int ret_prev)
+@@ -851,10 +851,10 @@ static int __devinit mxsfb_probe(struct
+ data->cur_phys = data->phys_start;
+ dev_dbg(&pdev->dev, "LCD running now\n");
+
+-#ifdef CONFIG_CPU_FREQ
++#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_MXS_RAM_FREQ_SCALING)
+ mxsfb_nb.fb_data = data;
+ cpufreq_register_notifier(&mxsfb_nb.nb, CPUFREQ_TRANSITION_NOTIFIER);
+-#endif /* CONFIG_CPU_FREQ */
++#endif /* CONFIG_CPU_FREQ && CONFIG_MXS_RAM_FREQ_SCALING */
+
+ goto out;
+
diff --git a/patches/linux/2.6.35/460-armadeus-support_ram_frequency_scaling_options.patch b/patches/linux/2.6.35/460-armadeus-support_ram_frequency_scaling_options.patch
index 56f119e..53c9a5d 100644
--- a/patches/linux/2.6.35/460-armadeus-support_ram_frequency_scaling_options.patch
+++ b/patches/linux/2.6.35/460-armadeus-support_ram_frequency_scaling_options.patch
@@ -1,5 +1,5 @@
Support RAM frequency scaling options: DDR2, mDDR and disable RAM frequency
-scaling.
+scaling and LCD clock management.
This patch does not fix USB and ethernet issues reported with dynamic frequency
scaling governors: conservative and ondemand. in such a case disabling RAM
@@ -12,7 +12,16 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/clock.c
===================================================================
--- linux-2.6.35.3/arch/arm/mach-mx28/clock.c
+++ linux-2.6.35.3/arch/arm/mach-mx28/clock.c
-@@ -885,6 +885,7 @@ static unsigned long emi_round_rate(stru
+@@ -420,6 +420,8 @@ static struct clk ref_pix_clk = {
+ .get_rate = ref_pix_get_rate,
+ .set_rate = ref_clk_set_rate,
+ .round_rate = ref_clk_round_rate,
++ .enable = mx28_raw_enable,
++ .disable = mx28_raw_disable,
+ .enable_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC1,
+ .enable_bits = BM_CLKCTRL_FRAC1_CLKGATEPIX,
+ .scale_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC1,
+@@ -885,6 +887,7 @@ static unsigned long emi_round_rate(stru
static int emi_set_rate(struct clk *clk, unsigned long rate)
{
@@ -20,7 +29,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/clock.c
struct mxs_emi_scaling_data emi;
volatile unsigned int StateX, StateH;
volatile unsigned int APBHCTRL_Backup, APBXCTRL_Backup;
-@@ -982,6 +983,7 @@ static int emi_set_rate(struct clk *clk,
+@@ -982,6 +985,7 @@ static int emi_set_rate(struct clk *clk,
printk(KERN_ERR "couldn't set up EMI divisor\n");
return -ETIMEDOUT;
}
@@ -28,6 +37,84 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/clock.c
return 0;
}
+@@ -1182,12 +1186,26 @@ static unsigned long lcdif_get_rate(stru
+
+ static int lcdif_set_rate(struct clk *clk, unsigned long rate)
+ {
+- int reg_val;
++ unsigned long root_rate;
++ unsigned int reg, div;
++ root_rate = clk->parent->get_rate(clk->parent);
++ div = root_rate / (rate*1000);
++ if ((div == 0) || (div >= 0x2000))
++ return -EINVAL;
++
++ if (root_rate % (rate*1000)) {
++ div = mx28_get_frac_div(root_rate / 1000, rate, 0x1FFF);
++ if (((root_rate / 0x2000) * div) > (rate*1000))
++ return -EINVAL;
++ }
++
++ reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_DIS_LCDIF);
++ reg &= ~(BM_CLKCTRL_DIS_LCDIF_DIV | BM_CLKCTRL_DIS_LCDIF_DIV_FRAC_EN);
++ if (root_rate % rate)
++ reg |= BM_CLKCTRL_DIS_LCDIF_DIV_FRAC_EN;
++ reg |= BF_CLKCTRL_DIS_LCDIF_DIV(div);
++ __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_DIS_LCDIF);
+
+- reg_val = __raw_readl(clk->scale_reg);
+- reg_val &= ~(BM_CLKCTRL_DIS_LCDIF_DIV | BM_CLKCTRL_DIS_LCDIF_CLKGATE);
+- reg_val |= (1 << BP_CLKCTRL_DIS_LCDIF_DIV) & BM_CLKCTRL_DIS_LCDIF_DIV;
+- __raw_writel(reg_val, clk->scale_reg);
+ if (clk->busy_reg) {
+ int i;
+ for (i = 10000; i; i--)
+@@ -1197,10 +1215,6 @@ static int lcdif_set_rate(struct clk *cl
+ return -ETIMEDOUT;
+ }
+
+- reg_val = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ);
+- reg_val |= BM_CLKCTRL_CLKSEQ_BYPASS_DIS_LCDIF;
+- __raw_writel(reg_val, CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ);
+-
+ return 0;
+ }
+
+@@ -1216,7 +1230,7 @@ static int lcdif_set_parent(struct clk *
+ ret = 0;
+ }
+ if (ret && (parent == &ref_pix_clk)) {
+- __raw_writel(0 << clk->bypass_bits,
++ __raw_writel(1 << clk->bypass_bits,
+ clk->bypass_reg + CLR_REGISTER);
+ ret = 0;
+ }
+@@ -1227,7 +1241,7 @@ static int lcdif_set_parent(struct clk *
+ }
+
+ static struct clk dis_lcdif_clk = {
+- .parent = &pll_clk[0],
++ .parent = &ref_pix_clk,
+ .enable = mx28_raw_enable,
+ .disable = mx28_raw_disable,
+ .scale_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_DIS_LCDIF,
+@@ -1235,7 +1249,7 @@ static struct clk dis_lcdif_clk = {
+ .busy_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_DIS_LCDIF,
+ .busy_bits = 29,
+ .enable_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_DIS_LCDIF,
+- .enable_bits = 31,
++ .enable_bits = BM_CLKCTRL_DIS_LCDIF_CLKGATE,
+ .bypass_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ,
+ .bypass_bits = 14,
+ .get_rate = lcdif_get_rate,
+@@ -1848,6 +1862,7 @@ void __init mx28_clock_init(void)
+
+ clk_enable(&cpu_clk);
+ clk_enable(&emi_clk);
++ lcdif_set_parent(&dis_lcdif_clk, &ref_pix_clk);
+
+ clk_en_public_h_asm_ctrl(mx28_enable_h_autoslow,
+ mx28_set_hbus_autoslow_flags);
Index: linux-2.6.35.3/arch/arm/mach-mx28/emi_settings.h
===================================================================
--- linux-2.6.35.3/arch/arm/mach-mx28/emi_settings.h
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2012-10-02 14:52:52
|
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 bc1a898b4580ff793a0b85953bdb7445f43ec569 (commit)
from a5a94697f443e1a2df4cffe398262478c677fa60 (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 bc1a898b4580ff793a0b85953bdb7445f43ec569
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Oct 2 16:52:11 2012 +0200
[PACKAGES][AS_DEVICES] Test scripts for backlight, eeprom and PWM C++ wrappers.
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/main.c | 3 +
target/packages/as_devices/test_c.h | 53 ++++
target/packages/as_devices/test_cpp.h | 454 ++++++++++++++++++++++++++++++++-
3 files changed, 507 insertions(+), 3 deletions(-)
diff --git a/target/packages/as_devices/main.c b/target/packages/as_devices/main.c
index fb778fd..b0debbf 100644
--- a/target/packages/as_devices/main.c
+++ b/target/packages/as_devices/main.c
@@ -45,6 +45,7 @@ int main(int argc, char ** argv)
printf(" 6) max1027\n");
printf(" 7) max5821\n");
printf(" 8) as1531\n");
+ printf(" 9) backlight\n");
printf("> ");
scanf("%s",buffer);
@@ -66,6 +67,8 @@ int main(int argc, char ** argv)
break;
case '8' : test_as1531();
break;
+ case '9' : test_backlight();
+ break;
default : break;
}
}
diff --git a/target/packages/as_devices/test_c.h b/target/packages/as_devices/test_c.h
index 6300126..3f9d8aa 100644
--- a/target/packages/as_devices/test_c.h
+++ b/target/packages/as_devices/test_c.h
@@ -30,6 +30,7 @@
#include "as_max5821.h"
#include "as_adc.h"
#include "as_dac.h"
+#include "as_backlight.h"
#include "as_helpers.h"
#define PWM_NUM 0
@@ -816,3 +817,55 @@ void test_as1531(void)
pressEnterToContinue();
}
+/* Backlight test */
+void test_backlight(void)
+{
+ int ret;
+ char buffer[20];
+ char buffer2[20];
+ int value;
+ struct as_backlight_device *backlight_dev;
+
+ backlight_dev = as_backlight_open();
+ if(backlight_dev == NULL){
+ printf("can't init backlight\n");
+ pressEnterToContinue();
+ return;
+ }
+ while(buffer[0] != 'q')
+ {
+ system("clear");
+ printf("*********************************\n");
+ printf("* Testing backlight menu *\n");
+ printf("*********************************\n");
+ printf("Choose ('q' to quit):\n");
+ printf(" 1) get actual brightness\n");
+ printf(" 2) get maximum brightness\n");
+ printf(" 3) set brightness\n");
+ printf("> ");
+ scanf("%s",buffer);
+
+ switch(buffer[0])
+ {
+ case '1' : printf("Actual brightness is %d\n",
+ as_backlight_get_actual_brightness(backlight_dev));
+ pressEnterToContinue();
+ break;
+ case '2' : printf("Maximum brightness is %d\n",
+ as_backlight_get_max_brightness(backlight_dev));
+ pressEnterToContinue();
+ break;
+ case '3' : printf("Give brightness :");
+ scanf("%d",&value);
+ as_backlight_set_brightness(backlight_dev,value);
+ pressEnterToContinue();
+ break;
+ default : break;
+ }
+ }
+ ret = as_backlight_close(backlight_dev);
+ if(ret < 0){
+ printf("can't close backlight\n");
+ return;
+ }
+}
diff --git a/target/packages/as_devices/test_cpp.h b/target/packages/as_devices/test_cpp.h
index 1814075..a3c0be1 100644
--- a/target/packages/as_devices/test_cpp.h
+++ b/target/packages/as_devices/test_cpp.h
@@ -23,12 +23,16 @@
#include <stdlib.h>
#include <iostream>
#include <limits>
+#include <math.h>
#include "as_i2c.hpp"
#include "as_gpio.hpp"
#include "as_adc.hpp"
#include "as_dac.hpp"
#include "as_spi.hpp"
+#include "as_pwm.hpp"
+#include "as_93lcxx.hpp"
+#include "as_backlight.hpp"
#define _STR(x) #x
@@ -438,15 +442,459 @@ void test_max5821()
/* PWM test */
void test_pwm(void)
{
- printf("TODO\n");
- pressEnterToContinue();
+ AsPwm *pwm_dev = NULL;
+ int ret;
+ char buffer[20];
+ char buffer2[20];
+ int value;
+ int devNumber = 0;
+ int initialized = 0;
+
+ while(buffer[0] != 'q')
+ {
+ system("clear");
+ printf("**************************\n");
+ printf(" Testing PWM *\n");
+ printf("**************************\n");
+ printf("Choose ('q' to quit):\n");
+
+ if (initialized == 0)
+ {
+ printf(" 1) Open PWM device\n");
+ printf(" 2) Change device number (%i)\n", devNumber);
+ }
+ else
+ {
+ printf(" 1) Close PWM device\n");
+ printf(" 2) Set Frequency\n");
+ printf(" 3) Get Frequency\n");
+ printf(" 4) Set Period\n");
+ printf(" 5) Get Period\n");
+ printf(" 6) Set Duty\n");
+ printf(" 7) Get Duty\n");
+ printf(" 9) Activate/desactivate\n");
+ printf(" 9) Get state\n");
+ }
+
+ printf("> ");
+ scanf("%s",buffer);
+
+ if (initialized == 0)
+ {
+ switch(buffer[0])
+ {
+ case '1' : printf("Open PWM device\n");
+ pwm_dev = new AsPwm(devNumber);
+ if (pwm_dev < 0)
+ {
+ printf("Error, can't open PWM device. Is PWM modprobed ?\n");
+ } else {
+ printf("PWM device opened\n");
+ initialized = 1;
+ }
+ pressEnterToContinue();
+ break;
+ case '2' : printf("Give device number:");
+ scanf("%i",&value);
+
+ if (value < 0)
+ {
+ printf(" Wrong value\n");
+ } else {
+ devNumber = value;
+ }
+ pressEnterToContinue();
+ default : break;
+ }
+ }
+ else
+ {
+ switch(buffer[0])
+ {
+ case '1' : printf("Close PWM device\n");
+ delete pwm_dev;
+ initialized = 0;
+ pressEnterToContinue();
+ break;
+ case '2' : printf("Give frequency: ");
+ scanf("%d",&value);
+
+ ret = pwm_dev->setFrequency(value);
+ if (ret < 0)
+ {
+ printf("Error, can't set frequency\n");
+ }
+ pressEnterToContinue();
+ break;
+
+ case '3' : ret = pwm_dev->getFrequency();
+ if (ret < 0) {
+ printf("Error reading frequency\n");
+ pressEnterToContinue();
+ break;
+ }
+ printf("Frequency read : %d\n", ret);
+ pressEnterToContinue();
+ break;
+ case '4' : printf("Give period: ");
+ scanf("%d",&value);
+
+ ret = pwm_dev->setPeriod(value);
+ if (ret < 0)
+ {
+ printf("Error, can't set period\n");
+ }
+ pressEnterToContinue();
+ break;
+
+ case '5' : ret = pwm_dev->getPeriod();
+ if (ret < 0) {
+ printf("Error reading period\n");
+ pressEnterToContinue();
+ break;
+ }
+ printf("Period read : %d\n", ret);
+ pressEnterToContinue();
+ break;
+ case '6' : printf("Give duty: ");
+ scanf("%d",&value);
+
+ ret = pwm_dev->setDuty(value);
+ if (ret < 0)
+ {
+ printf("Error, can't set duty\n");
+ }
+ pressEnterToContinue();
+ break;
+
+ case '7' : ret = pwm_dev->getDuty();
+ if (ret < 0) {
+ printf("Error reading period\n");
+ pressEnterToContinue();
+ break;
+ }
+ printf("Duty read : %d\n", ret);
+ pressEnterToContinue();
+ break;
+ case '8' : printf("Activate 'a' or Desactivate 'd' ?");
+ scanf("%s",buffer2);
+
+ if(buffer2[0] == 'a')
+ {
+ pwm_dev->setState(1);
+ printf("PWM activated\n");
+ pressEnterToContinue();
+ }
+ else if(buffer2[0] == 'd')
+ {
+ pwm_dev->setState(0);
+ printf("PWM desactivated\n");
+ pressEnterToContinue();
+ }else{
+ printf("Option %c unknown\n",buffer[0]);
+ pressEnterToContinue();
+ }
+ break;
+ case '9' : if(pwm_dev->getState())
+ {
+ printf("PWM is active\n");
+ pressEnterToContinue();
+ }
+ else
+ {
+ printf("PWM is inactive\n");
+ pressEnterToContinue();
+ }
+ break;
+ default : break;
+ }
+ }
+ }
}
/* EEPROM test */
+int address_size(int aType, int aWordSize)
+{
+ return (((aType-46)/10) + 6 + 2 - (aWordSize/8));
+}
+
+int max_address(int aType, int aWordSize)
+{
+ return (pow(2,address_size(aType, aWordSize))-1);
+}
+
void test_93LC(void)
{
- printf("TODO\n");
+ char buffer[50];
+ int i;
+
+ As93LCXX *eeprom_dev = NULL;
+ int type = 46;
+ char spidevpath[50];
+ /* defaults values */
+ int frequency = 1000000;
+ uint8_t word_size = 8;
+ int value, value2;
+ int initialized=0;
+ snprintf(spidevpath, 50, "%s", "/dev/spidev2.0");
+
+ while(buffer[0] != 'q')
+ {
+ system("clear");
+ printf("*********************************\n");
+ printf("* Testing 93LCxx menu *\n");
+ printf("*********************************\n");
+ printf("Choose ('q' to quit):\n");
+ if (initialized == 0)
+ {
+ printf(" 1) Change word size (%d)\n", word_size);
+ printf(" 2) Change bus frequency (%d)\n", frequency);
+ printf(" 3) Change eeprom type (%d)\n", type);
+ printf(" 4) Change spidev path (%s)\n", spidevpath);
+ printf(" 5) Initialize eeprom\n");
+ } else {
+ printf(" 1) Close eeprom\n");
+ printf(" 2) Read specific address\n");
+ printf(" 3) Erase specific address\n");
+ printf(" 4) Write specific address\n");
+ printf(" 5) Write all\n");
+ printf(" 6) Read all\n");
+ printf(" 7) Erase all\n");
+ printf(" 8) Unlock write\n");
+ printf(" 9) Lock write\n");
+ }
+
+ printf("> ");
+ scanf("%s",buffer);
+
+ if (initialized == 0)
+ {
+ switch(buffer[0])
+ {
+ case '1' : printf("Give new word size (8 or 16): ");
+ scanf("%d", &value);
+ if ( (value != 8) && (value != 16) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ word_size = value;
+ }
+ break;
+ case '2' : printf("Give bus frequency: ");
+ scanf("%d", &value);
+ frequency = value;
+ printf("Frequency changed to %dHz\n",frequency);
+ break;
+ case '3' : printf("Give new type of eeprom (46, 56 or 66): ");
+ scanf("%d", &value);
+ if ( (value != 46) && (value != 56) && (value != 66) )
+ {
+ printf("Wrong value\n");
+ pressEnterToContinue();
+ } else {
+ type = value;
+ }
+ break;
+ case '4' : printf("Give new path for spidev: \n");
+ scanf("%s", spidevpath);
+ printf("New path is %s\n",spidevpath);
+ break;
+ case '5' : eeprom_dev = new As93LCXX((unsigned char *)spidevpath, type, frequency, word_size);
+ if (eeprom_dev < 0)
+ {
+ printf("Error, can't initialize eeprom. Have you modprobed spidev ?\n");
+ } else {
+ printf("93LCXX device initialized\n");
+ initialized = 1;
+ }
+ pressEnterToContinue();
+ break;
+ default : break;
+ }
+ } else {
+ switch(buffer[0])
+ {
+ case '1' : printf("EEPROM closed\n");
+ delete eeprom_dev;
+ initialized = 0;
+ pressEnterToContinue();
+ break;
+ case '2' : printf(" Read specific address\n");
+ printf("Give address in hexadecimal (max 0x%03X):",
+ max_address(type, word_size));
+ scanf("%x",&value);
+ if (value > max_address(type, word_size))
+ {
+ printf(" Error, wrong address\n");
+ } else {
+ value2 = eeprom_dev->read(value);
+ if (value2 < 0)
+ {
+ printf("Error, can't read value\n");
+ } else {
+ printf(" Read %02x at %02X", value2, value );
+ }
+ }
+ pressEnterToContinue();
+ break;
+ case '3' : printf("Erase specific address\n");
+ printf("Give address in hexadecimal (max 0x%03X):",
+ max_address(type, word_size));
+ scanf("%x",&value);
+ if (value > max_address(type, word_size))
+ {
+ printf(" Error, address wrong\n");
+ } else {
+ value2 = eeprom_dev->erase(value);
+ if (value2 < 0)
+ {
+ printf("Error, can't erase value\n");
+ } else {
+ printf("Value erased\n");
+ }
+ }
+ pressEnterToContinue();
+ break;
+ case '4' : printf("Write specific address\n");
+ printf("Give address in hexadecimal (max 0x%03X):",
+ max_address(type, word_size));
+ scanf("%x",&value);
+ if (value > max_address(type, word_size))
+ {
+ printf(" Error, address wrong\n");
+ pressEnterToContinue();
+ break;
+ }
+ printf("Give value in hexadecimal :");
+ scanf("%x",&value2);
+ value2 = eeprom_dev->write(value, value2);
+ if (value2 < 0)
+ {
+ printf("Error, can't write value\n");
+ }
+ pressEnterToContinue();
+ break;
+ case '5' : printf(" Write all\n");
+ printf("Give value in hexadecimal:");
+ scanf("%x",&value);
+ value2 = eeprom_dev->writeAll(value);
+ if (value2 < 0)
+ {
+ printf("Error, can't write value\n");
+ }
+ pressEnterToContinue();
+ break;
+ case '6' : printf(" Read all\n");
+ for(i = 0; i <= max_address(type, word_size); i++)
+ {
+ if (word_size == 8)
+ {
+ printf("%03X -> %02X\n",
+ i,eeprom_dev->read(i));
+ } else{
+ printf("%03X -> %04X\n",
+ i,eeprom_dev->read(i));
+ }
+ }
+ pressEnterToContinue();
+ break;
+ case '7' : printf(" Erase all\n");
+ value = eeprom_dev->eraseAll();
+ if (value < 0)
+ {
+ printf(" Error in erasing eeprom\n");
+ }
+ pressEnterToContinue();
+ break;
+ case '8' : printf("Unlock write\n");
+ if (eeprom_dev->ewen() < 0)
+ {
+ printf("Error can't unlock write\n");
+ }
+ pressEnterToContinue();
+ break;
+ case '9' : printf("lock write\n");
+ if (eeprom_dev->ewds() < 0)
+ {
+ printf("Error can't lock write\n");
+ }
+ pressEnterToContinue();
+ break;
+ default : break;
+ }
+ }
+ }
+}
+
+void test_backlight(void)
+{
+ int ret;
+ char buffer[20];
+ int value;
+ AsBacklight *backlight_dev = NULL;
+
+ backlight_dev = new AsBacklight();
+ if (backlight_dev == NULL)
+ {
+ printf("Error, can't open backlight device.\n");
+ pressEnterToContinue();
+ return ;
+ }
pressEnterToContinue();
+
+ while(buffer[0] != 'q')
+ {
+ system("clear");
+ printf("*********************************\n");
+ printf("* Testing backlight menu *\n");
+ printf("*********************************\n");
+ printf("Choose ('q' to quit):\n");
+ printf(" 1) get actual brightness\n");
+ printf(" 2) get maximum brightness\n");
+ printf(" 3) set brightness\n");
+
+ printf("> ");
+ scanf("%s",buffer);
+
+ switch(buffer[0])
+ {
+ case '1' : ret = backlight_dev->getActualBrightness();
+ if (ret < 0)
+ {
+ printf("Error reading actual brightness\n");
+ pressEnterToContinue();
+ break;
+ }
+ printf("Actual brightness is %d\n", ret);
+ pressEnterToContinue();
+ break;
+ case '2' : ret = backlight_dev->getMaxBrightness();
+ if (ret < 0)
+ {
+ printf("Error reading maximum brightness\n");
+ pressEnterToContinue();
+ break;
+ }
+ printf("Maximum brightness is %d\n", ret);
+ pressEnterToContinue();
+ break;
+ case '3' : printf("Give brightness :");
+ scanf("%d",&value);
+
+ ret = backlight_dev->setBrightness(value);
+ if (ret < 0)
+ {
+ printf("Error, can't set brightness\n");
+ }
+
+ pressEnterToContinue();
+ break;
+ default : break;
+ }
+ }
+
+ delete backlight_dev;
}
/* AS1531 test */
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2012-10-01 15:13:23
|
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 a5a94697f443e1a2df4cffe398262478c677fa60 (commit)
via ef03e24e27be2f2432426af13689cc4f7009f553 (commit)
via cae34781a45417acf10eebd3a1b82c8fe8bbad1d (commit)
via cc39c07b2fc550bd15b814d637533a4cfa7d5e9b (commit)
via fe87c781a8e348eb9875bf258a8ffa5001043535 (commit)
from 959ca9398906b02348a720eca13c82ae2172ad8f (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 a5a94697f443e1a2df4cffe398262478c677fa60
Merge: ef03e24 959ca93
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Oct 1 17:12:48 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit ef03e24e27be2f2432426af13689cc4f7009f553
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Oct 1 17:03:20 2012 +0200
[PACKAGES][AS_DEVICES] C++ wrapper for 93LCXX EEPROM device.
commit cae34781a45417acf10eebd3a1b82c8fe8bbad1d
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Oct 1 14:26:40 2012 +0200
[PACKAGES][AS_DEVICES] Backlight device manager and C++ wrapper.
commit cc39c07b2fc550bd15b814d637533a4cfa7d5e9b
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Oct 1 14:04:17 2012 +0200
[PACKAGE][AS_DEVICES] Fix PWM C++ source indentations.
commit fe87c781a8e348eb9875bf258a8ffa5001043535
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Oct 1 11:15:00 2012 +0200
[BUILDROOT][AS_DEVICES] C++ wrapper for PWM device.
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/Makefile | 3 +-
target/packages/as_devices/c/as_backlight.c | 156 +++++++++++++++++++++++
target/packages/as_devices/c/as_backlight.h | 80 ++++++++++++
target/packages/as_devices/c/as_pwm.h | 2 +
target/packages/as_devices/cpp/Makefile | 3 +
target/packages/as_devices/cpp/as_93lcxx.cpp | 132 +++++++++++++++++++
target/packages/as_devices/cpp/as_93lcxx.hpp | 100 +++++++++++++++
target/packages/as_devices/cpp/as_backlight.cpp | 86 +++++++++++++
target/packages/as_devices/cpp/as_backlight.hpp | 64 +++++++++
target/packages/as_devices/cpp/as_pwm.cpp | 151 ++++++++++++++++++++++
target/packages/as_devices/cpp/as_pwm.hpp | 102 +++++++++++++++
11 files changed, 878 insertions(+), 1 deletions(-)
create mode 100644 target/packages/as_devices/c/as_backlight.c
create mode 100644 target/packages/as_devices/c/as_backlight.h
create mode 100644 target/packages/as_devices/cpp/as_93lcxx.cpp
create mode 100644 target/packages/as_devices/cpp/as_93lcxx.hpp
create mode 100644 target/packages/as_devices/cpp/as_backlight.cpp
create mode 100644 target/packages/as_devices/cpp/as_backlight.hpp
create mode 100644 target/packages/as_devices/cpp/as_pwm.cpp
create mode 100644 target/packages/as_devices/cpp/as_pwm.hpp
diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index 1cb0161..12014cc 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -6,7 +6,7 @@ LDFLAGS=
CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
-OBJ = as_pwm.o
+OBJ += as_pwm.o
OBJ += as_i2c.o
ifeq ($(ARMADEUS_LINUX_VERSION),2.6.29.6)
OBJ += as_gpio_2_6_29.o
@@ -21,6 +21,7 @@ OBJ += as_spi.o
OBJ += as_as1531.o
OBJ += as_max1027.o
OBJ += as_max5821.o
+OBJ += as_backlight.o
OBJ += as_helpers.o
LIBRARY=as_devices
diff --git a/target/packages/as_devices/c/as_backlight.c b/target/packages/as_devices/c/as_backlight.c
new file mode 100644
index 0000000..2fd7fad
--- /dev/null
+++ b/target/packages/as_devices/c/as_backlight.c
@@ -0,0 +1,156 @@
+/*
+** THE ARMadeus Systems
+**
+** Copyright (C) 2012 The armadeus systems team
+** Jérémie Scheer <jer...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h> /* for open() */
+#include <unistd.h> /* for write() */
+
+/* #define DEBUG */
+#include "as_helpers.h"
+#include "as_backlight.h"
+
+
+#define BACKLIGHT_SYS_PATH "/sys/class/backlight/imx-bl"
+#define ACTUAL_BRIGHTNESS_PATH "actual_brightness"
+#define MAX_BRIGHTNESS_PATH "max_brightness"
+#define BRIGHTNESS_PATH "brightness"
+
+#define SIZE_OF_BUFF 50
+
+/*------------------------------------------------------------------------------*/
+
+struct as_backlight_device *as_backlight_open()
+{
+ char buffer[SIZE_OF_BUFF];
+ struct as_backlight_device *dev;
+
+ dev = (struct as_backlight_device *)malloc(sizeof(struct as_backlight_device));
+ if (dev == NULL) {
+ ERROR("Can't allocate memory for backlight device structure\n");
+ return NULL;
+ }
+
+ /* open backlight management files */
+ snprintf(buffer, SIZE_OF_BUFF, "%s/%s", BACKLIGHT_SYS_PATH, ACTUAL_BRIGHTNESS_PATH);
+ if ((dev->fileActualBrightness = open(buffer, O_RDWR)) < 0) {
+ ERROR("Can't open actual brightness file");
+ return NULL;
+ }
+ snprintf(buffer, SIZE_OF_BUFF, "%s/%s", BACKLIGHT_SYS_PATH, MAX_BRIGHTNESS_PATH);
+ if ((dev->fileMaxBrightness = open(buffer, O_RDWR)) < 0) {
+ ERROR("Can't open max brightness file");
+ return NULL;
+ }
+ snprintf(buffer, SIZE_OF_BUFF, "%s/%s", BACKLIGHT_SYS_PATH, BRIGHTNESS_PATH);
+ if((dev->fileBrightness = open(buffer, O_RDWR)) < 0) {
+ ERROR("Can't open brightness file");
+ return NULL;
+ }
+
+ return dev;
+}
+
+/*------------------------------------------------------------------------------*/
+
+int32_t as_backlight_get_actual_brightness(struct as_backlight_device *aDev)
+{
+ char buffer[SIZE_OF_BUFF];
+ int ret;
+
+ if (aDev == NULL) {
+ ERROR("Device is NULL\n");
+ return -1;
+ }
+
+ ret = as_read_buffer(aDev->fileActualBrightness, buffer, SIZE_OF_BUFF);
+ if (ret < 0) {
+ ERROR("Can't read actual brightness");
+ return ret;
+ }
+
+ return atoi(buffer);
+}
+
+/*------------------------------------------------------------------------------*/
+
+int32_t as_backlight_get_max_brightness(struct as_backlight_device *aDev)
+{
+ char buffer[SIZE_OF_BUFF];
+ int ret;
+
+ if (aDev == NULL) {
+ ERROR("Device is NULL\n");
+ return -1;
+ }
+
+ ret = as_read_buffer(aDev->fileMaxBrightness, buffer, SIZE_OF_BUFF);
+ if (ret < 0) {
+ ERROR("Can't read max brightness");
+ return ret;
+ }
+
+ return atoi(buffer);
+}
+
+/*------------------------------------------------------------------------------*/
+
+int32_t as_backlight_set_brightness(struct as_backlight_device *aDev, int aBrightness)
+{
+ if (aDev == NULL) {
+ ERROR("Device is NULL\n");
+ return -1;
+ }
+
+ return as_write_buffer(aDev->fileBrightness, aBrightness);
+}
+
+/*------------------------------------------------------------------------------*/
+
+int32_t as_backlight_close(struct as_backlight_device *aDev)
+{
+ int ret = 0;
+
+ if (aDev == NULL) {
+ ERROR("Device is NULL\n");
+ return -1;
+ }
+
+ /* Close backlight management files */
+ ret = close(aDev->fileActualBrightness);
+ if (ret < 0) {
+ ERROR("Can't close /actual_brightness");
+ return ret;
+ }
+ ret = close(aDev->fileMaxBrightness);
+ if (ret < 0) {
+ ERROR("Can't close /max_brightness");
+ return ret;
+ }
+ ret = close(aDev->fileBrightness);
+ if (ret < 0) {
+ ERROR("Can't close /brightness");
+ return ret;
+ }
+
+ return ret;
+}
diff --git a/target/packages/as_devices/c/as_backlight.h b/target/packages/as_devices/c/as_backlight.h
new file mode 100644
index 0000000..424fea5
--- /dev/null
+++ b/target/packages/as_devices/c/as_backlight.h
@@ -0,0 +1,80 @@
+/*
+** THE ARMadeus Systems
+**
+** Copyright (C) 2012 The armadeus systems team
+** Jérémie Scheer <jer...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#ifndef __ASBACKLIGHT_H__
+#define __ASBACKLIGHT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+#include <stdint.h>
+
+struct as_backlight_device {
+ int fileActualBrightness;
+ int fileMaxBrightness;
+ int fileBrightness;
+};
+
+/** @brief Open Backlight device
+ *
+ * @return pointer to device structure, NULL if error
+ */
+struct as_backlight_device *as_backlight_open();
+
+/** @brief Get actual brightness
+ *
+ * @param aDev pointer to device structure
+ *
+ * @return actual brightness value, negative value on error
+ */
+int32_t as_backlight_get_actual_brightness(struct as_backlight_device *aDev);
+
+/** @brief Get maximum brightness
+ *
+ * @param aDev pointer to device structure
+ *
+ * @return maximum allowed brightness, negative value on error
+ */
+int32_t as_backlight_get_max_brightness(struct as_backlight_device *aDev);
+
+/** @bief Set brightness
+ *
+ * @param aDev pointer to device structure
+ * @param aBrightness backlight brightness
+ *
+ * @return negative value on error
+ */
+int32_t as_backlight_set_brightness(struct as_backlight_device *aDev, int aBrightness);
+
+/** @brief Close backlight device
+ *
+ * @param aDev pointer structure to device
+ *
+ * @return negative value on error
+ */
+int32_t as_backlight_close(struct as_backlight_device *aDev);
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
+#endif /* __ASBACKLIGHT_H__ */
diff --git a/target/packages/as_devices/c/as_pwm.h b/target/packages/as_devices/c/as_pwm.h
index 9304ac9..fb44b78 100644
--- a/target/packages/as_devices/c/as_pwm.h
+++ b/target/packages/as_devices/c/as_pwm.h
@@ -26,6 +26,8 @@
extern "C" {
#endif // __cplusplus
+#include <stdint.h>
+
/* number of pwm under system */
#define NUMBER_OF_PWM 2
diff --git a/target/packages/as_devices/cpp/Makefile b/target/packages/as_devices/cpp/Makefile
index 23439da..592fbdb 100644
--- a/target/packages/as_devices/cpp/Makefile
+++ b/target/packages/as_devices/cpp/Makefile
@@ -11,6 +11,9 @@ OBJS = as_i2c.o
OBJS += as_gpio.o
OBJS += as_dac.o
OBJS += as_adc.o
+OBJS += as_pwm.o
+OBJS += as_backlight.o
+OBJS += as_93lcxx.o
OBJS += as_spi.o
diff --git a/target/packages/as_devices/cpp/as_93lcxx.cpp b/target/packages/as_devices/cpp/as_93lcxx.cpp
new file mode 100644
index 0000000..4e04a0e
--- /dev/null
+++ b/target/packages/as_devices/cpp/as_93lcxx.cpp
@@ -0,0 +1,132 @@
+/*
+** THE ARMadeus Systems
+**
+** Copyright (C) 2012 The armadeus systems team
+** Jérémie Scheer <jer...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+**
+*/
+
+#include "as_93lcxx.hpp"
+#include <iostream>
+
+As93LCXX::As93LCXX(unsigned char *aSpidevFilename, unsigned char aType, unsigned long aSpeed, unsigned char aWordSize)
+{
+ mDev = as_93lcxx_open(aSpidevFilename, aType, aSpeed, aWordSize);
+}
+
+As93LCXX::~As93LCXX()
+{
+ if (mDev != NULL)
+ {
+ as_93lcxx_close(mDev);
+ }
+ else
+ {
+ std::cerr<<"As93LCXX device structure not allocated"<<std::endl;
+ }
+}
+
+long As93LCXX::read(unsigned int anAddress) const
+{
+ if (mDev != NULL)
+ {
+ return as_93lcxx_read(mDev, anAddress);
+ }
+ else
+ {
+ std::cerr<<"As93LCXX device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long As93LCXX::ewen()
+{
+ if (mDev != NULL)
+ {
+ return as_93lcxx_ewen(mDev);
+ }
+ else
+ {
+ std::cerr<<"As93LCXX device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long As93LCXX::erase(unsigned int anAddress)
+{
+ if (mDev != NULL)
+ {
+ return as_93lcxx_erase(mDev, anAddress);
+ }
+ else
+ {
+ std::cerr<<"As93LCXX device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long As93LCXX::eraseAll()
+{
+ if (mDev != NULL)
+ {
+ return as_93lcxx_erase_all(mDev);
+ }
+ else
+ {
+ std::cerr<<"As93LCXX device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long As93LCXX::write(unsigned int anAddress, unsigned int aValue)
+{
+ if (mDev != NULL)
+ {
+ return as_93lcxx_write(mDev, anAddress, aValue);
+ }
+ else
+ {
+ std::cerr<<"As93LCXX device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long As93LCXX::writeAll(unsigned int aValue)
+{
+ if (mDev != NULL)
+ {
+ return as_93lcxx_write_all(mDev, aValue);
+ }
+ else
+ {
+ std::cerr<<"As93LCXX device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long As93LCXX::ewds()
+{
+ if (mDev != NULL)
+ {
+ return as_93lcxx_ewds(mDev);
+ }
+ else
+ {
+ std::cerr<<"As93LCXX device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
diff --git a/target/packages/as_devices/cpp/as_93lcxx.hpp b/target/packages/as_devices/cpp/as_93lcxx.hpp
new file mode 100644
index 0000000..cdfab83
--- /dev/null
+++ b/target/packages/as_devices/cpp/as_93lcxx.hpp
@@ -0,0 +1,100 @@
+/*
+** THE ARMadeus Systems
+**
+** Copyright (C) 2012 The armadeus systems team
+** Jérémie Scheer <jer...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+**
+*/
+
+#ifndef AS_93LCXX__HPP__
+#define AS_93LCXX__HPP__
+
+#include "as_93lcxx.h"
+
+/**
+ * C++ wrapper for 93LCXX device
+ */
+class As93LCXX
+{
+public:
+ /**
+ * Constructor
+ *
+ * @param aSpidevFilename path to spidev
+ * @param aType of the eeprom
+ * @param aSpeed clock speed in Hz
+ * @param aWordSize word size for transaction
+ */
+ As93LCXX(unsigned char *aSpidevFilename, unsigned char aType, unsigned long aSpeed, unsigned char aWordSize);
+ virtual ~As93LCXX();
+
+ /** @brief read a value in address given
+ *
+ * @param aAddress addresse of register to be read
+ *
+ * @return positive register value on success, negative value on error.
+ */
+ long read(unsigned int anAddress) const;
+
+ /** @brief enable write on eeprom
+ *
+ * @return positive value on success, negative value on error
+ */
+ long ewen();
+
+ /** @brief Force all data bits of the specified iaddress to 1
+ *
+ * @param anAddress addresse of register to be erased
+ *
+ * @return positive register value on success, negative value on error.
+ */
+ long erase(unsigned int anAddress);
+
+ /** @brief Force all bits in eeprom to 1
+ *
+ * @return positive register value on success, negative value on error.
+ */
+ long eraseAll();
+
+ /** @brief write a value in given address
+ *
+ * @param anAddress addresse of register to be read
+ * @param aValue value to be wrote
+ *
+ * @return positive register value on success, negative value on error.
+ */
+ long write(unsigned int anAddress, unsigned int aValue);
+
+ /** @brief write the entire memory array with value given
+ *
+ * @param aValue value to be wrote
+ *
+ * @return positive register value on success, negative value on error.
+ */
+ long writeAll(unsigned int aValue);
+
+ /** @brief disable write on eeprom
+ *
+ * @return positive value on success, negative value on error
+ */
+ long ewds();
+
+protected:
+ mutable struct as_93lcxx_device *mDev;
+};
+
+#endif // AS_93LCXX__HPP__
diff --git a/target/packages/as_devices/cpp/as_backlight.cpp b/target/packages/as_devices/cpp/as_backlight.cpp
new file mode 100644
index 0000000..451bafa
--- /dev/null
+++ b/target/packages/as_devices/cpp/as_backlight.cpp
@@ -0,0 +1,86 @@
+/*
+** THE ARMadeus Systems
+**
+** Copyright (C) 2012 The armadeus systems team
+** Jérémie Scheer <jer...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+**
+*/
+
+#include "as_backlight.hpp"
+#include <iostream>
+
+AsBacklight::AsBacklight()
+{
+ mDev = as_backlight_open();
+}
+
+AsBacklight::~AsBacklight()
+{
+ int ret;
+
+ if (mDev != NULL)
+ {
+ ret = as_backlight_close(mDev);
+ if (ret < 0)
+ {
+ std::cout<<"AsBacklight destruction error"<<std::endl;
+ }
+ }
+ else
+ {
+ std::cerr<<"AsBacklight device structure not allocated"<<std::endl;
+ }
+}
+
+long AsBacklight::getActualBrightness() const
+{
+ if (mDev != NULL)
+ {
+ return as_backlight_get_actual_brightness(mDev);
+ }
+ else
+ {
+ std::cerr<<"AsBacklight device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long AsBacklight::getMaxBrightness() const
+{
+ if (mDev != NULL)
+ {
+ return as_backlight_get_max_brightness(mDev);
+ }
+ else
+ {
+ std::cerr<<"AsBacklight device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long AsBacklight::setBrightness(int aBrightness)
+{
+ if (mDev != NULL)
+ {
+ return as_backlight_set_brightness(mDev, aBrightness);
+ }
+ else
+ {
+ std::cerr<<"AsBacklight device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
diff --git a/target/packages/as_devices/cpp/as_backlight.hpp b/target/packages/as_devices/cpp/as_backlight.hpp
new file mode 100644
index 0000000..b30904b
--- /dev/null
+++ b/target/packages/as_devices/cpp/as_backlight.hpp
@@ -0,0 +1,64 @@
+/*
+** THE ARMadeus Systems
+**
+** Copyright (C) 2012 The armadeus systems team
+** Jérémie Scheer <jer...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+**
+*/
+
+#ifndef AS_BACKLIGHT__HPP__
+#define AS_BACKLIGHT__HPP__
+
+#include "as_backlight.h"
+
+/**
+ * C++ wrapper for Backlight device
+ */
+class AsBacklight
+{
+public:
+ /**
+ * Constructor
+ */
+ AsBacklight();
+ virtual ~AsBacklight();
+
+ /** @brief Get actual brightness
+ *
+ * @return actual brightness value, negative value on error
+ */
+ long getActualBrightness() const;
+
+ /** @brief Get maximum brightness
+ *
+ * @return maximum allowed brightness, negative value on error
+ */
+ long getMaxBrightness() const;
+
+ /** @bief Set brightness
+ *
+ * @param aBrightness backlight brightness
+ *
+ * @return negative value on error
+ */
+ long setBrightness(int aBrightness);
+
+protected:
+ mutable struct as_backlight_device *mDev;
+};
+
+#endif // AS_BACKLIGHT__HPP__
diff --git a/target/packages/as_devices/cpp/as_pwm.cpp b/target/packages/as_devices/cpp/as_pwm.cpp
new file mode 100644
index 0000000..784ef23
--- /dev/null
+++ b/target/packages/as_devices/cpp/as_pwm.cpp
@@ -0,0 +1,151 @@
+/*
+** THE ARMadeus Systems
+**
+** Copyright (C) 2012 The armadeus systems team
+** Jérémie Scheer <jer...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+**
+*/
+
+#include "as_pwm.hpp"
+#include <iostream>
+
+AsPwm::AsPwm(int aPwmNumber)
+{
+ mDev = as_pwm_open(aPwmNumber);
+}
+
+AsPwm::~AsPwm()
+{
+ int ret;
+
+ if (mDev != NULL)
+ {
+ ret = as_pwm_close(mDev);
+ if (ret < 0)
+ {
+ std::cout<<"AsPwm destruction error"<<std::endl;
+ }
+ }
+ else
+ {
+ std::cerr<<"AsPwm device structure not allocated"<<std::endl;
+ }
+}
+
+long AsPwm::setFrequency(int aFrequency)
+{
+ if (mDev != NULL)
+ {
+ return as_pwm_set_frequency(mDev, aFrequency);
+ }
+ else
+ {
+ std::cerr<<"AsPwm device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long AsPwm::getFrequency() const
+{
+ if (mDev != NULL)
+ {
+ return as_pwm_get_frequency(mDev);
+ }
+ else
+ {
+ std::cerr<<"AsPwm device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long AsPwm::setPeriod(int aPeriod)
+{
+ if (mDev != NULL)
+ {
+ return as_pwm_set_period(mDev, aPeriod);
+ }
+ else
+ {
+ std::cerr<<"AsPwm device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long AsPwm::getPeriod() const
+{
+ if (mDev != NULL)
+ {
+ return as_pwm_get_period(mDev);
+ }
+ else
+ {
+ std::cerr<<"AsPwm device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long AsPwm::setDuty(int aDuty)
+{
+ if (mDev != NULL)
+ {
+ return as_pwm_set_duty(mDev, aDuty);
+ }
+ else
+ {
+ std::cerr<<"AsPwm device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long AsPwm::getDuty() const
+{
+ if (mDev != NULL)
+ {
+ return as_pwm_get_duty(mDev);
+ }
+ else
+ {
+ std::cerr<<"AsPwm device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long AsPwm::setState(int aEnable)
+{
+ if (mDev != NULL)
+ {
+ return as_pwm_set_state(mDev, aEnable);
+ }
+ else
+ {
+ std::cerr<<"AsPwm device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
+
+long AsPwm::getState() const
+{
+ if (mDev != NULL)
+ {
+ return as_pwm_get_state(mDev);
+ }
+ else
+ {
+ std::cerr<<"AsPwm device structure not allocated"<<std::endl;
+ return -1;
+ }
+}
diff --git a/target/packages/as_devices/cpp/as_pwm.hpp b/target/packages/as_devices/cpp/as_pwm.hpp
new file mode 100644
index 0000000..dbb394a
--- /dev/null
+++ b/target/packages/as_devices/cpp/as_pwm.hpp
@@ -0,0 +1,102 @@
+/*
+** THE ARMadeus Systems
+**
+** Copyright (C) 2012 The armadeus systems team
+** Jérémie Scheer <jer...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+**
+*/
+
+#ifndef AS_PWM__HPP__
+#define AS_PWM__HPP__
+
+#include "as_pwm.h"
+
+/**
+ * C++ wrapper for PWM device
+ */
+class AsPwm
+{
+public:
+ /**
+ * Constructor
+ *
+ * @param aPwmNumber PWM device number
+ */
+ AsPwm(int aPwmNumber);
+ virtual ~AsPwm();
+
+ /** @brief set frequency
+ *
+ * @param aFrequency frequency in Hz
+ *
+ * @return negative value on error
+ */
+ long setFrequency(int aFrequency);
+
+ /** @brief get frequency
+ *
+ * @return frequency value in Hz, negative value on error
+ */
+ long getFrequency() const;
+
+ /** @bief set period
+ *
+ * @param aPeriod period in uS
+ *
+ * @return negative value on error
+ */
+ long setPeriod(int aPeriod);
+
+ /** @brief get period value
+ *
+ * @return period value in uS, negative value on error.
+ */
+ long getPeriod() const;
+
+ /** @brief set duty
+ *
+ * @param aDuty duty in 0.1%
+ *
+ * @return negative value on error
+ */
+ long setDuty(int aDuty);
+
+ /** @brief get duty
+ *
+ * @return duty value in 0.1%, negative value on error
+ */
+ long getDuty() const;
+
+ /** @brief set state of pwm
+ *
+ * @param aEnable 0:disable, 1:enable
+ *
+ * @return negative value on error
+ */
+ long setState(int aEnable);
+
+ /** @brief get state of pwm
+ *
+ * @return 0:disabled, 1:enabled, negative value on error
+ */
+ long getState() const;
+
+protected:
+ mutable struct as_pwm_device *mDev;
+};
+
+#endif // AS_PWM__HPP__
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2012-10-01 12:47:08
|
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 959ca9398906b02348a720eca13c82ae2172ad8f (commit)
from 5313aeb0d07f03441d275cbc8a34c0458b750735 (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 959ca9398906b02348a720eca13c82ae2172ad8f
Author: brett.muir <bre...@so...>
Date: Mon Oct 1 14:46:27 2012 +0200
[as_devices] allow blockingGetPinValue function to be used under python thread
-----------------------------------------------------------------------
Summary of changes:
.../packages/as_devices/python/src/AsGpio_wrap.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/target/packages/as_devices/python/src/AsGpio_wrap.c b/target/packages/as_devices/python/src/AsGpio_wrap.c
index 1b11fe1..29b0da7 100644
--- a/target/packages/as_devices/python/src/AsGpio_wrap.c
+++ b/target/packages/as_devices/python/src/AsGpio_wrap.c
@@ -238,7 +238,9 @@ static PyObject * blockingGetPinValue(PyObject *self, PyObject *args)
return NULL;
}
+Py_BEGIN_ALLOW_THREADS
ret = as_gpio_wait_event(aFdev, aDelay_ms);
+Py_END_ALLOW_THREADS
if (ret == -ETIMEDOUT)
{
PyErr_SetString(PyExc_IOError, "TIMEOUT");
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2012-10-01 12:16:56
|
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 5313aeb0d07f03441d275cbc8a34c0458b750735 (commit)
via aef9c1ce2a5bb3ff0e8df1f720abced1932fefc3 (commit)
from 96de4fb85b8318aa5c7de239ca58684e24b91891 (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 5313aeb0d07f03441d275cbc8a34c0458b750735
Author: Fabien Marteau <fab...@ar...>
Date: Mon Oct 1 14:13:16 2012 +0200
[as_devices] replace TAB by four spaces
commit aef9c1ce2a5bb3ff0e8df1f720abced1932fefc3
Author: Fabien Marteau <fab...@ar...>
Date: Mon Oct 1 14:12:15 2012 +0200
[as_devices] Fix closing file bug in as_gpio_wait_event, thanks to brett.muir
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/as_gpio.c | 195 ++++++++++++++++----------------
1 files changed, 100 insertions(+), 95 deletions(-)
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index 9e7748a..adea8a0 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -84,61 +84,61 @@ struct as_gpio_device *as_gpio_open(int aGpioNum)
int32_t as_gpio_set_pin_direction(struct as_gpio_device *aDev, char *direction)
{
- char buf[BUFF_SIZE];
- int gpio_fd;
- int ret = 0;
+ char buf[BUFF_SIZE];
+ int gpio_fd;
+ int ret = 0;
if(aDev == NULL){
ERROR("device is NULL\n");
return -EINVAL;
}
- snprintf(buf, BUFF_SIZE, "/sys/class/gpio/gpio%d/direction", aDev->port_num);
- gpio_fd = open(buf, O_WRONLY);
- if (gpio_fd < 0) {
- ERROR("Can't open gpio%d direction\n", aDev->port_num);
- return -EINVAL;
- }
+ snprintf(buf, BUFF_SIZE, "/sys/class/gpio/gpio%d/direction", aDev->port_num);
+ gpio_fd = open(buf, O_WRONLY);
+ if (gpio_fd < 0) {
+ ERROR("Can't open gpio%d direction\n", aDev->port_num);
+ return -EINVAL;
+ }
- ret = as_write_buffer_string(gpio_fd, direction);
- if (ret < 0)
- ERROR("Error writing direction\n");
+ ret = as_write_buffer_string(gpio_fd, direction);
+ if (ret < 0)
+ ERROR("Error writing direction\n");
- close(gpio_fd);
+ close(gpio_fd);
- return ret;
+ return ret;
}
/*------------------------------------------------------------------------------*/
const char* as_gpio_get_pin_direction(struct as_gpio_device *aDev)
{
- char buf[BUFF_SIZE];
- static char direction[4];
- FILE *gpio_file;
- int ret = 0;
- static const char none[] = "??";
+ char buf[BUFF_SIZE];
+ static char direction[4];
+ FILE *gpio_file;
+ int ret = 0;
+ static const char none[] = "??";
if(aDev == NULL){
ERROR("device is NULL\n");
return NULL;
}
- snprintf(buf, sizeof(buf), "/sys/class/gpio/gpio%d/direction",
- aDev->port_num);
- gpio_file = fopen(buf, "r");
- if (!gpio_file) {
- ERROR("Can't open gpio%d direction\n", aDev->port_num);
- return none;
- }
- ret = fscanf(gpio_file, "%s", direction);
- fclose(gpio_file);
- if (ret < 0) {
- ERROR("Can't get gpio%d direction\n", aDev->port_num);
- return none;
- }
-
- return direction;
+ snprintf(buf, sizeof(buf), "/sys/class/gpio/gpio%d/direction",
+ aDev->port_num);
+ gpio_file = fopen(buf, "r");
+ if (!gpio_file) {
+ ERROR("Can't open gpio%d direction\n", aDev->port_num);
+ return none;
+ }
+ ret = fscanf(gpio_file, "%s", direction);
+ fclose(gpio_file);
+ if (ret < 0) {
+ ERROR("Can't get gpio%d direction\n", aDev->port_num);
+ return none;
+ }
+
+ return direction;
}
/*------------------------------------------------------------------------------*/
@@ -208,100 +208,105 @@ int32_t as_gpio_get_pin_value(struct as_gpio_device *aDev)
int32_t as_gpio_wait_event(struct as_gpio_device *aDev, int delay_ms)
{
- char gpio_sys_name[BUFF_SIZE];
- int gpio_fd;
- struct pollfd poll_set[1];
- int ret;
- char tmp[16];
+ char gpio_sys_name[BUFF_SIZE];
+ int gpio_fd;
+ struct pollfd poll_set[1];
+ int ret;
+ char tmp[16];
if(aDev == NULL){
ERROR("device is NULL\n");
return -EINVAL;
}
- snprintf(gpio_sys_name, BUFF_SIZE, "/sys/class/gpio/gpio%d/value",
- aDev->port_num);
- gpio_fd = open(gpio_sys_name, O_RDONLY);
- if (gpio_fd < 0) {
- ERROR("Can't open gpio%d value\n", aDev->port_num);
- return -EINVAL;
- }
-
- /* flush pending event */
- read(gpio_fd, tmp, sizeof(tmp));
-
- poll_set[0].fd = gpio_fd;
- poll_set[0].events = POLLPRI;
- poll_set[0].revents = 0;
- ret = poll(poll_set, 1, delay_ms);
- if (ret > 0) {
- return read(gpio_fd, tmp, sizeof(tmp));
- } else if (ret < 0) {
- ERROR("poll()");
- return ret;
- }
-
- return -ETIMEDOUT;
+ snprintf(gpio_sys_name, BUFF_SIZE, "/sys/class/gpio/gpio%d/value",
+ aDev->port_num);
+ gpio_fd = open(gpio_sys_name, O_RDONLY);
+ if (gpio_fd < 0) {
+ ERROR("Can't open gpio%d value\n", aDev->port_num);
+ return -EINVAL;
+ }
+
+ /* flush pending event */
+ read(gpio_fd, tmp, sizeof(tmp));
+
+ poll_set[0].fd = gpio_fd;
+ poll_set[0].events = POLLPRI;
+ poll_set[0].revents = 0;
+ ret = poll(poll_set, 1, delay_ms);
+ if (ret > 0) {
+ ret = read(gpio_fd, tmp, sizeof(tmp));
+ close(gpio_fd);
+ return ret;
+ } else if (ret < 0) {
+ ERROR("poll()");
+ close(gpio_fd);
+ return ret;
+ }
+
+ /* if ret=0 it's a timeout */
+ close(gpio_fd);
+ return -ETIMEDOUT;
}
/*------------------------------------------------------------------------------*/
const char* as_gpio_get_irq_mode(struct as_gpio_device *aDev)
{
- char buf[BUFF_SIZE];
- static char mode[8];
- FILE *gpio_file;
- int ret = 0;
- static const char unknown[] = "??";
+ char buf[BUFF_SIZE];
+ static char mode[8];
+ FILE *gpio_file;
+ int ret = 0;
+ static const char unknown[] = "??";
if(aDev == NULL){
ERROR("device is NULL\n");
return unknown;
}
- snprintf(buf, sizeof(buf), "/sys/class/gpio/gpio%d/edge", aDev->port_num);
- gpio_file = fopen(buf, "r");
- if (!gpio_file) {
- ERROR("Can't open gpio%d edge\n", aDev->port_num);
- return unknown;
- }
- ret = fscanf(gpio_file, "%s", mode);
- fclose(gpio_file);
- if (ret < 0) {
- ERROR("Can't get gpio%d edge\n", aDev->port_num);
- return unknown;
- }
-
- return mode;
+ snprintf(buf, sizeof(buf), "/sys/class/gpio/gpio%d/edge", aDev->port_num);
+ gpio_file = fopen(buf, "r");
+ if (!gpio_file) {
+ ERROR("Can't open gpio%d edge\n", aDev->port_num);
+ return unknown;
+ }
+ ret = fscanf(gpio_file, "%s", mode);
+ fclose(gpio_file);
+ if (ret < 0) {
+ ERROR("Can't get gpio%d edge\n", aDev->port_num);
+ return unknown;
+ }
+
+ return mode;
}
/*------------------------------------------------------------------------------*/
int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev, char *mode)
{
- char buf[BUFF_SIZE];
- int gpio_fd;
- int ret = 0;
+ char buf[BUFF_SIZE];
+ int gpio_fd;
+ int ret = 0;
if(aDev == NULL){
ERROR("device is NULL\n");
return -EINVAL;
}
- snprintf(buf, BUFF_SIZE, "/sys/class/gpio/gpio%d/edge", aDev->port_num);
- gpio_fd = open(buf, O_WRONLY);
- if (gpio_fd < 0) {
- ERROR("Can't open gpio%d edge\n", aDev->port_num);
- return -EINVAL;
- }
+ snprintf(buf, BUFF_SIZE, "/sys/class/gpio/gpio%d/edge", aDev->port_num);
+ gpio_fd = open(buf, O_WRONLY);
+ if (gpio_fd < 0) {
+ ERROR("Can't open gpio%d edge\n", aDev->port_num);
+ return -EINVAL;
+ }
- ret = as_write_buffer_string(gpio_fd, mode);
- if (ret < 0)
- ERROR("Error writing mode\n");
+ ret = as_write_buffer_string(gpio_fd, mode);
+ if (ret < 0)
+ ERROR("Error writing mode\n");
- close(gpio_fd);
+ close(gpio_fd);
- return ret;
+ return ret;
}
/*------------------------------------------------------------------------------*/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-09-30 21:04:25
|
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 96de4fb85b8318aa5c7de239ca58684e24b91891 (commit)
from 5a26d31247e6563df70e41dddfe305b7943b5ff6 (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 96de4fb85b8318aa5c7de239ca58684e24b91891
Author: Julien Boibessot <jul...@ar...>
Date: Sun Sep 30 23:02:57 2012 +0200
[BUILDROOT] linux-firmware: add new version of wl12xx firmware
-----------------------------------------------------------------------
Summary of changes:
...-linux-firmware-add_ti-connectivity_fw_v5.patch | 45 ++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/195-linux-firmware-add_ti-connectivity_fw_v5.patch
diff --git a/patches/buildroot/2012.02/195-linux-firmware-add_ti-connectivity_fw_v5.patch b/patches/buildroot/2012.02/195-linux-firmware-add_ti-connectivity_fw_v5.patch
new file mode 100644
index 0000000..2bc6a98
--- /dev/null
+++ b/patches/buildroot/2012.02/195-linux-firmware-add_ti-connectivity_fw_v5.patch
@@ -0,0 +1,45 @@
+From 9006d3a3a357c16a426886b59b1688a9ee7f1599 Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov <yeg...@go...>
+Date: Sun, 02 Sep 2012 22:37:45 +0000
+Subject: linux-firmware: add ti-connectivity fw v5
+
+Signed-off-by: Yegor Yefremov <yeg...@go...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+(limited to 'package/linux-firmware/linux-firmware.mk')
+
+diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
+index 2a6bfc1..c71dc15 100644
+--- a/package/linux-firmware/linux-firmware.mk
++++ b/package/linux-firmware/linux-firmware.mk
+@@ -6,7 +6,7 @@
+ ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_88W8686_SDIO),y)
+ LINUX_FIRMWARE_VERSION = af5222c5ded5d944267acfbd001571409bea7eeb
+ else
+-LINUX_FIRMWARE_VERSION = 8ccddee5ee23a0e192da38d98bcbbbb41bf385dd
++LINUX_FIRMWARE_VERSION = 7560108a2c94a62056fa82d912282b901aa0904f
+ endif
+ LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+ LINUX_FIRMWARE_SITE_METHOD = git
+@@ -51,6 +51,9 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X) += \
+ ti-connectivity/wl127x-fw-4-mr.bin \
+ ti-connectivity/wl127x-fw-4-plt.bin \
+ ti-connectivity/wl127x-fw-4-sr.bin \
++ ti-connectivity/wl127x-fw-5-mr.bin \
++ ti-connectivity/wl127x-fw-5-plt.bin \
++ ti-connectivity/wl127x-fw-5-sr.bin \
+ ti-connectivity/TIInit_7.2.31.bts \
+ LICENCE.ti-connectivity
+
+@@ -66,6 +69,9 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X) += \
+ ti-connectivity/wl128x-fw-4-mr.bin \
+ ti-connectivity/wl128x-fw-4-plt.bin \
+ ti-connectivity/wl128x-fw-4-sr.bin \
++ ti-connectivity/wl128x-fw-5-mr.bin \
++ ti-connectivity/wl128x-fw-5-plt.bin \
++ ti-connectivity/wl128x-fw-5-sr.bin \
+ ti-connectivity/TIInit_7.2.31.bts \
+ LICENCE.ti-connectivity
+
+--
+cgit v0.9.0.1-2-gef13
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-09-30 16:35:22
|
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 5a26d31247e6563df70e41dddfe305b7943b5ff6 (commit)
from 70a083a7bda60246429edf4b607c1ff13854b7bf (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 5a26d31247e6563df70e41dddfe305b7943b5ff6
Author: Julien Boibessot <jul...@ar...>
Date: Sun Sep 30 18:34:15 2012 +0200
[BUILDROOT] Fixes pppd build with recent linux kernels (BR mainline backport)
-----------------------------------------------------------------------
Summary of changes:
...-pppd-fix_build_with_3_5_+_kernel_headers.patch | 73 ++++++++++++++++++++
1 files changed, 73 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/194-pppd-fix_build_with_3_5_+_kernel_headers.patch
diff --git a/patches/buildroot/2012.02/194-pppd-fix_build_with_3_5_+_kernel_headers.patch b/patches/buildroot/2012.02/194-pppd-fix_build_with_3_5_+_kernel_headers.patch
new file mode 100644
index 0000000..637fa87
--- /dev/null
+++ b/patches/buildroot/2012.02/194-pppd-fix_build_with_3_5_+_kernel_headers.patch
@@ -0,0 +1,73 @@
+From 94ce13a56f238bbba01bdfc893cfbc4e62169287 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <ja...@su...>
+Date: Tue, 11 Sep 2012 06:59:56 +0000
+Subject: pppd: fix build with 3.5+ kernel headers
+
+Fixes http://autobuild.buildroot.net/results/8a9369fece696e012249b865708ffee533c5318a
+
+Pppd bundles some, but not all needed kernel headers. In Linux 3.5 (and
+before that 2.6.35) if_pppol2tp.h was changed, so the embedded copy was no
+longer compatible.
+
+if_pppol2tp.h has been part of the exported kernel headers since 2.6.23, so
+simply drop the bundled copy and use the kernel headers instead, similar
+to how it is done in Gentoo:
+
+https://bugs.gentoo.org/show_bug.cgi?id=427684
+
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+(limited to 'package/pppd')
+
+diff --git a/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch b/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch
+deleted file mode 100644
+index 0e71e24..0000000
+--- a/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch
++++ b/dev/null
+@@ -1,24 +0,0 @@
+---- ppp-2.4.5/include/linux/if_pppol2tp.h 2009-11-16 22:26:07.000000000 +0000
+-+++ ppp-2.4.5/include/linux/if_pppol2tp.h 2010-07-16 22:35:22.000000000 +0100
+-@@ -32,6 +32,20 @@
+- __u16 d_tunnel, d_session; /* For sending outgoing packets */
+- };
+-
+-+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
+-+ * bits. So we need a different sockaddr structure.
+-+ */
+-+struct pppol2tpv3_addr {
+-+ pid_t pid; /* pid that owns the fd.
+-+ * 0 => current */
+-+ int fd; /* FD of UDP or IP socket to use */
+-+
+-+ struct sockaddr_in addr; /* IP address and port to send to */
+-+
+-+ __u32 s_tunnel, s_session; /* For matching incoming packets */
+-+ __u32 d_tunnel, d_session; /* For sending outgoing packets */
+-+};
+-+
+- /* Socket options:
+- * DEBUG - bitmask of debug message categories
+- * SENDSEQ - 0 => don't send packets with sequence numbers
+-
+diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
+index 259d1dc..b13dbab 100644
+--- a/package/pppd/pppd.mk
++++ b/package/pppd/pppd.mk
+@@ -23,6 +23,15 @@ ifeq ($(BR2_INET_IPV6),y)
+ PPPD_MAKE_OPT += HAVE_INET6=y
+ endif
+
++# pppd bundles some but not all of the needed kernel headers. The embedded
++# if_pppol2tp.h is unfortunately not compatible with kernel headers > 2.6.34,
++# and has been part of the kernel headers since 2.6.23, so drop it
++define PPPD_DROP_INTERNAL_IF_PPOL2TP_H
++ $(RM) $(@D)/include/linux/if_pppol2tp.h
++endef
++
++PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_INTERNAL_IF_PPOL2TP_H
++
+ define PPPD_CONFIGURE_CMDS
+ $(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux
+ $(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux
+--
+cgit v0.9.0.1-2-gef13
hooks/post-receive
--
armadeus
|
