gmane.comp.systems.archos.rockbox.cvs

Fix FS#12559: sigaltstack threads fortify failure

2012-01-27T07:59:10

commit f4954c4a9bda0edbdc8e93314b713c036c4ebfdd
Author: Boris Gjenero <boris.gjenero< at >gmail.com>
Date:   Thu Jan 26 20:33:28 2012 -0500

    Fix FS#12559: sigaltstack threads fortify failure
    
    Ubuntu defines _FORTIFY_SOURCE=2, which causes glibc longjmp() to check sp
    when gcc optimization is enabled. The check does not allow longjmp() to be
    used for switching threads and results in a "longjmp causes uninitialized
    stack frame" error. This disables the check.
    
    Change-Id: Idb8877b43ce711df880ca88875ba5477445a577a

diff --git a/firmware/thread.c b/firmware/thread.c
index 5e543c5..4c15fcc 100644
--- a/firmware/thread.c
+++ b/firmware/thread.c
< at >< at > -19,6 +19,15 < at >< at >
  *
  ****************************************************************************/
 #include "config.h"
+
+#ifdef HAVE_SIGALTSTACK_THREADS
+/*
+ * The sp check in glibc __longjmp_chk() will cause
+ * a fatal error when switching threads via longjmp().
+ */
+#undef _FORTIFY_SOURCE
+#endif
+
 #include <stdbool.h>
 #include <stdio.h

Update CONTRIBUTING to reflect our switch to git on gerrit.

2012-01-24T15:58:31

commit fee6f80fb8bca110a03fc7693a17f4c5e4b798d2
Author: Marcin Bukat <marcin.bukat< at >gmail.com>
Date:   Tue Jan 24 13:05:25 2012 +0100

    Update CONTRIBUTING to reflect our switch to git on gerrit.
    
    Fixes FS#12536
    
    Change-Id: Iee4700ef01eb23c92a026df5074ffcf0257fe0ec

diff --git a/docs/CONTRIBUTING b/docs/CONTRIBUTING
index 83f0aa6..f31b1a8 100644
--- a/docs/CONTRIBUTING
+++ b/docs/CONTRIBUTING
< at >< at > -1,5 +1,3 < at >< at >
-$Id$
-
                __________               __   ___.
      Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
      Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
< at >< at > -55,7 +53,7 < at >< at > Braces for function declarations are put in a new line under the name, as in:
   }
 
 Always indent your code with four spaces. Don't use TAB characters, as that
-will mess up code display in CVS, printing, and a zillion other places.
+will mess up code display, printing, and a zillion other places.
 
 Keep lines below 80 columns length. Use whitespace and newlines to make the

bertrik: r31646 - in trunk: apps/lang docs

2012-01-09T21:19:14

Date: 2012-01-09 22:19:14 +0100 (Mon, 09 Jan 2012)
New Revision: 31646

Log Message:
FS#12511 - Polish translation by Artur Juraszek

Modified:
   trunk/apps/lang/polski.lang
   trunk/docs/CREDITS

Modified: trunk/apps/lang/polski.lang
===================================================================
--- trunk/apps/lang/polski.lang2012-01-09 10:16:05 UTC (rev 31645)
+++ trunk/apps/lang/polski.lang2012-01-09 21:19:14 UTC (rev 31646)
< at >< at > -12075,15 +12075,15 < at >< at >
   user: core
   <source>
     *: none
-    gigabeats,mpiohd200,mpiohd300: "3-D Enhancement"
+    gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement"
   </source>
   <dest>
     *: none
-    gigabeats,mpiohd200,mpiohd300: "Dźwięk 3-D"
+    gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "Efekt 3D"
   </dest>
   <voice>
     *: none
-    gigabeats,mpiohd200,mpiohd300: "Dźwięk 3-D"
+    gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "Efekt 3D"
   </voice>
 </phrase>
 <phrase>
< at >< at > -12697,16 +12697,16 < at >< at >
 </phrase>
 <phrase>
   id: LANG_SET_AS_PL

jdgordon: r31645 - trunk/uisimulator/buttonmap

2012-01-09T10:16:08

Date: 2012-01-09 11:16:05 +0100 (Mon, 09 Jan 2012)
New Revision: 31645

Log Message:
r31444 missed a file. make fuzeplus sim build again

Modified:
   trunk/uisimulator/buttonmap/sansa-fuzeplus.c

