[tuxdroid-svn] r212 - svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment va
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r212 - svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct firmware/tuxaudio/trunk firmware/tuxcore/trunk firmware/tuxdefs
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-03-29 10:03:39
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 212
Added:
firmware/tuxaudio/trunk/tuxaudio.ld
firmware/tuxcore/trunk/tuxcore.ld
Modified:
firmware/tuxaudio/trunk/Makefile
firmware/tuxaudio/trunk/main.c
firmware/tuxcore/trunk/Makefile
firmware/tuxcore/trunk/global.c
firmware/tuxdefs/commands.h
Log:
jaguarondi
2007-03-29 12:03:03 +0200 (Thu, 29 Mar 2007)
397
- UPD: fixed firmware issue #1 with the patches given by Philippe Teuwen, this now fixes the location of the version, revision and author structures with a linker script in the .version section otherwise gcc is free to change the order. This also fixes the position of the cpu_nbr and ver_major bits in the byte as again gcc is free to change that order though this is much less likely to happen.
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: firmware/tuxaudio/trunk/Makefile
===================================================================
--- firmware/tuxaudio/trunk/Makefile 2007-03-27 11:04:28 UTC (rev 211)
+++ firmware/tuxaudio/trunk/Makefile 2007-03-29 10:03:03 UTC (rev 212)
@@ -54,7 +54,7 @@
## Linker flags
LDFLAGS = $(COMMON)
-LDFLAGS += -Wl,--section-start=.version=0x1DF0 -Wl,-Map=tuxaudio.map
+LDFLAGS += -Wl,--section-start=.version=0x1DF0 -Wl,-Map=tuxaudio.map tuxaudio.ld
## Linker flags for bootloader
BL_LDFLAGS = $(COMMON)
Modified: firmware/tuxaudio/trunk/main.c
===================================================================
--- firmware/tuxaudio/trunk/main.c 2007-03-27 11:04:28 UTC (rev 211)
+++ firmware/tuxaudio/trunk/main.c 2007-03-29 10:03:03 UTC (rev 212)
@@ -39,10 +39,10 @@
*/
#define CPU_NUMBER TUXAUDIO_CPU_NUM /* audio CPU */
-const author_t author __attribute__((section(".version"))) = {AUTHOR_CMD, AUTHOR_ID, 0};
-const revision_t svn_revision __attribute__((section(".version"))) = {REVISION_CMD, SVN_REV, SVN_STATUS};
-const version_t tag_version __attribute__((section(".version"))) = {VERSION_CMD, CPU_NUMBER, VER_MAJOR, VER_MINOR, VER_UPDATE};
-uint8_t info_flg = 0; /* indocates if version information should be sent */
+const author_t author __attribute__((section("version.3"))) = {AUTHOR_CMD, AUTHOR_ID, 0};
+const revision_t svn_revision __attribute__((section("version.2"))) = {REVISION_CMD, SVN_REV, SVN_STATUS};
+const version_t tag_version __attribute__((section("version.1"))) = {VERSION_CMD, CPU_VER_JOIN(CPU_NUMBER, VER_MAJOR), VER_MINOR, VER_UPDATE};
+uint8_t info_flg = 0; /* indicates if version information should be sent */
void send_info(void)
{
Added: firmware/tuxaudio/trunk/tuxaudio.ld
===================================================================
--- firmware/tuxaudio/trunk/tuxaudio.ld (rev 0)
+++ firmware/tuxaudio/trunk/tuxaudio.ld 2007-03-29 10:03:03 UTC (rev 212)
@@ -0,0 +1,11 @@
+SECTIONS {
+ __start_.version = .;
+ .version :
+ {
+ *(version.1)
+ *(version.2)
+ *(version.3)
+ }
+ __stop_.version = .;
+}
+
Modified: firmware/tuxcore/trunk/Makefile
===================================================================
--- firmware/tuxcore/trunk/Makefile 2007-03-27 11:04:28 UTC (rev 211)
+++ firmware/tuxcore/trunk/Makefile 2007-03-29 10:03:03 UTC (rev 212)
@@ -51,11 +51,11 @@
## Linker flags
LDFLAGS = $(COMMON)
-LDFLAGS += -Wl,--section-start=.version=0x1DF0 -Wl,-Map=tuxcore.map
+LDFLAGS += -Wl,--section-start=.version=0x1DF0 -Wl,-Map=tuxcore.map tuxcore.ld
## Linker flags for bootloader
BL_LDFLAGS = $(COMMON)
-BL_LDFLAGS += -Wl,--section-start=.text=0x1E00 -Wl,-Map=tuxcore_bl.map
+BL_LDFLAGS += -Wl,--section-start=.text=0x1E00 -Wl,-Map=tuxcore_bl.map
## Intel Hex file production flags
HEX_FLASH_FLAGS = -R .eeprom
Modified: firmware/tuxcore/trunk/global.c
===================================================================
--- firmware/tuxcore/trunk/global.c 2007-03-27 11:04:28 UTC (rev 211)
+++ firmware/tuxcore/trunk/global.c 2007-03-29 10:03:03 UTC (rev 212)
@@ -50,6 +50,6 @@
*/
#define CPU_NUMBER TUXCORE_CPU_NUM /* tuxcore CPU */
-const author_t author __attribute__((section(".version"))) = {AUTHOR_CMD, AUTHOR_ID, 0};
-const revision_t svn_revision __attribute__((section(".version"))) = {REVISION_CMD, SVN_REV, SVN_STATUS};
-const version_t tag_version __attribute__((section(".version"))) = {VERSION_CMD, CPU_NUMBER, VER_MAJOR, VER_MINOR, VER_UPDATE};
+const author_t author __attribute__((section("version.3"))) = {AUTHOR_CMD, AUTHOR_ID, 0};
+const revision_t svn_revision __attribute__((section("version.2"))) = {REVISION_CMD, SVN_REV, SVN_STATUS};
+const version_t tag_version __attribute__((section("version.1"))) = {VERSION_CMD, CPU_VER_JOIN(CPU_NUMBER, VER_MAJOR), VER_MINOR, VER_UPDATE};
Added: firmware/tuxcore/trunk/tuxcore.ld
===================================================================
--- firmware/tuxcore/trunk/tuxcore.ld (rev 0)
+++ firmware/tuxcore/trunk/tuxcore.ld 2007-03-29 10:03:03 UTC (rev 212)
@@ -0,0 +1,11 @@
+SECTIONS {
+ __start_.version = .;
+ .version :
+ {
+ *(version.1)
+ *(version.2)
+ *(version.3)
+ }
+ __stop_.version = .;
+}
+
Modified: firmware/tuxdefs/commands.h
===================================================================
--- firmware/tuxdefs/commands.h 2007-03-27 11:04:28 UTC (rev 211)
+++ firmware/tuxdefs/commands.h 2007-03-29 10:03:03 UTC (rev 212)
@@ -95,11 +95,11 @@
typedef struct
{
uint8_t version_cmd;
- uint8_t cpu_nbr :3; /* 3 lower bits are the CPU number */
- uint8_t ver_major :5; /* 5 higher bits are the major version number */
+ uint8_t bitfield; /* 3 lower bits are the CPU number, 5 higher bits are the major version number */
uint8_t ver_minor;
uint8_t ver_update;
} version_t;
+#define CPU_VER_JOIN(cpu_nbr, ver_major) ((cpu_nbr & 0x7) + (ver_major << 3))
#define REVISION_CMD 0xC9
typedef struct
@@ -163,12 +163,12 @@
* LED commands
*/
-#define LED_ON_CMD 0x1A /* Turn left LED on */
-#define LED_OFF_CMD 0x1B /* Turn left LED off */
-#define LED_L_ON_CMD 0x1C /* Turn left LED on */
-#define LED_L_OFF_CMD 0x1D /* Turn left LED off */
-#define LED_R_ON_CMD 0x1E /* Turn right LED on */
-#define LED_R_OFF_CMD 0x1F /* Turn right LED off */
+#define LED_ON_CMD 0x1A /* Turn all leds on */
+#define LED_OFF_CMD 0x1B /* Turn all leds off */
+#define LED_L_ON_CMD 0x1C /* Turn left led on */
+#define LED_L_OFF_CMD 0x1D /* Turn left led off */
+#define LED_R_ON_CMD 0x1E /* Turn right led on */
+#define LED_R_OFF_CMD 0x1F /* Turn right led off */
#define LED_BLINK_CMD 0x9A /* Blink both leds multiple time */
/* 1st parameter: number of led toggles */
/* 2nd parameter: delay between each led toggle, in multiple of 4ms */
|
