From a5f32a99dba81222156fc8c31ab12808d1a11c1e Mon Sep 17 00:00:00 2001
From: alonbl <alonbl@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Wed, 21 Jan 2009 13:19:18 +0000
Subject: [PATCH] Move all private factories into private headers, the iso7816
 factory is the only one which is actually exposed

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3634 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/libopensc/cards.h    | 26 ++++++++++++++++++++++++++
 src/libopensc/internal.h |  5 +++++
 src/libopensc/opensc.h   | 29 -----------------------------
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/libopensc/cards.h b/src/libopensc/cards.h
index 9376c038..749888f9 100644
--- a/src/libopensc/cards.h
+++ b/src/libopensc/cards.h
@@ -145,6 +145,32 @@ enum {
 	SC_CARD_TYPE_ENTERSAFE_3K,
 };
 
+extern sc_card_driver_t *sc_get_rutoken_driver(void);
+extern sc_card_driver_t *sc_get_default_driver(void);
+extern sc_card_driver_t *sc_get_emv_driver(void);
+extern sc_card_driver_t *sc_get_cardos_driver(void);
+extern sc_card_driver_t *sc_get_cryptoflex_driver(void);
+extern sc_card_driver_t *sc_get_cyberflex_driver(void);
+extern sc_card_driver_t *sc_get_gpk_driver(void);
+extern sc_card_driver_t *sc_get_gemsafeV1_driver(void);
+extern sc_card_driver_t *sc_get_miocos_driver(void);
+extern sc_card_driver_t *sc_get_mcrd_driver(void);
+extern sc_card_driver_t *sc_get_setcos_driver(void);
+extern sc_card_driver_t *sc_get_starcos_driver(void);
+extern sc_card_driver_t *sc_get_tcos_driver(void);
+extern sc_card_driver_t *sc_get_openpgp_driver(void);
+extern sc_card_driver_t *sc_get_jcop_driver(void);
+extern sc_card_driver_t *sc_get_oberthur_driver(void);
+extern sc_card_driver_t *sc_get_belpic_driver(void);
+extern sc_card_driver_t *sc_get_atrust_acos_driver(void);
+extern sc_card_driver_t *sc_get_incrypto34_driver(void);
+extern sc_card_driver_t *sc_get_piv_driver(void);
+extern sc_card_driver_t *sc_get_muscle_driver(void);
+extern sc_card_driver_t *sc_get_acos5_driver(void);
+extern sc_card_driver_t *sc_get_asepcos_driver(void);
+extern sc_card_driver_t *sc_get_akis_driver(void);
+extern sc_card_driver_t *sc_get_entersafe_driver(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libopensc/internal.h b/src/libopensc/internal.h
index 6f57874a..22deea48 100644
--- a/src/libopensc/internal.h
+++ b/src/libopensc/internal.h
@@ -239,6 +239,11 @@ int sc_apdu_set_resp(sc_context_t *ctx, sc_apdu_t *apdu, const u8 *buf,
  */
 void sc_apdu_log(sc_context_t *ctx, const u8 *data, size_t len,
 	int is_outgoing);
+
+extern struct sc_reader_driver *sc_get_pcsc_driver(void);
+extern struct sc_reader_driver *sc_get_ctapi_driver(void);
+extern struct sc_reader_driver *sc_get_openct_driver(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libopensc/opensc.h b/src/libopensc/opensc.h
index 0609ea9d..f4efee66 100644
--- a/src/libopensc/opensc.h
+++ b/src/libopensc/opensc.h
@@ -1170,36 +1170,7 @@ extern const char *sc_get_version(void);
 		return drv_version; \
 	}
 
-extern struct sc_reader_driver *sc_get_pcsc_driver(void);
-extern struct sc_reader_driver *sc_get_ctapi_driver(void);
-extern struct sc_reader_driver *sc_get_openct_driver(void);
-
-extern sc_card_driver_t *sc_get_rutoken_driver(void);
-extern sc_card_driver_t *sc_get_default_driver(void);
-extern sc_card_driver_t *sc_get_emv_driver(void);
-extern sc_card_driver_t *sc_get_cardos_driver(void);
-extern sc_card_driver_t *sc_get_cryptoflex_driver(void);
-extern sc_card_driver_t *sc_get_cyberflex_driver(void);
-extern sc_card_driver_t *sc_get_gpk_driver(void);
-extern sc_card_driver_t *sc_get_gemsafeV1_driver(void);
 extern sc_card_driver_t *sc_get_iso7816_driver(void);
-extern sc_card_driver_t *sc_get_miocos_driver(void);
-extern sc_card_driver_t *sc_get_mcrd_driver(void);
-extern sc_card_driver_t *sc_get_setcos_driver(void);
-extern sc_card_driver_t *sc_get_starcos_driver(void);
-extern sc_card_driver_t *sc_get_tcos_driver(void);
-extern sc_card_driver_t *sc_get_openpgp_driver(void);
-extern sc_card_driver_t *sc_get_jcop_driver(void);
-extern sc_card_driver_t *sc_get_oberthur_driver(void);
-extern sc_card_driver_t *sc_get_belpic_driver(void);
-extern sc_card_driver_t *sc_get_atrust_acos_driver(void);
-extern sc_card_driver_t *sc_get_incrypto34_driver(void);
-extern sc_card_driver_t *sc_get_piv_driver(void);
-extern sc_card_driver_t *sc_get_muscle_driver(void);
-extern sc_card_driver_t *sc_get_acos5_driver(void);
-extern sc_card_driver_t *sc_get_asepcos_driver(void);
-extern sc_card_driver_t *sc_get_akis_driver(void);
-extern sc_card_driver_t *sc_get_entersafe_driver(void);
 
 #ifdef __cplusplus
 }