Modified: trunk/uisimulator/buttonmap/sansa-fuzeplus.c
===================================================================
--- trunk/uisimulator/buttonmap/sansa-fuzeplus.c2012-01-09 05:23:25 UTC (rev 31644)
+++ trunk/uisimulator/buttonmap/sansa-fuzeplus.c2012-01-09 10:16:05 UTC (rev 31645)
< at >< at > -49,9 +49,6 < at >< at >
         case SDLK_KP9:
             new_btn = BUTTON_PLAYPAUSE;
             break;
-        case SDLK_KP0:
-            new_btn = BUTTON_TWO_FINGERS;
-            break;
         case SDLK_KP7:
             new_btn = BUTTON_BACK;
             break;

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs< at >cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs

jethead71: r31644 - trunk/firmware/export/config

2012-01-09T05:23:26

Date: 2012-01-09 06:23:25 +0100 (Mon, 09 Jan 2012)
New Revision: 31644

Log Message:
Fix Clip Zip bootloader build.

Modified:
   trunk/firmware/export/config/sansaclipzip.h

Modified: trunk/firmware/export/config/sansaclipzip.h
===================================================================
--- trunk/firmware/export/config/sansaclipzip.h2012-01-09 03:26:03 UTC (rev 31643)
+++ trunk/firmware/export/config/sansaclipzip.h2012-01-09 05:23:25 UTC (rev 31644)
< at >< at > -13,6 +13,7 < at >< at >
 #define HAVE_MULTIDRIVE
 #define NUM_DRIVES 2
 #define HAVE_HOTSWAP
+#define HAVE_RDS_CAP
 #endif
 
 #define HW_SAMPR_CAPS       SAMPR_CAP_ALL
< at >< at > -33,8 +34,6 < at >< at >
    explicitly if different */
 #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO)
 
-#define HAVE_RDS_CAP
-
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP
 /* define this if you have a colour LCD */
< at >< at > -123,7 +122,6 < at >< at >
 #define PLUGIN_BUFFER_SIZE 0x80000
 
 #define AB_REPEAT_ENABLE
-
 /* FM Tuner */
 #define CONFIG_TUNER SI4700 /* in fact SI

saratoga: r31643 - in trunk: apps firmware

2012-01-09T03:26:03

Date: 2012-01-09 04:26:03 +0100 (Mon, 09 Jan 2012)
New Revision: 31643

Log Message:
Commit FS#12454 - Faster line scroll speed by Martin Sagmuller.

Modified:
   trunk/apps/settings_list.c
   trunk/firmware/scroll_engine.c

Modified: trunk/apps/settings_list.c
===================================================================
--- trunk/apps/settings_list.c2012-01-08 22:29:25 UTC (rev 31642)
+++ trunk/apps/settings_list.c2012-01-09 03:26:03 UTC (rev 31643)
< at >< at > -967,7 +967,7 < at >< at >
 #endif
 #endif /* HAVE_BACKLIGHT */
     INT_SETTING(F_PADTITLE, scroll_speed, LANG_SCROLL_SPEED, 9,"scroll speed",
-                UNIT_INT, 0, 15, 1, NULL, NULL, lcd_scroll_speed),
+                UNIT_INT, 0, 17, 1, NULL, NULL, lcd_scroll_speed),
     INT_SETTING(F_PADTITLE, scroll_delay, LANG_SCROLL_DELAY, 1000,
                 "scroll delay", UNIT_MS, 0, 2500, 100, NULL,
                 NULL, lcd_scroll_delay),
< at >< at > -975,7 +975,7 < at >< at >
                 UNIT_PERCENT, 0, 200, 25, NULL, NULL, lcd_bidir_scroll),
 #ifdef HAVE_REMOTE_

jethead71: r31642 - in trunk/firmware: . target/arm target/arm/as3525target/arm/as3525/sansa-fuzev2

2012-01-08T22:29:26

Date: 2012-01-08 23:29:25 +0100 (Sun, 08 Jan 2012)
New Revision: 31642

Log Message:
AS3525v1/2: Enable nested handling of interrupts

Mostly for the sake of reducing latency for audio servicing where other service
routines can take a long time to complete, leading to occasional drops of a
few samples, especially in recording, where they are fairly frequent.

One mystery that remains is GPIOA IRQ being interrupted causes strange
undefined instruction exceptions, most easily produced on my Fuze V2 with a
scrollwheel. Making GPIOA the top ISR for now, thus not interruptible, cures it.

