Remove os_generic, go back into normal troubleshooting.

4 files changed, 3 insertions, 415 deletions

diff --git a/src/os_generic.c b/src/os_generic.c
deleted file mode 100644
index 2429ad9..0000000
--- a/src/os_generic.c
+++ /dev/null
@@ -1,336 +0,0 @@
-#include "os_generic.h"
-
-#ifdef USE_WINDOWS
-
-#include <windows.h>
-
-void OGSleep( int is )
-{
-	Sleep( is*1000 );
-}
-
-void OGUSleep( int ius )
-{
-	Sleep( ius/1000 );
-}
-
-double OGGetAbsoluteTime()
-{
-	static LARGE_INTEGER lpf;
-	LARGE_INTEGER li;
-
-	if( !lpf.QuadPart )
-	{
-		QueryPerformanceFrequency( &lpf );
-	}
-
-	QueryPerformanceCounter( &li );
-	return (double)li.QuadPart / (double)lpf.QuadPart;
-}
-
-
-double OGGetFileTime( const char * file )
-{
-	FILETIME ft;
-
-	HANDLE h = CreateFile(file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
-
-	if( h==INVALID_HANDLE_VALUE )
-		return -1;
-
-	GetFileTime( h, 0, 0, &ft );
-
-	CloseHandle( h );
-
-	return ft.dwHighDateTime + ft.dwLowDateTime;
-}
-
-
-og_thread_t OGCreateThread( void * (routine)( void * ), void * parameter )
-{
-	return (og_thread_t)CreateThread( 0, 0, (LPTHREAD_START_ROUTINE)routine, parameter, 0, 0 );
-}
-
-void * OGJoinThread( og_thread_t ot )
-{
-	WaitForSingleObject( ot, INFINITE );
-	CloseHandle( ot );
-}
-
-void OGCancelThread( og_thread_t ot )
-{
-	CloseHandle( ot );	
-}
-
-og_mutex_t OGCreateMutex()
-{
-	return CreateMutex( 0, 0, 0 );
-}
-
-void OGLockMutex( og_mutex_t om )
-{
-	WaitForSingleObject(om, INFINITE);
-}
-
-void OGUnlockMutex( og_mutex_t om )
-{
-	ReleaseMutex(om);
-}
-
-void OGDeleteMutex( og_mutex_t om )
-{
-	CloseHandle( om );
-}
-
-
-
-og_sema_t OGCreateSema()
-{
-	HANDLE sem = CreateSemaphore( 0, 0, 32767, 0 );
-	return (og_sema_t)sem;
-}
-
-int OGGetSema( og_sema_t os )
-{
-	typedef LONG NTSTATUS;
-	HANDLE sem = (HANDLE)os;
-	typedef NTSTATUS (NTAPI *_NtQuerySemaphore)(
-		HANDLE SemaphoreHandle, 
-		DWORD SemaphoreInformationClass, /* Would be SEMAPHORE_INFORMATION_CLASS */
-		PVOID SemaphoreInformation,      /* but this is to much to dump here     */
-		ULONG SemaphoreInformationLength, 
-		PULONG ReturnLength OPTIONAL
-	);
-
-	typedef struct _SEMAPHORE_BASIC_INFORMATION {   
-		ULONG CurrentCount; 
-		ULONG MaximumCount;
-	} SEMAPHORE_BASIC_INFORMATION;
-
-
-	static _NtQuerySemaphore NtQuerySemaphore;
-	SEMAPHORE_BASIC_INFORMATION BasicInfo;
-	NTSTATUS Status;
-
-	if( !NtQuerySemaphore )
-	{	
-	    NtQuerySemaphore = (_NtQuerySemaphore)GetProcAddress (GetModuleHandle ("ntdll.dll"), "NtQuerySemaphore");
-		if( !NtQuerySemaphore )
-		{
-			return -1;
-		}
-	}
-
-	
-    Status = NtQuerySemaphore (sem, 0 /*SemaphoreBasicInformation*/, 
-        &BasicInfo, sizeof (SEMAPHORE_BASIC_INFORMATION), NULL);
-
-    if (Status == ERROR_SUCCESS)
-    {       
-        return BasicInfo.CurrentCount;
-    }
-
-	return -2;
-}
-
-void OGLockSema( og_sema_t os )
-{
-	WaitForSingleObject( (HANDLE)os, INFINITE );
-}
-
-void OGUnlockSema( og_sema_t os )
-{
-	ReleaseSemaphore( (HANDLE)os, 1, 0 );
-}
-
-void OGDeleteSema( og_sema_t os )
-{
-	CloseHandle( os );
-}
-
-#else
-
-#define _GNU_SOURCE
-
-
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <sys/time.h>
-#include <semaphore.h>
-#include <unistd.h>
-
-
-pthread_mutex_t g_RawMutexStart = PTHREAD_MUTEX_INITIALIZER;
-
-void OGSleep( int is )
-{
-	sleep( is );
-}
-
-void OGUSleep( int ius )
-{
-	usleep( ius );
-}
-
-double OGGetAbsoluteTime()
-{
-	struct timeval tv;
-	gettimeofday( &tv, 0 );
-	return ((double)tv.tv_usec)/1000000. + (tv.tv_sec);
-}
-
-double OGGetFileTime( const char * file )
-{
-	struct stat buff; 
-
-	int r = stat( file, &buff );
-
-	if( r < 0 )
-	{
-		return -1;
-	}
-
-	return buff.st_mtime;
-}
-
-
-
-og_thread_t OGCreateThread( void * (routine)( void * ), void * parameter )
-{
-	pthread_t * ret = malloc( sizeof( pthread_t ) );
-	int r = pthread_create( ret, 0, routine, parameter );
-	if( r )
-	{
-		free( ret );
-		return 0;
-	}
-	return (og_thread_t)ret;
-}
-
-void * OGJoinThread( og_thread_t ot )
-{
-	void * retval;
-	if( !ot )
-	{
-		return 0;
-	}
-	pthread_join( *(pthread_t*)ot, &retval );
-	free( ot );
-	return retval;
-}
-
-void OGCancelThread( og_thread_t ot )
-{
-	if( !ot )
-	{
-		return;
-	}
-	pthread_cancel( *(pthread_t*)ot );
-	free( ot );
-}
-
-og_mutex_t OGCreateMutex()
-{
-	pthread_mutexattr_t   mta;
-	og_mutex_t r = malloc( sizeof( pthread_mutex_t ) );
-
-	pthread_mutexattr_init(&mta);
-	pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_RECURSIVE);
-
-	pthread_mutex_init( (pthread_mutex_t *)r, &mta );
-
-	return r;
-}
-
-void OGLockMutex( og_mutex_t om )
-{
-	if( !om )
-	{
-		return;
-	}
-	pthread_mutex_lock( (pthread_mutex_t*)om );
-}
-
-void OGUnlockMutex( og_mutex_t om )
-{
-	if( !om )
-	{
-		return;
-	}
-	pthread_mutex_unlock( (pthread_mutex_t*)om );
-}
-
-void OGDeleteMutex( og_mutex_t om )
-{
-	if( !om )
-	{
-		return;
-	}
-
-	pthread_mutex_destroy( (pthread_mutex_t*)om );
-	free( om );
-}
-
-
-
-
-og_sema_t OGCreateSema()
-{
-	sem_t * sem = malloc( sizeof( sem_t ) );
-	sem_init( sem, 0, 0 );
-	return (og_sema_t)sem;
-}
-
-int OGGetSema( og_sema_t os )
-{
-	int valp;
-	sem_getvalue( os, &valp );
-	return valp;
-}
-
-
-void OGLockSema( og_sema_t os )
-{
-	sem_wait( os );
-}
-
-void OGUnlockSema( og_sema_t os )
-{
-	sem_post( os );
-}
-
-void OGDeleteSema( og_sema_t os )
-{
-	sem_destroy( os );
-	free(os);
-}
-
-
-
-#endif
-
-//Date Stamp: 2012-02-15
-
-/*
-   Copyright (c) 2011-2012 <>< Charles Lohr
-
-   Permission is hereby granted, free of charge, to any person obtaining a
-   copy of this software and associated documentation files (the "Software"),
-   to deal in the Software without restriction, including without limitation
-   the rights to use, copy, modify, merge, publish, distribute, sublicense,
-   and/or sell copies of the Software, and to permit persons to whom the
-   Software is furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of this file.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-   IN THE SOFTWARE.
-*/
-
diff --git a/src/os_generic.h b/src/os_generic.h
deleted file mode 100644
index 7ce22f2..0000000
--- a/src/os_generic.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef _OS_GENERIC_H

-#define _OS_GENERIC_H

-

-#ifdef WIN32

-#define USE_WINDOWS

-#endif

-

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-//Things that shouldn't be macro'd

-double OGGetAbsoluteTime();

-void OGSleep( int is );

-void OGUSleep( int ius );

-double OGGetFileTime( const char * file );

-

-//Threads and Mutices

-typedef void* og_thread_t;

-typedef void* og_mutex_t;

-typedef void* og_sema_t;

-

-og_thread_t OGCreateThread( void * (routine)( void * ), void * parameter );

-void * OGJoinThread( og_thread_t ot );

-void OGCancelThread( og_thread_t ot );

-

-//Always a recrusive mutex.

-og_mutex_t OGCreateMutex();

-void OGLockMutex( og_mutex_t om );

-void OGUnlockMutex( og_mutex_t om );

-void OGDeleteMutex( og_mutex_t om );

-

-//Always a semaphore

-og_sema_t OGCreateSema(); //Create a semaphore, comes locked initially.  NOTE: Max count is 32767

-void OGLockSema( og_sema_t os );

-int OGGetSema( og_sema_t os );  //if <0 there was a failure.

-void OGUnlockSema( og_sema_t os );

-void OGDeleteSema( og_sema_t os );

-

-#ifdef __cplusplus

-};

-#endif

-

-

-

-#endif

-

-

-//Date Stamp: 2012-02-15

-

-/*

-   NOTE: Portions (namely the top section) are part of headers from other

-   sources.

-

-   Copyright (c) 2011-2012 <>< Charles Lohr

-

-   Permission is hereby granted, free of charge, to any person obtaining a

-   copy of this software and associated documentation files (the "Software"),

-   to deal in the Software without restriction, including without limitation

-   the rights to use, copy, modify, merge, publish, distribute, sublicense,

-   and/or sell copies of the Software, and to permit persons to whom the

-   Software is furnished to do so, subject to the following conditions:

-

-   The above copyright notice and this permission notice shall be included in

-   all copies or substantial portions of this file.

-

-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

-   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS

-   IN THE SOFTWARE.

-*/

-

diff --git a/src/survive_data.c b/src/survive_data.c
index 10c51bb..18e547a 100644
--- a/src/survive_data.c
+++ b/src/survive_data.c
@@ -163,7 +163,7 @@ static void handle_watchman( struct SurviveObject * w, uint8_t * readdata )
 		}
 #endif
 
-#if 0
+#if 1
 		printf( "POST %d: %4d %02x (%02x%02x) - ", propset, qty, type, time1, time2 );
 		for( i = 0; i < qty; i++ )
 		{
diff --git a/src/survive_process.c b/src/survive_process.c
index c344306..07fb990 100644
--- a/src/survive_process.c
+++ b/src/survive_process.c
@@ -3,12 +3,12 @@
 void survive_light_process( struct SurviveObject * so, int sensor_id, int acode, int timeinsweep, uint32_t timecode  )
 {
 	//timeinsweep = 200,000 1/48,000,000ths of a second is "center-of-image"
-	printf( "L %s %d %d %d %d\n", so->codename, timecode, sensor_id, acode, timeinsweep );
+	//printf( "L %s %d %d %d %d\n", so->codename, timecode, sensor_id, acode, timeinsweep );
 }
 
 void survive_imu_process( struct SurviveObject * so, int16_t * accelgyro, uint32_t timecode, int id )
 {
-	if( so->codename[0] == 'H' )
+	if( so->codename[0] != 'H' )
 	{
 		printf( "I %s %d %d %d %d %d %d %d %d\n", so->codename, timecode, accelgyro[0], accelgyro[1], accelgyro[2], accelgyro[3], accelgyro[4], accelgyro[5], id );
 	}