[Pcsclite-cvs-commit] r1651 - in trunk/PCSC/src: . PCSC
Ludovic Rousseau
rousseau at costa.debian.org
Thu Sep 15 11:35:35 UTC 2005
Author: rousseau
Date: 2005-09-15 11:35:34 +0000 (Thu, 15 Sep 2005)
New Revision: 1651
Added:
trunk/PCSC/src/dyn_generic.h
trunk/PCSC/src/parser.h
trunk/PCSC/src/sys_generic.h
trunk/PCSC/src/thread_generic.h
Removed:
trunk/PCSC/src/PCSC/dyn_generic.h
trunk/PCSC/src/PCSC/parser.h
trunk/PCSC/src/PCSC/sys_generic.h
trunk/PCSC/src/PCSC/thread_generic.h
Modified:
trunk/PCSC/src/Makefile.am
Log:
move some header files from src/PCSC to src and do not distribute them
in /usr/include/PCSC
Modified: trunk/PCSC/src/Makefile.am
===================================================================
--- trunk/PCSC/src/Makefile.am 2005-09-14 14:43:21 UTC (rev 1650)
+++ trunk/PCSC/src/Makefile.am 2005-09-15 11:35:34 UTC (rev 1651)
@@ -67,14 +67,13 @@
testpcsc_LDADD = libpcsclite.la
nobase_include_HEADERS = \
- PCSC/debuglog.h PCSC/dyn_generic.h PCSC/ifdhandler.h \
- PCSC/winscard.h PCSC/wintypes.h PCSC/parser.h PCSC/reader.h \
- PCSC/sys_generic.h PCSC/thread_generic.h
+ PCSC/debuglog.h PCSC/ifdhandler.h \
+ PCSC/winscard.h PCSC/wintypes.h PCSC/reader.h
noinst_HEADERS = \
- atrhandler.h configfile.h eventhandler.h \
+ atrhandler.h configfile.h dyn_generic.h eventhandler.h \
hotplug.h ifdwrapper.h PCSC/pcsclite.h.in \
powermgt_generic.h prothandler.h readerfactory.h \
- strlcpycat.h \
+ strlcpycat.h parser.h sys_generic.h thread_generic.h \
winscard_msg.h winscard_svc.h
pcdir= $(libdir)/pkgconfig
Deleted: trunk/PCSC/src/PCSC/dyn_generic.h
===================================================================
--- trunk/PCSC/src/PCSC/dyn_generic.h 2005-09-14 14:43:21 UTC (rev 1650)
+++ trunk/PCSC/src/PCSC/dyn_generic.h 2005-09-15 11:35:34 UTC (rev 1651)
@@ -1,31 +0,0 @@
-/*
- * MUSCLE SmartCard Development ( http://www.linuxnet.com )
- *
- * Copyright (C) 1999
- * David Corcoran <corcoran at linuxnet.com>
- *
- * $Id$
- */
-
-/**
- * @file
- * @brief This abstracts dynamic library loading functions.
- */
-
-#ifndef __dyn_generic_h__
-#define __dyn_generic_h__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
- int DYN_LoadLibrary(void **, char *);
- int DYN_CloseLibrary(void **);
- int DYN_GetAddress(void *, void **, char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
Deleted: trunk/PCSC/src/PCSC/parser.h
===================================================================
--- trunk/PCSC/src/PCSC/parser.h 2005-09-14 14:43:21 UTC (rev 1650)
+++ trunk/PCSC/src/PCSC/parser.h 2005-09-15 11:35:34 UTC (rev 1651)
@@ -1,37 +0,0 @@
-/*
- * MUSCLE SmartCard Development ( http://www.linuxnet.com )
- *
- * Copyright (C) 2003
- * Toni Andjelkovic <toni at soth.at>
- * Ludovic Rousseau <ludovic.rousseau at free.fr>
- *
- * $Id$
- */
-
-/**
- * @file
- * @brief Reads lexical config files and updates database.
- */
-
-#ifndef __parser_h__
-#define __parser_h__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define TOKEN_MAX_KEY_SIZE 200
-#define TOKEN_MAX_VALUE_SIZE 200
-
-#define TOKEN_TYPE_KEY 1
-#define TOKEN_TYPE_STRING 2
-
-int LTPBundleFindValueWithKey(char *fileName, char *tokenKey,
- char *tokenValue, int tokenIndice);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
Deleted: trunk/PCSC/src/PCSC/sys_generic.h
===================================================================
--- trunk/PCSC/src/PCSC/sys_generic.h 2005-09-14 14:43:21 UTC (rev 1650)
+++ trunk/PCSC/src/PCSC/sys_generic.h 2005-09-15 11:35:34 UTC (rev 1651)
@@ -1,101 +0,0 @@
-/*
- * MUSCLE SmartCard Development ( http://www.linuxnet.com )
- *
- * Copyright (C) 1999
- * David Corcoran <corcoran at linuxnet.com>
- *
- * $Id$
- */
-
-/**
- * @file
- * @brief This handles abstract system level calls.
- */
-
-#ifndef __sys_generic_h__
-#define __sys_generic_h__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include <sys/stat.h>
-
- int SYS_Initialize(void);
-
- int SYS_Mkdir(char *, int);
-
- int SYS_GetPID(void);
-
- int SYS_Sleep(int);
-
- int SYS_USleep(int);
-
- int SYS_OpenFile(char *, int, int);
-
- int SYS_CloseFile(int);
-
- int SYS_RemoveFile(char *);
-
- int SYS_Chmod(const char *, int);
-
- int SYS_Chdir(const char *);
-
- int SYS_Mkfifo(const char *, int);
-
- int SYS_Mknod(const char *, int, int);
-
- int SYS_GetUID(void);
-
- int SYS_GetGID(void);
-
- int SYS_Chown(const char *, int, int);
-
- int SYS_ChangePermissions(char *, int);
-
- int SYS_LockFile(int);
-
- int SYS_LockAndBlock(int);
-
- int SYS_UnlockFile(int);
-
- int SYS_SeekFile(int, int);
-
- int SYS_ReadFile(int, char *, int);
-
- int SYS_WriteFile(int, char *, int);
-
- int SYS_GetPageSize(void);
-
- void *SYS_MemoryMap(int, int, int);
-
- void *SYS_PublicMemoryMap(int, int, int);
-
- int SYS_MMapSynchronize(void *, int);
-
- int SYS_Fork(void);
-
- int SYS_Daemon(int, int);
-
- int SYS_Wait(int, int);
-
- int SYS_Stat(char *pcFile, struct stat *psStatus);
-
- int SYS_Fstat(int);
-
- int SYS_RandomInt(int, int);
-
- int SYS_GetSeed(void);
-
- void SYS_Exit(int);
-
- int SYS_Rmdir(char *pcFile);
-
- int SYS_Unlink(char *pcFile);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __sys_generic_h__ */
Deleted: trunk/PCSC/src/PCSC/thread_generic.h
===================================================================
--- trunk/PCSC/src/PCSC/thread_generic.h 2005-09-14 14:43:21 UTC (rev 1650)
+++ trunk/PCSC/src/PCSC/thread_generic.h 2005-09-15 11:35:34 UTC (rev 1651)
@@ -1,65 +0,0 @@
-/*
- * MUSCLE SmartCard Development ( http://www.linuxnet.com )
- *
- * Copyright (C) 2000-2004
- * David Corcoran <corcoran at linuxnet.com>
- * Damien Sauveron <damien.sauveron at labri.fr>
- * Ludovic Rousseau <ludovic.rousseau at free.fr>
- *
- * $Id$
- */
-
-/**
- * @file
- * @brief This provides system specific thread calls.
- */
-
-#ifndef __thread_generic_h__
-#define __thread_generic_h__
-
-#ifdef WIN32
-#include <windows.h>
-#include "PCSC.h"
-#else
-#include <pthread.h>
-#define PCSC_API
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#ifdef WIN32
-#define PCSCLITE_THREAD_T HANDLE
-#define PCSCLITE_MUTEX CRITICAL_SECTION
-#define PCSCLITE_MUTEX_T CRITICAL_SECTION*
-#define PCSCLITE_THREAD_FUNCTION(f) void *(*f)(void *)
-#else
-#define PCSCLITE_THREAD_T pthread_t
-#define PCSCLITE_MUTEX pthread_mutex_t
-#define PCSCLITE_MUTEX_T pthread_mutex_t*
-#define PCSCLITE_THREAD_FUNCTION(f) void *(*f)(void *)
-#endif
-
-/* thread attributes */
-#define THREAD_ATTR_DEFAULT 0
-#define THREAD_ATTR_DETACHED 1
-
- int SYS_MutexInit(PCSCLITE_MUTEX_T);
- int SYS_MutexDestroy(PCSCLITE_MUTEX_T);
- int SYS_MutexLock(PCSCLITE_MUTEX_T);
- int SYS_MutexUnLock(PCSCLITE_MUTEX_T);
- int SYS_ThreadCreate(PCSCLITE_THREAD_T *, int, PCSCLITE_THREAD_FUNCTION( ), LPVOID);
- int SYS_ThreadCancel(PCSCLITE_THREAD_T *);
- int SYS_ThreadDetach(PCSCLITE_THREAD_T);
- int SYS_ThreadJoin(PCSCLITE_THREAD_T *, LPVOID*);
- int SYS_ThreadExit(LPVOID);
- PCSCLITE_THREAD_T SYS_ThreadSelf(void);
- int SYS_ThreadEqual(PCSCLITE_THREAD_T *, PCSCLITE_THREAD_T *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __thread_generic_h__ */
Copied: trunk/PCSC/src/dyn_generic.h (from rev 1646, trunk/PCSC/src/PCSC/dyn_generic.h)
Copied: trunk/PCSC/src/parser.h (from rev 1646, trunk/PCSC/src/PCSC/parser.h)
Copied: trunk/PCSC/src/sys_generic.h (from rev 1646, trunk/PCSC/src/PCSC/sys_generic.h)
Copied: trunk/PCSC/src/thread_generic.h (from rev 1646, trunk/PCSC/src/PCSC/thread_generic.h)
More information about the Pcsclite-cvs-commit
mailing list