[Armadeus-commitlog] SF.net SVN: armadeus:[1234] trunk/target/demos/backlight_control

[<ar...@us...>]

Revision: 1234
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1234&view=rev
Author:   artemys
Date:     2009-04-21 08:27:09 +0000 (Tue, 21 Apr 2009)

Log Message:
-----------
[DEMOS] Makes backlight control tool works again

Modified Paths:
--------------
    trunk/target/demos/backlight_control/Makefile
    trunk/target/demos/backlight_control/backlight_sysctl.c

Modified: trunk/target/demos/backlight_control/Makefile
===================================================================
--- trunk/target/demos/backlight_control/Makefile	2009-04-18 15:18:40 UTC (rev 1233)
+++ trunk/target/demos/backlight_control/Makefile	2009-04-21 08:27:09 UTC (rev 1234)
@@ -1,23 +1,18 @@
+ARMADEUS_BASE_DIR=../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
 
 ifeq ($(TARGET),)
-	BUILDROOT_DIR:=../../../buildroot/
-	BUILD_DIR_EXT:=$(shell ls $(BUILDROOT_DIR) | grep -e "^build_arm*")
-	BUILD_DIR:=$(BUILDROOT_DIR)/$(BUILD_DIR_EXT)
-
-	SDL_DIR:=$(BUILD_DIR)/SDL-1.2.11/
-	STAGING_DIR:=$(BUILD_DIR)/staging_dir/
-	ROOT_DIR:=$(BUILDROOT_DIR)/project_$(BUILD_DIR_EXT)/armadeus/root/
-
-	CC:=$(STAGING_DIR)/bin/arm-linux-gcc
-	DEFINES="TARGET"
-	CFLAGS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags)
-	LIBS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --libs)
+        ROOT_DIR:=$(ARMADEUS_ROOTFS_DIR)
+        CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+        DEFINES="-DTARGET"
+        CFLAGS:=$(shell STAGING_DIR=$(ARMADEUS_STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --cflags)
+        LIBS:=$(shell STAGING_DIR=$(ARMADEUS_STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --libs) -lSDL_image
 else
-	ROOT_DIR:="/"
-	CFLAGS=`/usr/bin/sdl-config --cflags`
-	LIBS=`/usr/bin/sdl-config --libs`
-	CC=gcc
-	DEFINES="HOST"
+        ROOT_DIR:="/"
+        CFLAGS=`/usr/bin/sdl-config --cflags`
+        LIBS=`/usr/bin/sdl-config --libs` -lSDL_Image
+        CC=gcc
+        DEFINES="-DHOST"
 endif
 
 INSTALL_DIR:=$(ROOT_DIR)/usr/bin/
@@ -34,7 +29,7 @@
 	$(CC) $(CFLAGS) -c -o $@ $^
 
 backlight_sysctl.o: backlight_sysctl.c
-	$(CC) $(CFLAGS) -D$(DEFINES) -c -o $@ $^
+	$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $^
 
 backlight: backlight.o backlight_sysctl.o
 	$(CC)  $(LIBS) -o $@ $^

Modified: trunk/target/demos/backlight_control/backlight_sysctl.c
===================================================================
--- trunk/target/demos/backlight_control/backlight_sysctl.c	2009-04-18 15:18:40 UTC (rev 1233)
+++ trunk/target/demos/backlight_control/backlight_sysctl.c	2009-04-21 08:27:09 UTC (rev 1234)
@@ -10,8 +10,8 @@
 int max_brightness = 255;
 
 #ifdef TARGET
-#define BRIGHTNESS_SYS_FILE     "/sys/class/backlight/imxl-bl/brightness"
-#define MAX_BRIGHTNESS_SYS_FILE "/sys/class/backlight/imxl-bl/max_brightness"
+#define BRIGHTNESS_SYS_FILE     "/sys/class/backlight/imx-bl/brightness"
+#define MAX_BRIGHTNESS_SYS_FILE "/sys/class/backlight/imx-bl/max_brightness"
 #else
 #define BRIGHTNESS_SYS_FILE     "./backlight.dat"
 #define MAX_BRIGHTNESS_SYS_FILE "./backlight.dat"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.