SVC mode is used during the actual calls. Hopefully the SVC stack size is
sufficient. Prologue and epilogue code only uses the IRQ stack and is large
enough.

Any routine code that should not be interrupted should disable IRQ itself from
here on in.


Modified:
   trunk/firmware/kernel.c
   trunk/firmware/target/arm/as3525/fmradio-i2c-as3525.c
   trunk/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
   trunk/firmware/tar

bluebrother: r31641 - trunk/tools

2012-01-08T20:09:59

Date: 2012-01-08 21:09:59 +0100 (Sun, 08 Jan 2012)
New Revision: 31641

Log Message:
Rename snprintf when building with MSVC to link with CRT.


Modified:
   trunk/tools/wavtrim.c

Modified: trunk/tools/wavtrim.c
===================================================================
--- trunk/tools/wavtrim.c2012-01-08 19:51:11 UTC (rev 31640)
+++ trunk/tools/wavtrim.c2012-01-08 20:09:59 UTC (rev 31641)
< at >< at > -27,6 +27,10 < at >< at >
 
 #include "wavtrim.h"
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
 /* place a 32 bit value into memory, little endian */
 void Write32(unsigned char* pByte, unsigned long value)
 {

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs< at >cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs

bluebrother: r31640 - in trunk/rbutil: ipodpatcher sansapatcher

2012-01-08T19:51:11

Date: 2012-01-08 20:51:11 +0100 (Sun, 08 Jan 2012)
New Revision: 31640

Log Message:
MSVC compatibility adjustments.

When using a global variable from a DLL with MSVC special handling is necessary
to avoid going through additional redirection.


Modified:
   trunk/rbutil/ipodpatcher/ipodpatcher.h
   trunk/rbutil/sansapatcher/sansapatcher.h

Modified: trunk/rbutil/ipodpatcher/ipodpatcher.h
===================================================================
--- trunk/rbutil/ipodpatcher/ipodpatcher.h2012-01-08 17:59:52 UTC (rev 31639)
+++ trunk/rbutil/ipodpatcher/ipodpatcher.h2012-01-08 19:51:11 UTC (rev 31640)
< at >< at > -31,7 +31,17 < at >< at >
 /* Size of buffer for disk I/O - 8MB is large enough for any version
    of the Apple firmware, but not the Nano's RSRC image. */
 #define BUFFER_SIZE 8*1024*1024
+
+#ifndef _MSC_VER
 extern unsigned char* ipod_sectorbuf;
+#else
+/* MSVC needs to use dllimport to allow using it directly from a DLL.
+ * See http://support.microsoft.com/kb/90530
+ * Building with MSVC is only when us

amiconn: r31639 - trunk/tools

2012-01-08T17:59:52

Date: 2012-01-08 18:59:52 +0100 (Sun, 08 Jan 2012)
New Revision: 31639

Log Message:
Add missing languages from configure, and sort them in exactly the same order for easier maintenance.

Modified:
   trunk/tools/sapi_voice.vbs

Modified: trunk/tools/sapi_voice.vbs
===================================================================
--- trunk/tools/sapi_voice.vbs2012-01-08 17:38:40 UTC (rev 31638)
+++ trunk/tools/sapi_voice.vbs2012-01-08 17:59:52 UTC (rev 31639)
< at >< at > -270,6 +270,8 < at >< at >
     Dim aIDs
 
     Select Case sLanguage
+        Case "afrikaans"
+            LangIDs = Array(&h436)
         Case "arabic"
             LangIDs = Array( &h401,  &h801,  &hc01, &h1001, &h1401, &h1801, _
                             &h1c01, &h2001, &h2401, &h2801, &h2c01, &h3001, _
< at >< at > -277,8 +279,8 < at >< at >
             ' Saudi Arabia, Iraq, Egypt, Libya, Algeria, Morocco, Tunisia,
             ' Oman, Yemen, Syria, Jordan, Lebanon, Kuwait, U.A.E., Bahrain,
             ' Qatar
-        Case "afrikaans"
-            LangIDs = Array(

amiconn: r31638 - trunk/tools

2012-01-08T17:38:40

Date: 2012-01-08 18:38:40 +0100 (Sun, 08 Jan 2012)
New Revision: 31638

Log Message:
Remove outdated (and buggy) configuration option for the 8MB mod. This is configured by selecting memory size directly.


Modified:
   trunk/tools/configure

Modified: trunk/tools/configure
===================================================================
--- trunk/tools/configure2012-01-08 13:59:15 UTC (rev 31637)
+++ trunk/tools/configure2012-01-08 17:38:40 UTC (rev 31638)
< at >< at > -720,9 +720,6 < at >< at >
     printf "Enter your developer options (press only enter when done)\n\
 (D)EBUG, (L)ogf, Boot(c)hart, (S)imulator, (P)rofiling, (V)oice, (W)in32 crosscompile,\n\
 (T)est plugins, S(m)all C lib:"
-    if [ "$memory" = "2" ]; then
-      printf ", (8)MB MOD"
-    fi
     if [ "$modelname" = "archosplayer" ]; then
       printf ", Use (A)TA poweroff"
     fi
< at >< at > -789,12 +786,6 < at >< at >
         echo "Voice build selected"
         voice="yes"
         ;;
-      8)
-        if [ "$memory" = "2" ]; then
-          memory="8"
-          ech

amiconn: r31637 - trunk/tools

2012-01-08T13:59:15

Date: 2012-01-08 14:59:15 +0100 (Sun, 08 Jan 2012)
New Revision: 31637

Log Message:
Fix several flaws in argument handling and reconfiguring, mainly related to voice building: (1) Properly retain arguments containing spaces by re-quoting them. (2) Properly retain --tts when the default is selected by just pressing return. (3) Only append --tts and --language if they weren't already specified on the commandline, preventing duplication on 'make reconf'. (4) Never append --ttsopts and --encopts for the same reason. These are commandline only anyway.

Modified:
   trunk/tools/configure

Modified: trunk/tools/configure
===================================================================
--- trunk/tools/configure2012-01-08 12:57:02 UTC (rev 31636)
+++ trunk/tools/configure2012-01-08 13:59:15 UTC (rev 31637)
< at >< at > -29,7 +29,16 < at >< at >
 app_lcd_width=
 app_lcd_height=
 app_lcd_orientation=
-cmdline="$< at >"
+
+# Properly retain command line arguments containing spaces
+cmdline=
+for arg in "$< at >"; do
+  case "$arg" in
+    *\ *

bertrik: r31636 - trunk/firmware/target/arm/as3525

2012-01-08T12:57:03

Date: 2012-01-08 13:57:02 +0100 (Sun, 08 Jan 2012)
New Revision: 31636

Log Message:
Remove duplicate #include "button.h"

Modified:
   trunk/firmware/target/arm/as3525/button-e200v2-fuze.c

Modified: trunk/firmware/target/arm/as3525/button-e200v2-fuze.c
===================================================================
--- trunk/firmware/target/arm/as3525/button-e200v2-fuze.c2012-01-08 12:07:17 UTC (rev 31635)
+++ trunk/firmware/target/arm/as3525/button-e200v2-fuze.c2012-01-08 12:57:02 UTC (rev 31636)
< at >< at > -23,7 +23,6 < at >< at >
 #include "config.h"
 #include "system.h"
 #include "button.h"
-#include "button.h"
 #include "backlight.h"
 #include "dbop-as3525.h"
 

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs< at >cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs

nick_p: r31635 - trunk/uisimulator/common

2012-01-08T12:07:17

Date: 2012-01-08 13:07:17 +0100 (Sun, 08 Jan 2012)
New Revision: 31635

Log Message:
Simulator: Emulate a period of external power after charging.

Also a bit of optimisation of battery_status_update().

FS#12506


Modified:
   trunk/uisimulator/common/powermgmt-sim.c

Modified: trunk/uisimulator/common/powermgmt-sim.c
===================================================================
--- trunk/uisimulator/common/powermgmt-sim.c2012-01-08 11:50:04 UTC (rev 31634)
+++ trunk/uisimulator/common/powermgmt-sim.c2012-01-08 12:07:17 UTC (rev 31635)
< at >< at > -30,51 +30,76 < at >< at >
 #define BATT_MAXMVOLT   4300      /* maximum millivolts of battery */
 #define BATT_MAXRUNTIME (10 * 60) /* maximum runtime with full battery in
                                      minutes */
+/* Number of millivolts to discharge the battery every second */
+#define BATT_DISCHARGE_STEP ((BATT_MAXMVOLT - BATT_MINMVOLT) / 100)
+/* Number of millivolts to charge the battery every second */
+#define BATT_CHARGE_STEP (BATT_DISCHARGE_STEP * 2)
+#if CO

bluebrother: r31634 - in trunk/rbutil/rbutilqt: . base lame

2012-01-08T11:50:05

Date: 2012-01-08 12:50:04 +0100 (Sun, 08 Jan 2012)
New Revision: 31634

Log Message:
Rockbox Utility: use libmp3lame for voice clips.

Instead of calling the lame executable use libmp3lame directly. As result, this
simplifies the prerequisites for creating voice clips for Archos devices to
putting the library in the system's search path (Windows: put libmp3lame.dll in
the search path or the same folder RockboxUtility.exe is located in. Linux:
install the library using your systems package manager) and configuration.

