Commit 3e010689 authored by sletz's avatar sletz
Browse files

Merge Michael Voigt drops branch after reorganization step.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2880 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 92fec924
......@@ -22,8 +22,13 @@ Florian Faber
Jackdmp changes log
---------------------------
2008-09-04 Stephane Letz <letz@grame.fr>
2008-08-05 Stephane Letz <letz@grame.fr>
* Merge Michael Voigt "drops" branch after reorganization step.
2008-08-04 Stephane Letz <letz@grame.fr>
* Michael Voigt 4th source reorganization patch.
* Correct JackNetDriver initialization.
2008-09-03 Stephane Letz <letz@grame.fr>
......@@ -33,8 +38,17 @@ Florian Faber
2008-09-01 Stephane Letz <letz@grame.fr>
* Michael Voigt third source reorganization patch.
* Add new jack_set_port_rename_callback API, jack_port_set_name is now a server request that call port rename callbacks.
2008-08-31 Stephane Letz <letz@grame.fr>
* Michael Voigt second source reorganization patch.
2008-08-28 Stephane Letz <letz@grame.fr>
* Michael Voigt first source reorganization patch.
2008-08-26 Stephane Letz <letz@grame.fr>
* Better parameter handling in JackCoreAudioAdapter.
......
......@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "JackClientControl.h"
#include "JackGlobals.h"
#include "JackTime.h"
#include "JackExports.h"
#include "JackCompilerDeps.h"
#include "JackPortType.h"
#ifdef __APPLE__
......
......@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef __JackActivationCount__
#define __JackActivationCount__
#include "JackPlatformSynchro.h"
#include "JackPlatformPlug.h"
#include "JackTime.h"
#include "JackTypes.h"
......
......@@ -22,171 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "JackTypes.h"
#if defined(__APPLE__)
#if defined(__ppc__) || defined(__ppc64__)
static inline int CAS(register UInt32 value, register UInt32 newvalue, register volatile void* addr)
{
register int result;
asm volatile (
"# CAS \n"
" lwarx r0, 0, %1 \n" // creates a reservation on addr
" cmpw r0, %2 \n" // test value at addr
" bne- 1f \n"
" sync \n" // synchronize instructions
" stwcx. %3, 0, %1 \n" // if the reservation is not altered
// stores the new value at addr
" bne- 1f \n"
" li %0, 1 \n"
" b 2f \n"
"1: \n"
" li %0, 0 \n"
"2: \n"
: "=r" (result)
: "r" (addr), "r" (value), "r" (newvalue)
: "r0"
);
return result;
}
#endif
#if defined(__i386__) || defined(__x86_64__)
#ifdef __SMP__
# define LOCK "lock ; "
#else
# define LOCK ""
#endif
static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
{
register char ret;
__asm__ __volatile__ (
"# CAS \n\t"
LOCK "cmpxchg %2, (%1) \n\t"
"sete %0 \n\t"
: "=a" (ret)
: "c" (addr), "d" (newvalue), "a" (value)
);
return ret;
}
#endif
#endif
#ifdef __linux__
#ifdef __PPC__
static inline int CAS(register UInt32 value, register UInt32 newvalue, register volatile void* addr)
{
register int result;
register UInt32 tmp;
asm volatile (
"# CAS \n"
" lwarx %4, 0, %1 \n" // creates a reservation on addr
" cmpw %4, %2 \n" // test value at addr
" bne- 1f \n"
" sync \n" // synchronize instructions
" stwcx. %3, 0, %1 \n" // if the reservation is not altered
// stores the new value at addr
" bne- 1f \n"
" li %0, 1 \n"
" b 2f \n"
"1: \n"
" li %0, 0 \n"
"2: \n"
: "=r" (result)
: "r" (addr), "r" (value), "r" (newvalue), "r" (tmp)
);
return result;
}
#endif
#if defined(__i386__) || defined(__x86_64__)
#ifdef __SMP__
# define LOCK "lock ; "
#else
# define LOCK ""
#endif
static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
{
register char ret;
__asm__ __volatile__ (
"# CAS \n\t"
LOCK "cmpxchg %2, (%1) \n\t"
"sete %0 \n\t"
: "=a" (ret)
: "c" (addr), "d" (newvalue), "a" (value)
);
return ret;
}
#endif
#endif
#ifdef WIN32
#ifndef __MINGW32__
#ifdef __SMP__
# define LOCK lock
#else
# define LOCK
#endif
#define inline __inline
//----------------------------------------------------------------
// CAS functions
//----------------------------------------------------------------
inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void * addr)
{
register char c;
__asm {
push ebx
push esi
mov esi, addr
mov eax, value
mov ebx, newvalue
LOCK cmpxchg dword ptr [esi], ebx
sete c
pop esi
pop ebx
}
return c;
}
#else
#ifdef __SMP__
# define LOCK "lock ; "
#else
# define LOCK ""
#endif
static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
{
register char ret;
__asm__ __volatile__ (
"# CAS \n\t"
LOCK "cmpxchg %2, (%1) \n\t"
"sete %0 \n\t"
: "=a" (ret)
: "c" (addr), "d" (newvalue), "a" (value)
);
return ret;
}
#endif
#endif
#include "JackAtomic_os.h"
static inline long INC_ATOMIC(volatile SInt32* val)
{
......
......@@ -20,7 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "JackAudioAdapter.h"
#include "JackLibSampleRateResampler.h"
#include "JackError.h"
#include "JackExports.h"
#include "JackCompilerDeps.h"
#include "JackTools.h"
#include "jslist.h"
#include <stdio.h>
......
......@@ -23,11 +23,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <stdlib.h>
#include <assert.h>
#ifdef __cplusplus
extern "C"
{
#endif
#include "driver_interface.h"
#ifdef __linux__
......@@ -40,6 +35,11 @@ extern "C"
#ifdef WIN32
#include "JackPortAudioAdapter.h"
#endif
#ifdef __cplusplus
extern "C"
{
#endif
using namespace Jack;
......
......@@ -41,8 +41,8 @@ namespace Jack
char buffer[1024];
FILE* file = fopen("JackAudioAdapter.log", "w");
int MAX = (fCount) % TABLE_MAX - 1;
for (int i = 1; i < MAX; i++)
int max = (fCount) % TABLE_MAX - 1;
for (int i = 1; i < max; i++)
{
fprintf(file, "%d \t %d \t %d \t %f \t %f \t %d \t %d \n",
fTable[i].delta, fTable[i+1].time1 - fTable[i].time1,
......
......@@ -22,9 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "config.h"
#endif
#ifdef WIN32
#pragma warning (disable : 4786)
#endif
#include "JackSystemDeps.h"
#include "JackAudioDriver.h"
#include "JackTime.h"
......
......@@ -29,8 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "varargs.h"
#include <list>
#include "JackPlatformSynchro.h"
#include "JackPlatformThread.h"
#include "JackPlatformPlug.h"
#include "JackChannel.h"
namespace Jack
......
......@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef __JackClientInterface__
#define __JackClientInterface__
#include "JackExports.h"
#include "JackCompilerDeps.h"
namespace Jack
{
......
......@@ -17,14 +17,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __JackExports__
#define __JackExports__
#ifndef __JackCompilerDeps__
#define __JackCompilerDeps__
#ifdef WIN32
#define EXPORT __declspec(dllexport)
#else
#define EXPORT __attribute__ ((visibility("default")))
#endif
#include "JackCompilerDeps_os.h"
#endif
......@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "JackConstants.h"
#include "JackActivationCount.h"
#include "JackError.h"
#include "JackExports.h"
#include "JackCompilerDeps.h"
#include <assert.h>
......
......@@ -23,7 +23,7 @@
#define __JackControlAPI__
#include "jslist.h"
#include "JackExports.h"
#include "JackCompilerDeps.h"
#ifdef WIN32
#ifdef __MINGW32__
......
......@@ -22,9 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "config.h"
#endif
#ifdef WIN32
#pragma warning (disable : 4786)
#endif
#include "JackSystemDeps.h"
#include "JackDriver.h"
#include "JackTime.h"
......
......@@ -24,7 +24,7 @@
#include "types.h"
#include "JackClientInterface.h"
#include "JackConstants.h"
#include "JackPlatformSynchro.h"
#include "JackPlatformPlug.h"
#include "JackClientControl.h"
#include <list>
......
......@@ -22,9 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "config.h"
#endif
#ifdef WIN32
#pragma warning (disable : 4786)
#endif
#include "JackSystemDeps.h"
/*
#ifndef WIN32
......
......@@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "driver_interface.h"
#include "JackControlAPI.h"
#include "JackPlatformSynchro.h"
#include "JackPlatformPlug.h"
#ifdef WIN32
......
......@@ -27,7 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "JackGraphManager.h"
#include "JackDriverLoader.h"
#include "JackThreadedDriver.h"
#include "JackExports.h"
#include "JackCompilerDeps.h"
#include <iostream>
#include <unistd.h>
......
......@@ -25,10 +25,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <fstream>
#include <assert.h>
#ifndef WIN32
#include <sys/types.h>
#include <signal.h>
#endif
#include "JackSystemDeps.h"
#include "JackLockedEngine.h"
#include "JackExternalClient.h"
......
......@@ -24,8 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "JackGraphManager.h"
#include "JackSynchro.h"
#include "JackTransportEngine.h"
#include "JackPlatformProcessSync.h"
#include "JackPlatformServerNotifyChannel.h"
#include "JackPlatformPlug.h"
namespace Jack
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment