[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-263-g480409f
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-263-g480409f
|
From: Julien B a. A. <ar...@us...> - 2011-06-28 19:02:24
|
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 480409f8f527428b2930771767cc7d532a72cd4a (commit)
via dee7ddac47e38b462c774b3e5581f1cf6cab9d12 (commit)
via 16c9814b4aced081f6353f96b9afa59d0ad7b887 (commit)
via 8535874fba5565cd6a000804cd96dfc60de18c47 (commit)
via d1edab5dc914221c01999cc7d7b547b85af1c2a6 (commit)
via 84201795aa09d7e7a8b214d8bd752705e4706b58 (commit)
from b76a0b17039754fcb3f7cf6dd8300158f786dc71 (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 480409f8f527428b2930771767cc7d532a72cd4a
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 20:58:49 2011 +0200
[BUILDROOT] Cleanup demos Config.in
commit dee7ddac47e38b462c774b3e5581f1cf6cab9d12
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 20:55:58 2011 +0200
[BUILDROOT] Updates apf51test_defconfig apf51_defconfig
commit 16c9814b4aced081f6353f96b9afa59d0ad7b887
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 20:18:37 2011 +0200
[DEMOS] Add screen resolution auto-detection to input_test
commit 8535874fba5565cd6a000804cd96dfc60de18c47
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 19:41:38 2011 +0200
[AS_DEVICES] Fixes compilation errors for cpp wrapper
commit d1edab5dc914221c01999cc7d7b547b85af1c2a6
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 17:56:40 2011 +0200
[LINUX] Makes gpio_keys a module to let user choose to use it or not (APF51 USER button)
commit 84201795aa09d7e7a8b214d8bd752705e4706b58
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 17:46:42 2011 +0200
[DEBUG] Add PWM 1&2 registers def in imxregs
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 37 ++++++++++++++++---
buildroot/configs/apf51test_defconfig | 39 ++++++++++++++++----
buildroot/package/armadeus/demos/Config.in | 9 +++--
.../armadeus/apf51/apf51-linux-2.6.38.config | 4 +-
target/demos/input_test/README | 1 +
target/demos/input_test/main.c | 33 ++++++++++++++---
target/linux/debug/imxregs/imx51regs.h | 14 +++++++
target/packages/as_devices/cpp/as_gpio.cpp | 2 +-
target/packages/as_devices/test_cpp.h | 34 ++++++-----------
9 files changed, 125 insertions(+), 48 deletions(-)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index f0f10da..90f9a18 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11-00241-g76c7fa1-dirty
-# Mon Jun 27 15:30:22 2011
+# Buildroot version: 2010.11
+# Tue Jun 28 17:40:48 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -98,6 +98,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Commands
#
+BR2_COPY="cp -R "
BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
@@ -250,19 +251,37 @@ BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION
#
# Armadeus specific tools/utilities
#
-# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_ANYBUSD is not set
# BR2_PACKAGE_AS_DEVICES is not set
-# BR2_PACKAGE_CH7024CTRL is not set
# BR2_PACKAGE_ARMADEUS_DEMOS is not set
BR2_PACKAGE_FPGAREGS=y
+# BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE is not set
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
# BR2_PACKAGE_MAX5821CTRL is not set
-# BR2_PACKAGE_ARMADEUS_PPS_UTILITIES is not set
+
+#
+# straton requires as_devices to be installed
+#
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
+
+#
+# APF27 specific:
+#
+# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_ARMADEUS_PPS_UTILITIES is not set
+
+#
+# APF51 specific:
+#
BR2_PACKAGE_TFP410CTRL=y
#
+# APF9328 specific:
+#
+# BR2_PACKAGE_CH7024CTRL is not set
+
+#
# Audio and video libraries and applications
#
BR2_PACKAGE_ALSA_LIB=y
@@ -631,6 +650,11 @@ BR2_PACKAGE_TSLIB=y
# BR2_PACKAGE_LIBUSB is not set
#
+# Java
+#
+# BR2_PACKAGE_CLASSPATH is not set
+
+#
# Networking
#
# BR2_PACKAGE_LIBCGI is not set
@@ -728,9 +752,10 @@ BR2_PACKAGE_IPROUTE2=y
# BR2_PACKAGE_NFS_UTILS is not set
# BR2_PACKAGE_NGIRCD is not set
BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
# BR2_PACKAGE_NTP_SNTP is not set
# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
+# BR2_PACKAGE_NTP_NTPD is not set
+# BR2_PACKAGE_NTP_NTPDATE is not set
# BR2_PACKAGE_NTP_NTPDC is not set
# BR2_PACKAGE_NTP_NTPQ is not set
# BR2_PACKAGE_NTP_TICKADJ is not set
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 91fd40d..d2ff72b 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Buildroot version: 2010.11
-# Fri Jun 24 10:57:47 2011
+# Tue Jun 28 20:45:47 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -98,6 +98,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Commands
#
+BR2_COPY="cp -R "
BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
@@ -250,12 +251,11 @@ BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION
#
# Armadeus specific tools/utilities
#
-# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_ANYBUSD is not set
BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
BR2_PACKAGE_AS_DEVICES_CPP=y
BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
-# BR2_PACKAGE_CH7024CTRL is not set
BR2_PACKAGE_ARMADEUS_DEMOS=y
#
@@ -271,19 +271,37 @@ BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
+# BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020 is not set
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
#
-# DEMOS_MCP25020 requires package iproute2
+# Choose the firmware to install
#
-BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
# BR2_PACKAGE_MAX5821CTRL is not set
-# BR2_PACKAGE_ARMADEUS_PPS_UTILITIES is not set
+# BR2_PACKAGE_STRATON is not set
BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+
+#
+# APF27 specific:
+#
+# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_ARMADEUS_PPS_UTILITIES is not set
+
+#
+# APF51 specific:
+#
BR2_PACKAGE_TFP410CTRL=y
#
+# APF9328 specific:
+#
+# BR2_PACKAGE_CH7024CTRL is not set
+
+#
# Audio and video libraries and applications
#
BR2_PACKAGE_ALSA_LIB=y
@@ -676,6 +694,11 @@ BR2_PACKAGE_TSLIB=y
# BR2_PACKAGE_LIBUSB is not set
#
+# Java
+#
+# BR2_PACKAGE_CLASSPATH is not set
+
+#
# Networking
#
# BR2_PACKAGE_LIBCGI is not set
@@ -806,7 +829,7 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
# BR2_PACKAGE_USSP_PUSH is not set
-# BR2_PACKAGE_UUCP is not set
+BR2_PACKAGE_UUCP=y
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
@@ -873,7 +896,7 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f800
BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x800
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
+BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
# BR2_TARGET_ROOTFS_UBIFS_RT_NONE is not set
# BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB is not set
BR2_TARGET_ROOTFS_UBIFS_RT_LZO=y
diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
index f4d4d2f..8e7db54 100644
--- a/buildroot/package/armadeus/demos/Config.in
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -32,6 +32,7 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_INPUT
bool "Input test"
select BR2_PACKAGE_SDL
help
+ Shows how to use user inputs (mouse, keyboard, touch) in SDL.
config BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER
bool "Music player"
@@ -45,7 +46,7 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE
bool "Camera capture"
select BR2_PACKAGE_SDL
help
- capture and print camera video stream.
+ Capture and display camera (V4L) video stream.
config BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO
bool "Oscilloscope"
@@ -65,13 +66,13 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD
Test for LCD dead pixels. Needs SDL.
config BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020
- bool "DEMOS_MCP25020"
+ bool "MCP25020 demo"
depends on BR2_PACKAGE_IPROUTE2
help
- Test for CAN bus communication with MCP25020.
+ Test for CAN bus communication with MCP25020 (demo board).
Requires package iproute2.
-comment "DEMOS_MCP25020 requires package iproute2"
+comment "MCP25020 demo requires package iproute2"
depends on !BR2_PACKAGE_IPROUTE2
endmenu
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index 5c05c37..aebaa75 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.38.1 Kernel Configuration
-# Mon Jun 20 17:28:57 2011
+# Tue Jun 28 17:50:21 2011
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -981,7 +981,7 @@ CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_GPIO=m
# CONFIG_KEYBOARD_TCA6416 is not set
# CONFIG_KEYBOARD_MATRIX is not set
# CONFIG_KEYBOARD_LM8323 is not set
diff --git a/target/demos/input_test/README b/target/demos/input_test/README
index 6376899..429b8d0 100644
--- a/target/demos/input_test/README
+++ b/target/demos/input_test/README
@@ -1,3 +1,4 @@
+This demo *requires* SDL.
* ARM compiling:
$ make clean; make install
diff --git a/target/demos/input_test/main.c b/target/demos/input_test/main.c
index 0c97268..37cebe8 100644
--- a/target/demos/input_test/main.c
+++ b/target/demos/input_test/main.c
@@ -194,15 +194,14 @@ void process_events()
#else /* SDL_DOUBLEBUF crashes on APF */
#define SDL_VIDEO_FLAGS (SDL_HWSURFACE | SDL_DOUBLEBUF | SDL_ANYFORMAT)
#endif
-#define SCREEN_WIDTH 320
-#define SCREEN_HEIGHT 240
int main(int argc, char * argv[])
{
SDL_Surface * screen;
SDL_Surface * sprite, * tmp;
int nbjoysticks;
- int i;
+ int i, height, width;
+ SDL_Rect **modes;
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) {
fprintf(stderr, "Error during SDL init: %s\n",
@@ -213,12 +212,36 @@ int main(int argc, char * argv[])
/* Call SDL_Quit() before exiting */
atexit(SDL_Quit);
- screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 16, SDL_VIDEO_FLAGS);
+ /* Get available fullscreen/hardware modes */
+ modes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE);
+
+ /* Check is there are any modes available */
+ if (modes == (SDL_Rect **)0) {
+ printf("No modes available!\n");
+ exit(-1);
+ }
+
+ /* Check if our resolution is restricted */
+ if (modes == (SDL_Rect **)-1) {
+ printf("All resolutions available.\n");
+ } else {
+ /* Print valid modes */
+ printf("Available Modes\n");
+ for (i=0; modes[i]; ++i) {
+ printf(" %d x %d\n", modes[i]->w, modes[i]->h);
+ }
+ }
+ width = modes[0]->w;
+ height = modes[0]->h;
+ printf("Taking greatest one: %d x %d\n\n", width, height);
+
+ screen = SDL_SetVideoMode(width, height, 16, SDL_VIDEO_FLAGS);
if (screen) {
printf("Video mode: %dx%dx%d\n", screen->w, screen->h,
screen->format->BitsPerPixel);
} else {
- printf("Unable to set %dx%d video mode: %s\n", SCREEN_WIDTH, SCREEN_HEIGHT, SDL_GetError());
+ printf("Unable to set %dx%d video mode: %s\n", width, height,
+ SDL_GetError());
return 1;
}
diff --git a/target/linux/debug/imxregs/imx51regs.h b/target/linux/debug/imxregs/imx51regs.h
index 3555d70..497b6c7 100644
--- a/target/linux/debug/imxregs/imx51regs.h
+++ b/target/linux/debug/imxregs/imx51regs.h
@@ -72,6 +72,20 @@ static struct reg_info regs[] =
{ "GPTICR1_1", 0x73fa001c, 0, 0xffffffff, 'x', "GPT1 Input capture Register 1" },
{ "GPTICR2_1", 0x73fa0020, 0, 0xffffffff, 'x', "GPT1 Input capture Register 2" },
{ "GPTCNT_1", 0x73fa0024, 0, 0xffffffff, 'x', "GPT1 Counter Register" },
+/* PWM1 */
+{ "PWMCR_1", 0x73fb4000, 0, 0xffffffff, 'x', "PWM1 Control Register" },
+{ "PWMSR_1", 0x73fb4004, 0, 0xffffffff, 'x', "PWM1 Status Register" },
+{ "PWMIR_1", 0x73fb4008, 0, 0xffffffff, 'x', "PWM1 Interrupt Register" },
+{ "PWMSAR_1", 0x73fb400c, 0, 0xffffffff, 'x', "PWM1 Sample Register" },
+{ "PWMPR_1", 0x73fb4010, 0, 0xffffffff, 'x', "PWM1 Period Register" },
+{ "PWMCNR_1", 0x73fb4014, 0, 0xffffffff, 'x', "PWM1 Counter Register" },
+/* PWM2 */
+{ "PWMCR_2", 0x73fb8000, 0, 0xffffffff, 'x', "PWM2 Control Register" },
+{ "PWMSR_2", 0x73fb8004, 0, 0xffffffff, 'x', "PWM2 Status Register" },
+{ "PWMIR_2", 0x73fb8008, 0, 0xffffffff, 'x', "PWM2 Interrupt Register" },
+{ "PWMSAR_2", 0x73fb800c, 0, 0xffffffff, 'x', "PWM2 Sample Register" },
+{ "PWMPR_2", 0x73fb8010, 0, 0xffffffff, 'x', "PWM2 Period Register" },
+{ "PWMCNR_2", 0x73fb8014, 0, 0xffffffff, 'x', "PWM2 Counter Register" },
/* I2C1 */
{ "IADR_1", 0x83fc8000, 0, 0xffffffff, 'x', "I2C1 Address Register" },
{ "IFDR_1", 0x83fc8004, 0, 0xffffffff, 'x', "I2C1 Frequency Divider Register" },
diff --git a/target/packages/as_devices/cpp/as_gpio.cpp b/target/packages/as_devices/cpp/as_gpio.cpp
index a4a7034..385d1cd 100644
--- a/target/packages/as_devices/cpp/as_gpio.cpp
+++ b/target/packages/as_devices/cpp/as_gpio.cpp
@@ -174,7 +174,7 @@ const char* AsGpio::getIrqMode() const
else
{
std::cerr<<"AsGpio device structure not allocated"<<std::endl;
- return '?';
+ return "?";
}
}
diff --git a/target/packages/as_devices/test_cpp.h b/target/packages/as_devices/test_cpp.h
index f39944e..1814075 100644
--- a/target/packages/as_devices/test_cpp.h
+++ b/target/packages/as_devices/test_cpp.h
@@ -121,15 +121,14 @@ void test_gpio()
AsGpio *gpio_dev = NULL;
int32_t ret;
int32_t value;
- char port_letter = 'F';
- int pin_num = 13;
+ int pin_num = (5 *32) + 13;
int port_direction = 0;
int port_value = 1;
- gpio_dev = new AsGpio(port_letter, pin_num);
+ gpio_dev = new AsGpio(pin_num);
if (gpio_dev == NULL)
{
- printf("Error can't open gpio %c\nHave you run loadgpio.sh ?\n", port_letter);
+ printf("Error can't open gpio %d\nHave you run loadgpio.sh ?\n", pin_num);
pressEnterToContinue();
return ;
}
@@ -141,17 +140,16 @@ void test_gpio()
}
port_value = ret;
-
while(buffer[0] != 'q')
{
system("clear");
printf("**************************\n");
- printf(" Testing GPIO Port%c%d \n", gpio_dev->getPortLetter(), gpio_dev->getPinNum());
+ printf(" Testing GPIO %d \n", (int)gpio_dev->getPinNum());
printf("**************************\n");
printf("Choose ('q' to quit):\n");
- printf(" 1) Change gpio (P%c%d)\n", gpio_dev->getPortLetter(), gpio_dev->getPinNum());
+ printf(" 1) Change GPIO number (%d)\n", (int)gpio_dev->getPinNum());
printf(" 2) Change direction (%s)\n", gpio_dev->getPinDirection());
- printf(" 3) Change value (%d)\n", gpio_dev->getPinValue());
+ printf(" 3) Change value (%d)\n", (int)gpio_dev->getPinValue());
printf(" 4) Read pin value\n");
printf(" 5) Set irq mode (%s)\n", gpio_dev->getIrqMode());
printf(" a) blocking read\n");
@@ -159,27 +157,19 @@ void test_gpio()
printf("> ");
scanf("%s",buffer);
- switch(buffer[0])
+ switch (buffer[0])
{
- case '1' : printf("Give letter of port in upper case : ");
- scanf("%s", buffer);
- if (buffer[0] != port_letter)
- {
- delete gpio_dev;
- }
- port_letter = buffer[0];
-
- printf("Give pin number : ");
+ case '1' :
+ printf("Give GPIO number (port index (A==0) x 32 + pin index): ");
scanf("%d", &pin_num);
-
- gpio_dev = new AsGpio(port_letter, pin_num);
+ gpio_dev = new AsGpio(pin_num);
if(gpio_dev == NULL)
{
- printf("Error, can't open P%c%d\n", port_letter, pin_num);
+ printf("Error, can't open %d\n", pin_num);
pressEnterToContinue();
break;
}
- printf("Ok P%c%d is open\n", port_letter, pin_num);
+ printf("Ok %d is open\n", pin_num);
pressEnterToContinue();
break;
case '2' : printf("Give direction (in / out) : ");
hooks/post-receive
--
armadeus
|