This creates a notable encoding speedup on Windows (around factor 6 on my test
setup) and a small speedup on Linux (around factor 1.2).

The implemenatation currently has the following limitations:
- Only enabled on Windows and Linux. On OS X installing the correct dylib is a
  bit nontrivial, so using the old command line based method is still in use
  for now.
- The encoder parameters are currently hardcoded to use the same values the
  build system uses.

Added:
   trunk/rbutil/rbutilqt/base/

bluebrother: r31633 - trunk/rbutil/rbutilqt/base

2012-01-08T11:49:57

Date: 2012-01-08 12:49:57 +0100 (Sun, 08 Jan 2012)
New Revision: 31633

Log Message:
Fix wrong includes.

Modified:
   trunk/rbutil/rbutilqt/base/encoderbase.h
   trunk/rbutil/rbutilqt/base/encoderrbspeex.cpp

Modified: trunk/rbutil/rbutilqt/base/encoderbase.h
===================================================================
--- trunk/rbutil/rbutilqt/base/encoderbase.h2012-01-08 10:31:29 UTC (rev 31632)
+++ trunk/rbutil/rbutilqt/base/encoderbase.h2012-01-08 11:49:57 UTC (rev 31633)
< at >< at > -24,7 +24,6 < at >< at >
 #include <QtCore>
 
 #include "encttssettings.h"
