Changeset 1254

Show
Ignore:
Timestamp:
06/08/08 07:34:59 (12 years ago)
Author:
ppalmers
Message:

split config.h into config/version/debug_config to allow for faster compilation (splits dependencies)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/config.h.in

    r1239 r1254  
    22#ifndef CONFIG_H 
    33#define CONFIG_H 
    4  
    5 /* Name of package */ 
    6 #define PACKAGE $PACKAGE 
    7  
    8 /* Define to the address where bug reports for this package should be sent. */ 
    9 #define PACKAGE_BUGREPORT "<ffado-devel@lists.sf.net>" 
    10  
    11 /* Define to the full name of this package. */ 
    12 #define PACKAGE_NAME "$PACKAGE" 
    13  
    14 /* Define to the full name and version of this package. */ 
    15 #define PACKAGE_STRING "$PACKAGE $VERSION-$REVISION" 
    16  
    17 /* Define to the one symbol short name of this package. */ 
    18 #define PACKAGE_TARNAME "$PACKAGE" 
    19  
    20 /* Define to the version of this package. */ 
    21 #define PACKAGE_VERSION "$VERSION-$REVISION" 
    22  
    23 /* Define to the version of the cace. */ 
    24 #define CACHE_VERSION "$VERSION-$REVISION" 
    25 #define CACHEDIR "$CACHEDIR" 
    26  
    27 /* Define to the api version */ 
    28 #define FFADO_API_VERSION $FFADO_API_VERSION 
    294 
    305#define BINDIR "$BINDIR" 
     
    4116#define SERIALIZE_USE_EXPAT $SERIALIZE_USE_EXPAT 
    4217 
    43 // use a RT-safe message buffer for debug output 
    44 // useful to disable this when the code aborts/segfaults to 
    45 // not lose debug output. should be enabled though. 
    46 #define DEBUG_USE_MESSAGE_BUFFER             1 
    47 // max message length in the debug messagebuffer 
    48 #define DEBUG_MAX_MESSAGE_LENGTH           512 
    49 // number of messages in the debug messagebuffer (power of two) 
    50 #define DEBUG_MB_BUFFERS                  1024 
    51  
    52 // use an RT thread for reading out the messagebuffer. 
    53 // can reduce the number of buffer xruns, but not 
    54 // recommended 
    55 #define DEBUG_MESSAGE_BUFFER_REALTIME        0 
    56 #define DEBUG_MESSAGE_BUFFER_REALTIME_PRIO   1 
    57  
    58 // When a write can't get the buffer lock, how many times 
    59 // should it retry, and wait how long between retries? 
    60 #define DEBUG_MESSAGE_BUFFER_COLLISION_WAIT_NTRIES      2 
    61 #define DEBUG_MESSAGE_BUFFER_COLLISION_WAIT_NSEC    50000 
    62  
    63  
    64 // support a debug backlog 
    65 // note that this does not influence non-debug builds 
    66 #define DEBUG_BACKLOG_SUPPORT                0 
    67 // number of messages in the backlog buffer (power of two) 
    68 #define DEBUG_BACKLOG_MB_BUFFERS            64 
    69  
    70 // support backtrace debugging 
    71 // note that this does not influence non-debug builds 
    72 #define DEBUG_BACKTRACE_SUPPORT              0 
    73 // max length of backtrace 
    74 #define DEBUG_MAX_BACKTRACE_LENGTH           8 
    75 // max amount of function pointers to keep track of 
    76 #define DEBUG_MAX_BACKTRACE_FUNCTIONS_SEEN  64 
    77  
    78 // lock debugging 
    79 #define DEBUG_LOCK_COLLISION_TRACING         0 
    80  
    81 // make this zero to disable the most extreme 
    82 // debug logging in the critical sections 
    83 #define DEBUG_EXTREME_ENABLE                 0 
     18#define CACHEDIR "$CACHEDIR" 
    8419 
    8520// discovery 
  • trunk/libffado/SConstruct

    r1240 r1254  
    525525# 
    526526env.ScanReplace( "config.h.in" ) 
    527 # ensure that the config.h is updated with the version 
    528  
     527# ensure that the config.h is updated 
    529528env.Depends( "config.h", "SConstruct" ) 
    530529env.Depends( "config.h", 'cache/' + build_base + "options.cache" ) 
    531530 
    532 # update config.h whenever the SVN revision changes 
    533 env.Depends( "config.h", env.Value(env['REVISION'])) 
     531env.ScanReplace( "config_debug.h.in" ) 
     532 
     533env.ScanReplace( "version.h.in" ) 
     534env.Depends( "version.h", "SConstruct" ) 
     535env.Depends( "version.h", 'cache/' + build_base + "options.cache" ) 
     536# update version.h whenever the SVN revision changes 
     537env.Depends( "version.h", env.Value(env['REVISION'])) 
    534538 
    535539env.Depends( "libffado.pc", "SConstruct" ) 
  • trunk/libffado/src/debugmodule/debugmodule.cpp

    r1232 r1254  
    2424 
    2525#include "debugmodule.h" 
    26 #include "config.h" 
    2726 
    2827#include <stdarg.h> 
  • trunk/libffado/src/debugmodule/debugmodule.h

    r1211 r1254  
    2626#define DEBUGMODULE_H 
    2727 
    28 #include "config.h" 
     28#include "config_debug.h" 
    2929 
    3030#include "../fbtypes.h" 
  • trunk/libffado/src/devicemanager.cpp

    r1239 r1254  
    2323 */ 
    2424 
     25#include "config.h" 
    2526#include "fbtypes.h" 
    2627 
  • trunk/libffado/src/ffado.cpp

    r1047 r1254  
    2727 */ 
    2828 
    29 #include "config.h" 
     29#include "version.h" 
    3030 
    3131#include "../libffado/ffado.h" 
  • trunk/libffado/src/fireworks/fireworks_device.cpp

    r1239 r1254  
    2222 */ 
    2323 
     24#include "config.h" 
     25 
    2426#include "fireworks_device.h" 
    2527#include "efc/efc_avc_cmd.h" 
     
    3335#include "libieee1394/configrom.h" 
    3436#include "libieee1394/ieee1394service.h" 
    35  
    36 #include "config.h" 
    3737 
    3838#include "fireworks/fireworks_control.h" 
     
    106106        unsigned int vendorId = configRom.getNodeVendorId(); 
    107107        unsigned int modelId = configRom.getModelId(); 
    108      
     108 
    109109        GenericAVC::VendorModel vendorModel( SHAREDIR "/ffado_driver_fireworks.txt" ); 
    110110        if ( vendorModel.parse() ) { 
  • trunk/libffado/src/genericavc/avc_avdevice.cpp

    r1239 r1254  
    2323 */ 
    2424 
     25#include "config.h" 
     26 
    2527#include "genericavc/avc_avdevice.h" 
    2628 
     
    3436 
    3537#include "debugmodule/debugmodule.h" 
    36  
    37 #include "config.h" 
    3838 
    3939#include <string> 
  • trunk/libffado/src/libavc/descriptors/avc_descriptor.cpp

    r1234 r1254  
    298298        return false; 
    299299    } 
    300      
     300 
    301301#ifdef DEBUG 
    302302    if(getDebugLevel() >= DEBUG_LEVEL_VERY_VERBOSE) { 
    303303        Util::Cmd::StringSerializer se_dbg; 
    304304        serialize( se_dbg ); 
    305          
     305 
    306306        // output the debug message in smaller chunks to avoid problems 
    307307        // with a max message size 
  • trunk/libffado/src/libieee1394/configrom.cpp

    r1186 r1254  
    2424 */ 
    2525 
     26#include "config.h" 
     27 
    2628#include "configrom.h" 
    2729#include "ieee1394service.h" 
  • trunk/libffado/src/libieee1394/ieee1394service.cpp

    r1163 r1254  
    2424 
    2525#include "config.h" 
     26 
    2627#include "ieee1394service.h" 
    2728#include "ARMHandler.h" 
  • trunk/libffado/src/libieee1394/IsoHandler.cpp

    r1246 r1254  
    2222 */ 
    2323 
    24 #include "config.h" 
     24 
    2525 
    2626#include "IsoHandler.h" 
  • trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

    r1246 r1254  
    2323 
    2424#include "config.h" 
     25 
    2526#include "IsoHandlerManager.h" 
    2627#include "ieee1394service.h" 
  • trunk/libffado/src/libieee1394/IsoHandlerManager.h

    r1144 r1254  
    2626 
    2727#include "config.h" 
     28 
    2829#include "debugmodule/debugmodule.h" 
    2930 
  • trunk/libffado/src/libstreaming/amdtp/AmdtpBufferOps.h

    r864 r1254  
    2727#include <assert.h> 
    2828// to check for SSE etc... 
    29 #include "config.h" 
     29 
    3030 
    3131#include <stdio.h> 
  • trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp

    r1136 r1254  
    2121 * 
    2222 */ 
    23 #include "config.h" 
     23 
    2424 
    2525#include "AmdtpReceiveStreamProcessor.h" 
  • trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

    r1234 r1254  
    2323 
    2424#include "config.h" 
     25 
    2526#include "AmdtpTransmitStreamProcessor.h" 
    2627#include "AmdtpPort.h" 
  • trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp

    r1168 r1254  
    2222 */ 
    2323 
    24 #include "config.h" 
     24 
    2525 
    2626#include "StreamProcessor.h" 
  • trunk/libffado/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp

    r1234 r1254  
    2323 */ 
    2424 
    25 #include "config.h" 
     25 
    2626#include "libutil/float_cast.h" 
    2727 
  • trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp

    r1234 r1254  
    2424 
    2525#include "config.h" 
     26 
    2627#include "libutil/float_cast.h" 
    2728 
  • trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

    r1165 r1254  
    2121 * 
    2222 */ 
     23 
    2324#include "config.h" 
    2425 
  • trunk/libffado/src/libutil/ByteSwap.h

    r1152 r1254  
    3131 
    3232// to check for SSE etc... 
    33 #include "config.h" 
     33 
    3434 
    3535#include <stdio.h> 
  • trunk/libffado/src/libutil/IpcRingBuffer.h

    r1240 r1254  
    2828#include <string> 
    2929 
    30 #include "config.h" 
     30 
    3131 
    3232#define FFADO_IPC_RINGBUFFER_MAGIC   0x57439812 
  • trunk/libffado/src/libutil/PosixMutex.h

    r1172 r1254  
    2525#define __POSIX_MUTEX__ 
    2626 
    27 #include "config.h" 
     27 
    2828 
    2929#include "Mutex.h" 
  • trunk/libffado/src/libutil/serialize.h

    r1154 r1254  
    2525#define __FFADO_UTIL_SERIALIZE_H__ 
    2626 
    27 #include "config.h" 
     27 
    2828 
    2929#if SERIALIZE_USE_EXPAT 
  • trunk/libffado/src/libutil/serialize_expat.cpp

    r1154 r1254  
    2222 * 
    2323 */ 
    24 #include "config.h" // FOR CACHE_VERSION 
     24 // FOR CACHE_VERSION 
    2525 
    2626#include "serialize.h" 
  • trunk/libffado/src/libutil/serialize_libxml.cpp

    r1234 r1254  
    2121 * 
    2222 */ 
    23 #include "config.h" // FOR CACHE_VERSION 
     23 
     24#include "version.h" // FOR CACHE_VERSION 
    2425 
    2526#include "serialize.h" 
     
    2930 
    3031using namespace std; 
    31  
    3232 
    3333IMPL_DEBUG_MODULE( Util::XMLSerialize,   XMLSerialize,   DEBUG_LEVEL_NORMAL ); 
  • trunk/libffado/support/alsa/alsa_plugin.cpp

    r1240 r1254  
    3333extern "C" { 
    3434 
    35 #include "config.h" 
     35#include "version.h" 
    3636 
    3737#include <byteswap.h> 
  • trunk/libffado/support/dbus/ffado-dbus-server.cpp

    r1239 r1254  
    2727 */ 
    2828 
    29 #include <config.h> 
     29#include "version.h" 
     30 
    3031#include <semaphore.h> 
    3132 
  • trunk/libffado/tests/streaming/teststreaming-ipc.cpp

    r1240 r1254  
    2626 * Test application for the IPC audio server 
    2727 */ 
    28  
    29 #include "config.h" 
    3028 
    3129#include <stdio.h> 
  • trunk/libffado/tests/streaming/teststreaming3.cpp

    r1172 r1254  
    2727 * for floating point use 
    2828 */ 
    29  
    30 #include "config.h" 
    3129 
    3230#include <stdio.h> 
  • trunk/libffado/tests/test-ffado.cpp

    r1239 r1254  
    2727 */ 
    2828 
    29 #include <config.h> 
     29#include "version.h" 
    3030 
    3131#include "libffado/ffado.h"