[Openhpi-svn] SF.net SVN: openhpi: [6342] python/trunk

[<re...@us...>]

Revision: 6342
          http://svn.sourceforge.net/openhpi/?rev=6342&view=rev
Author:   renierm
Date:     2006-12-20 20:37:05 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
adding new ohpi functions

Modified Paths:
--------------
    python/trunk/ohpi.i
    python/trunk/setup.py

Modified: python/trunk/ohpi.i
===================================================================
--- python/trunk/ohpi.i	2006-12-21 04:21:19 UTC (rev 6341)
+++ python/trunk/ohpi.i	2006-12-21 04:37:05 UTC (rev 6342)
@@ -24,13 +24,10 @@
 #define MAX_PLUGIN_NAME_LENGTH 32
 
 typedef struct {
-        int refcount; /* refcount - 1 = # of handlers using it. */
-        /* More to come later... */
-} oHpiPluginInfoT;
-
-typedef struct {
+        oHpiHandlerIdT id;
         char plugin_name[MAX_PLUGIN_NAME_LENGTH];
-        /* More to come later... */
+        SaHpiEntityPathT entity_root;
+        int load_failed;
 } oHpiHandlerInfoT;
 
 typedef enum {
@@ -76,26 +73,19 @@
 #define OHVERSION_CLIENT 0x0001
 #define OHVERSION_STANDARD 0x0000
 
-#define MAX_RDR_ARRAY_LENGTH 32
-typedef struct {
-        SaHpiRdrT Entry[MAX_RDR_ARRAY_LENGTH];
-} oHpiRdrArrayT;
-
 /* Version function */
 SaHpiUint64T oHpiVersionGet(void);
 
-/* Exported OpenHPI plugin prototypes */
-SaErrorT oHpiPluginLoad(char *name);
-SaErrorT oHpiPluginUnload(char *name);
-SaErrorT oHpiPluginInfo(char *name, oHpiPluginInfoT *info);
-SaErrorT oHpiPluginGetNext(char *name, char *next_name, int size);
-
-/* Exported OpenHPI handler (plugin instance) prototypes */
+/* Exported OpenHPI handler (plugin instance) calls */
 SaErrorT oHpiHandlerCreate(GHashTable *config,
                            oHpiHandlerIdT *id);
 SaErrorT oHpiHandlerDestroy(oHpiHandlerIdT id);
 SaErrorT oHpiHandlerInfo(oHpiHandlerIdT id, oHpiHandlerInfoT *info);
 SaErrorT oHpiHandlerGetNext(oHpiHandlerIdT id, oHpiHandlerIdT *next_id);
+SaErrorT oHpiHandlerFind(SaHpiSessionIdT sid,
+			 SaHpiResourceIdT rid,
+			 oHpiHandlerIdT *id);
+SaErrorT oHpiHandlerRetry(oHpiHandlerIdT id);
 
 /* Global parameters */
 SaErrorT oHpiGlobalParamGet(oHpiGlobalParamT *param);

Modified: python/trunk/setup.py
===================================================================
--- python/trunk/setup.py	2006-12-21 04:21:19 UTC (rev 6341)
+++ python/trunk/setup.py	2006-12-21 04:37:05 UTC (rev 6342)
@@ -4,7 +4,7 @@
 
 reqglibver = '2.2.0'
 reqopenhpiver = '2.6.1'
-reqswigver = '1.3.27'
+reqswigver = '1.3.29'
 reqpythonver = '2.3.0'
 
 check = check_glibver(reqglibver)
@@ -43,7 +43,8 @@
       ext_modules=[Extension('_openhpi',
       			     ['openhpi.i'],
 			     libraries=['openhpi'],
-			     include_dirs=includes
+			     include_dirs=includes,
+			     extra_link_args=['-export-dynamic']
 			    )
 		  ],
       py_modules=['openhpi']


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.