-#include "rbspeex.h"
 
 
 class EncoderBase : public EncTtsSettingInterface

Modified: trunk/rbutil/rbutilqt/base/encoderrbspeex.cpp
===================================================================
--- trunk/rbutil/rbutilqt/base/encoderrbspeex.cpp2012-01-08 10:31:29 UTC (rev 31632)
+++ trunk/rbutil/rbutilqt/base/encoderrbspeex.cpp2012-01-08 11:49:57 UTC (rev 31633)
< at >< at > -19,6 +19,7 < at >< at >
 #include <QtCore>
 #include "encoderrbspeex.h"
 #include "rbsettings.h"

bertrik: r31632 - trunk/apps/lang

2012-01-08T10:31:30

Date: 2012-01-08 11:31:29 +0100 (Sun, 08 Jan 2012)
New Revision: 31632

Log Message:
FS#12406 - Updated Galician translation by Ismael Casti?\195?\177eira ?\195?\129lvarez

Modified:
   trunk/apps/lang/galego.lang

Modified: trunk/apps/lang/galego.lang
===================================================================
--- trunk/apps/lang/galego.lang2012-01-08 08:55:25 UTC (rev 31631)
+++ trunk/apps/lang/galego.lang2012-01-08 10:31:29 UTC (rev 31632)
< at >< at > -29,7 +29,7 < at >< at >
     *: "Sí"
   </dest>
   <voice>
-    *: "Yes"
+    *: "Sí"
   </voice>
 </phrase>
 <phrase>
< at >< at > -43,7 +43,7 < at >< at >
     *: "Non"
   </dest>
   <voice>
-    *: "No"
+    *: "Non"
   </voice>
 </phrase>
 <phrase>
< at >< at > -6205,17 +6205,16 < at >< at >
     iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
     gogearsa9200: "Building database... %d found (REW to return)"
+    archosplayer: "Building DB %d

bertrik: r31631 - trunk/apps/plugins/sudoku

2012-01-08T08:55:26

Date: 2012-01-08 09:55:25 +0100 (Sun, 08 Jan 2012)
New Revision: 31631

Log Message:
sudoku: make local functions static and add missing #include

Modified:
   trunk/apps/plugins/sudoku/generator.c
   trunk/apps/plugins/sudoku/sudoku.c

Modified: trunk/apps/plugins/sudoku/generator.c
===================================================================
--- trunk/apps/plugins/sudoku/generator.c2012-01-08 07:05:58 UTC (rev 31630)
+++ trunk/apps/plugins/sudoku/generator.c2012-01-08 08:55:25 UTC (rev 31631)
< at >< at > -34,6 +34,7 < at >< at >
 
 #include "sudoku.h"
 #include "templates.h"
+#include "generator.h"
 
 #define assert(x)
 
< at >< at > -618,6 +619,7 < at >< at >
 }
 
 /* Helper: sort based on index */
+#if 0 /* unused function */
 static
 int
 cmpindex( const void * a, const void * b )
< at >< at > -629,7 +631,7 < at >< at >
  * 'easy' moves first, and if none are possible, then try for more
  * cryptic moves.
  */
-int
+static int
 findhints( void )
 {
     int i, n, mutated = 0;
< at >< at > -695,6 +697,7 < at >< at >
 
     return n;
 }
+#endif /* unused function */
 
 /* D

saratoga: r31630 - trunk/manual/getting_started

2012-01-08T07:05:58

Date: 2012-01-08 08:05:58 +0100 (Sun, 08 Jan 2012)
New Revision: 31630

Log Message:
Clarify that you must reboot into the Sandisk firmware when uninstalling the bootloader.

Modified:
   trunk/manual/getting_started/installation.tex

Modified: trunk/manual/getting_started/installation.tex
===================================================================
--- trunk/manual/getting_started/installation.tex2012-01-08 02:33:43 UTC (rev 31629)
+++ trunk/manual/getting_started/installation.tex2012-01-08 07:05:58 UTC (rev 31630)
< at >< at > -749,7 +749,8 < at >< at >
 }
 
     \opt{sansaAMS}{
-      Copy an unmodified original firmware to your player and update it.
+      Copy an unmodified original firmware to your player, and then reboot into 
+      the Sandisk firmware.  
 }
 
 \opt{mpiohd200}{

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs< at >cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs

funman: r31629 - in trunk/firmware: . drivers target/arm

2012-01-08T02:33:43

Date: 2012-01-08 03:33:43 +0100 (Sun, 08 Jan 2012)
New Revision: 31629

Log Message:
adc-as3514.c : move to drivers

Added:
   trunk/firmware/drivers/adc-as3514.c
Removed:
   trunk/firmware/target/arm/adc-as3514.c
Modified:
   trunk/firmware/SOURCES

Modified: trunk/firmware/SOURCES
===================================================================
--- trunk/firmware/SOURCES2012-01-08 01:51:51 UTC (rev 31628)
+++ trunk/firmware/SOURCES2012-01-08 02:33:43 UTC (rev 31629)
< at >< at > -64,7 +64,7 < at >< at >
 #endif
 
 #ifdef SAMSUNG_YPR0
-target/arm/adc-as3514.c
+drivers/adc-as3514.c
 #if (CONFIG_RTC == RTC_AS3514)
 drivers/rtc/rtc_as3514.c
 #else
< at >< at > -748,7 +748,7 < at >< at >
 target/arm/pp/ascodec-pp.c
 # endif
 # if !defined(BOOTLOADER) || defined(CPU_PP)
-target/arm/adc-as3514.c
+drivers/adc-as3514.c
 #  if !defined(SANSA_M200V4) && !defined(SAMSUNG_YPR0)
 target/arm/powermgmt-ascodec.c
 #  endif

Copied: trunk/firmware/drivers/adc-as3514.c (from rev 31628, trunk/firmware/target/arm/adc-as3514.c)
==================================

funman: r31628 - trunk/apps

2012-01-08T01:51:51

Date: 2012-01-08 02:51:51 +0100 (Sun, 08 Jan 2012)
New Revision: 31628

Log Message:
fix cpp condition

Modified:
   trunk/apps/debug_menu.c

Modified: trunk/apps/debug_menu.c
===================================================================
--- trunk/apps/debug_menu.c2012-01-08 01:44:08 UTC (rev 31627)
+++ trunk/apps/debug_menu.c2012-01-08 01:51:51 UTC (rev 31628)
< at >< at > -1126,7 +1126,7 < at >< at >
                     lcd_puts(0, line++, "T Battery: ?");
                 }
                     
-#if defined(HAVE_AS3514) && defined(CONFIG_CHARGING)
+#elif defined(HAVE_AS3514) && defined(CONFIG_CHARGING)
                 static const char * const chrgstate_strings[] =
                 {
                     [CHARGE_STATE_DISABLED - CHARGE_STATE_DISABLED]= "Disabled",

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs< at >cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs