diff --git a/sysutils/Makefile b/sysutils/Makefile index 2422fd525f26..cddb86161fc4 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -626,6 +626,7 @@ SUBDIR += ods2 SUBDIR += ohmu SUBDIR += open + SUBDIR += openhpi SUBDIR += openipmi SUBDIR += openupsd SUBDIR += ori diff --git a/sysutils/openhpi/Makefile b/sysutils/openhpi/Makefile new file mode 100644 index 000000000000..f57b9377d8bb --- /dev/null +++ b/sysutils/openhpi/Makefile @@ -0,0 +1,49 @@ +# $FreeBSD$ + +PORTNAME= openhpi +PORTVERSION= 3.6.1 +CATEGORIES= sysutils +MASTER_SITES= SF/openhpi/openhpi-stable/${PORTVERSION}/ + +MAINTAINER= ports@FreeBSD.org +COMMENT= Hardware Platform Interface implementation + +LICENSE= OPENHPI +LICENSE_NAME= OpenHPI license +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ + libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt + +GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip +USES= gmake gnome libtool pathfix perl5 pkgconfig shebangfix +SHEBANG_FILES= plugins/snmp_bc/eventmap2code.pl scripts/text2cstr.pl +USE_GNOME= glib20 libxml2 +USE_LDCONFIG= yes +USE_OPENSSL= yes +USE_PERL5= build +USE_RC_SUBR= openhpid + +post-patch: + @${REINPLACE_CMD} 's/-lstdc++//' \ + ${WRKSRC}/baselib/Makefile.in \ + ${WRKSRC}/openhpid/Makefile.in \ + ${WRKSRC}/plugins/dynamic_simulator/Makefile.in \ + ${WRKSRC}/plugins/ipmidirect/Makefile.in + @${REINPLACE_CMD} '/XML2_INCLUDE=/s|=.*|=-I${LOCALBASE}/include/libxml2|' \ + ${WRKSRC}/configure + +post-install: + ${MV} ${STAGEDIR}${ETCDIR}/openhpi.conf \ + ${STAGEDIR}${ETCDIR}/openhpi.conf.sample + ${MV} ${STAGEDIR}${ETCDIR}/openhpiclient.conf \ + ${STAGEDIR}${ETCDIR}/openhpiclient.conf.sample + ${MV} ${STAGEDIR}${ETCDIR}/simulation.data \ + ${STAGEDIR}${ETCDIR}/simulation.data.sample + +.include diff --git a/sysutils/openhpi/distinfo b/sysutils/openhpi/distinfo new file mode 100644 index 000000000000..415219b0cbf9 --- /dev/null +++ b/sysutils/openhpi/distinfo @@ -0,0 +1,2 @@ +SHA256 (openhpi-3.6.1.tar.gz) = e0a810cb401c4bdcfc9551f2e6afd5a8ca4b411f5ee3bc60c19f82fd6e84a3dc +SIZE (openhpi-3.6.1.tar.gz) = 7718590 diff --git a/sysutils/openhpi/files/openhpid.in b/sysutils/openhpi/files/openhpid.in new file mode 100644 index 000000000000..e7b1510dc8b9 --- /dev/null +++ b/sysutils/openhpi/files/openhpid.in @@ -0,0 +1,24 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: openhpid +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following to /etc/rc.conf[.local] to enable this service +# +# openhpid_enable="YES" +# openhpid_flags="-c %%PREFIX%%/etc/openhpi/openhpi.conf" +# + +. /etc/rc.subr + +name="openhpid" +rcvar="openhpid_enable" +command="%%PREFIX%%/sbin/openhpid" + +: ${openhpid_enable=NO} ${openhpid_flags=-c %%PREFIX%%/etc/openhpi/openhpi.conf} + +load_rc_config ${name} +run_rc_command "$1" diff --git a/sysutils/openhpi/files/patch-baselib-session.cpp b/sysutils/openhpi/files/patch-baselib-session.cpp new file mode 100644 index 000000000000..2cf06cf0aea8 --- /dev/null +++ b/sysutils/openhpi/files/patch-baselib-session.cpp @@ -0,0 +1,11 @@ +--- baselib/session.cpp.orig 2015-09-14 22:48:33 UTC ++++ baselib/session.cpp +@@ -118,7 +118,7 @@ cSession::cSession() + m_remote_sid( 0 ) + { + #if GLIB_CHECK_VERSION (2, 32, 0) +- m_sockets = G_PRIVATE_INIT (g_free); ++ m_sockets = (GPrivate) G_PRIVATE_INIT (g_free); + #else + wrap_g_static_private_init( &m_sockets ); + #endif diff --git a/sysutils/openhpi/files/patch-configure b/sysutils/openhpi/files/patch-configure new file mode 100644 index 000000000000..c956e60798a9 --- /dev/null +++ b/sysutils/openhpi/files/patch-configure @@ -0,0 +1,65 @@ +--- configure.orig 2015-09-14 22:59:50 UTC ++++ configure +@@ -15704,51 +15704,6 @@ fi + fi + + +-# check for gcc version +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc >= 3.2" >&5 +-$as_echo_n "checking gcc >= 3.2... " >&6; } +- +- GCCVERSIONOK=`gcc -dumpversion | \ +- sed 's/\./ /g' | \ +- awk '{ \ +- if ( $1 > 3) { \ +- print "OK"; \ +- } \ +- if ( $1 == 3 ) { \ +- if( $2 > 2 ) { \ +- print "OK"; \ +- } \ +- if( $2 == 2 ) { \ +- print "OK"; \ +- } \ +- } \ +- }'` \ +- +- if test "$GCCVERSIONOK" = "OK"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- else +- +- OH_MSG=`echo -e "- gcc >= 3.2 is required to build OpenHPI not found!\n"` +- if test "x" != "x"; then +- OH_MSG=`echo -e "$OH_MSG\n- "` +- fi +- if test "x" != "x"; then +- OH_MSG=`echo -e "$OH_MSG\n- Try installing the package\n"` +- fi +- if test "x" != "x"; then +- OH_MSG=`echo -e "$OH_MSG\n- or get the latest software from \n"` +- fi +- +- as_fn_error $? "! +-************************************************************ +-$OH_MSG +-************************************************************ +-" "$LINENO" 5 +- +- +- fi + + + GLIB_REQUIRED_VERSION=2.12 +@@ -17337,10 +17292,6 @@ if test "${enable_werror+set}" = set; th + fi + + +-if test -n "`gcc --version | grep ' 3.2'`" ; then +- CC_WARNINGS=`echo $CC_WARNINGS | sed -e 's/-Wno-strict-aliasing//g'` +- CXX_WARNINGS=`echo $CC_WARNINGS | sed -e 's/-Wno-strict-aliasing//g'` +-fi + + case $host_os in + solaris*) diff --git a/sysutils/openhpi/files/patch-plugins-dynamic_simulator-new_sim.cpp b/sysutils/openhpi/files/patch-plugins-dynamic_simulator-new_sim.cpp new file mode 100644 index 000000000000..266fe369adc3 --- /dev/null +++ b/sysutils/openhpi/files/patch-plugins-dynamic_simulator-new_sim.cpp @@ -0,0 +1,1265 @@ +--- plugins/dynamic_simulator/new_sim.cpp.orig 2015-09-14 22:48:28 UTC ++++ plugins/dynamic_simulator/new_sim.cpp +@@ -411,11 +411,8 @@ static NewSimulatorDimi *VerifyDimiAndEn + //@{ + // new plugin_loader + extern "C" { ++#pragma GCC visibility push(hidden) + +-/** +- * Alias for @ref öh_open(), implemented by @ref NewSimulatorOpen(). +- **/ +-static void * NewSimulatorOpen( GHashTable *, unsigned int, oh_evt_queue * ) __attribute__((used)); + + /** + * @fn NewSimulatorOpen( GHashTable *handler_config, unsigned int hid, +@@ -431,7 +428,7 @@ static void * NewSimulatorOpen( GHashTab + * + * @return pointer on handler if everything works successfully. + **/ +-static void * NewSimulatorOpen( GHashTable *handler_config, unsigned int hid, ++void * NewSimulatorOpen( GHashTable *handler_config, unsigned int hid, + oh_evt_queue *eventq ) { + // open log + const char *logfile = 0; +@@ -528,17 +525,12 @@ static void * NewSimulatorOpen( GHashTab + } + + /** +- * Alias for @ref öh_close(), implemented by @ref NewSimulatorClose(). +- **/ +-static void NewSimulatorClose( void * ) __attribute__((used)); +- +-/** + * @relate NewSimulatorClose + * Close the plugin and clean up the allocated memory. + * + * @param hnd pointer on handler + **/ +-static void NewSimulatorClose( void *hnd ) { ++void NewSimulatorClose( void *hnd ) { + dbg( "NewSimulatorClose" ); + + NewSimulator *newsim = VerifyNewSimulator( hnd ); +@@ -585,9 +577,7 @@ static void NewSimulatorClose( void *hnd + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetEvent( void * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetEvent( void *hnd ) { ++SaErrorT NewSimulatorGetEvent( void *hnd ) { + dbg( "NewSimulatorGetEvent" ); + + NewSimulator *newsim = VerifyNewSimulator( hnd ); +@@ -613,9 +603,7 @@ static SaErrorT NewSimulatorGetEvent( vo + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorDiscoverResources( void * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorDiscoverResources( void *hnd ) { ++SaErrorT NewSimulatorDiscoverResources( void *hnd ) { + dbg( "NewSimulatorDiscoverResources" ); + NewSimulator *newsim = VerifyNewSimulator( hnd ); + +@@ -641,9 +629,7 @@ static SaErrorT NewSimulatorDiscoverReso + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetResourceTag( void *, SaHpiResourceIdT, SaHpiTextBufferT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetResourceTag( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorSetResourceTag( void *hnd, SaHpiResourceIdT id, + SaHpiTextBufferT *tag ) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -669,9 +655,7 @@ static SaErrorT NewSimulatorSetResourceT + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetResourceSeverity( void *, SaHpiResourceIdT, SaHpiSeverityT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetResourceSeverity( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorSetResourceSeverity( void *hnd, SaHpiResourceIdT id, + SaHpiSeverityT sev ) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -699,13 +683,7 @@ static SaErrorT NewSimulatorSetResourceS + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetSensorReading( void *, +- SaHpiResourceIdT id, +- SaHpiSensorNumT num, +- SaHpiSensorReadingT *data, +- SaHpiEventStateT *state ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetSensorReading( void *hnd, ++SaErrorT NewSimulatorGetSensorReading( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, + SaHpiSensorReadingT *data, +@@ -735,12 +713,7 @@ static SaErrorT NewSimulatorGetSensorRea + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetSensorThresholds( void *hnd, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiSensorThresholdsT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetSensorThresholds( void *hnd, ++SaErrorT NewSimulatorGetSensorThresholds( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, + SaHpiSensorThresholdsT *thres ) { +@@ -774,12 +747,7 @@ static SaErrorT NewSimulatorGetSensorThr + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetSensorThresholds( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- const SaHpiSensorThresholdsT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetSensorThresholds( void *hnd, ++SaErrorT NewSimulatorSetSensorThresholds( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, + const SaHpiSensorThresholdsT *thres ) { +@@ -812,12 +780,7 @@ static SaErrorT NewSimulatorSetSensorThr + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetSensorEnable( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiBoolT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetSensorEnable( void *hnd, ++SaErrorT NewSimulatorGetSensorEnable( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, + SaHpiBoolT *enable ) { +@@ -846,12 +809,7 @@ static SaErrorT NewSimulatorGetSensorEna + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetSensorEnable( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiBoolT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetSensorEnable( void *hnd, ++SaErrorT NewSimulatorSetSensorEnable( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, + SaHpiBoolT enable ) { +@@ -880,12 +838,7 @@ static SaErrorT NewSimulatorSetSensorEna + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetSensorEventEnables( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiBoolT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetSensorEventEnables( void *hnd, ++SaErrorT NewSimulatorGetSensorEventEnables( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, + SaHpiBoolT *enables ) { +@@ -913,12 +866,7 @@ static SaErrorT NewSimulatorGetSensorEve + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetSensorEventEnables( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiBoolT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetSensorEventEnables( void *hnd, ++SaErrorT NewSimulatorSetSensorEventEnables( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, + SaHpiBoolT enables ) { +@@ -948,13 +896,7 @@ static SaErrorT NewSimulatorSetSensorEve + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetSensorEventMasks( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiEventStateT *, +- SaHpiEventStateT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetSensorEventMasks( void *hnd, ++SaErrorT NewSimulatorGetSensorEventMasks( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, + SaHpiEventStateT *AssertEventMask, +@@ -985,14 +927,7 @@ static SaErrorT NewSimulatorGetSensorEve + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetSensorEventMasks( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiSensorEventMaskActionT, +- SaHpiEventStateT, +- SaHpiEventStateT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetSensorEventMasks( void *hnd, ++SaErrorT NewSimulatorSetSensorEventMasks( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, + SaHpiSensorEventMaskActionT act, +@@ -1023,12 +958,7 @@ static SaErrorT NewSimulatorSetSensorEve + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetControlState( void *, SaHpiResourceIdT, +- SaHpiCtrlNumT, +- SaHpiCtrlModeT *, +- SaHpiCtrlStateT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetControlState( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetControlState( void *hnd, SaHpiResourceIdT id, + SaHpiCtrlNumT num, + SaHpiCtrlModeT *mode, + SaHpiCtrlStateT *state ) { +@@ -1058,12 +988,7 @@ static SaErrorT NewSimulatorGetControlSt + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetControlState( void *, SaHpiResourceIdT, +- SaHpiCtrlNumT, +- SaHpiCtrlModeT, +- SaHpiCtrlStateT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetControlState( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorSetControlState( void *hnd, SaHpiResourceIdT id, + SaHpiCtrlNumT num, + SaHpiCtrlModeT mode, + SaHpiCtrlStateT *state ) { +@@ -1094,14 +1019,7 @@ static SaErrorT NewSimulatorSetControlSt + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetNextAnnouncement(void *, +- SaHpiResourceIdT, +- SaHpiAnnunciatorNumT, +- SaHpiSeverityT, +- SaHpiBoolT, +- SaHpiAnnouncementT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetNextAnnouncement(void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetNextAnnouncement(void *hnd, SaHpiResourceIdT id, + SaHpiAnnunciatorNumT num, + SaHpiSeverityT severity, + SaHpiBoolT unAckOnly, +@@ -1132,12 +1050,7 @@ static SaErrorT NewSimulatorGetNextAnnou + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetAnnouncement(void *, SaHpiResourceIdT, +- SaHpiAnnunciatorNumT, +- SaHpiEntryIdT, +- SaHpiAnnouncementT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetAnnouncement(void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetAnnouncement(void *hnd, SaHpiResourceIdT id, + SaHpiAnnunciatorNumT num, + SaHpiEntryIdT entryId, + SaHpiAnnouncementT *ann) { +@@ -1168,12 +1081,7 @@ static SaErrorT NewSimulatorGetAnnouncem + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorAckAnnouncement(void *, SaHpiResourceIdT, +- SaHpiAnnunciatorNumT, +- SaHpiEntryIdT, +- SaHpiSeverityT) __attribute__((used)); +- +-static SaErrorT NewSimulatorAckAnnouncement(void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorAckAnnouncement(void *hnd, SaHpiResourceIdT id, + SaHpiAnnunciatorNumT num, + SaHpiEntryIdT entryId, + SaHpiSeverityT severity) { +@@ -1203,11 +1111,7 @@ static SaErrorT NewSimulatorAckAnnouncem + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorAddAnnouncement(void *, SaHpiResourceIdT, +- SaHpiAnnunciatorNumT, +- SaHpiAnnouncementT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorAddAnnouncement(void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorAddAnnouncement(void *hnd, SaHpiResourceIdT id, + SaHpiAnnunciatorNumT num, + SaHpiAnnouncementT *ann) { + NewSimulator *newsim; +@@ -1236,12 +1140,7 @@ static SaErrorT NewSimulatorAddAnnouncem + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorDelAnnouncement(void *, SaHpiResourceIdT, +- SaHpiAnnunciatorNumT, +- SaHpiEntryIdT, +- SaHpiSeverityT) __attribute__((used)); +- +-static SaErrorT NewSimulatorDelAnnouncement(void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorDelAnnouncement(void *hnd, SaHpiResourceIdT id, + SaHpiAnnunciatorNumT num, + SaHpiEntryIdT entryId, + SaHpiSeverityT severity) { +@@ -1271,11 +1170,7 @@ static SaErrorT NewSimulatorDelAnnouncem + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetAnnMode(void *, SaHpiResourceIdT, +- SaHpiAnnunciatorNumT, +- SaHpiAnnunciatorModeT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetAnnMode(void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetAnnMode(void *hnd, SaHpiResourceIdT id, + SaHpiAnnunciatorNumT num, + SaHpiAnnunciatorModeT *mode) { + +@@ -1304,11 +1199,7 @@ static SaErrorT NewSimulatorGetAnnMode(v + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetAnnMode(void *, SaHpiResourceIdT, +- SaHpiAnnunciatorNumT, +- SaHpiAnnunciatorModeT) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetAnnMode(void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorSetAnnMode(void *hnd, SaHpiResourceIdT id, + SaHpiAnnunciatorNumT num, + SaHpiAnnunciatorModeT mode) { + +@@ -1337,12 +1228,7 @@ static SaErrorT NewSimulatorSetAnnMode(v + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetIdrInfo( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrInfoT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetIdrInfo( void *hnd, ++SaErrorT NewSimulatorGetIdrInfo( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, + SaHpiIdrInfoT *idrinfo ) { +@@ -1374,15 +1260,7 @@ static SaErrorT NewSimulatorGetIdrInfo( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetIdrAreaHeader( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrAreaTypeT, +- SaHpiEntryIdT, +- SaHpiEntryIdT *, +- SaHpiIdrAreaHeaderT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetIdrAreaHeader( void *hnd, ++SaErrorT NewSimulatorGetIdrAreaHeader( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, + SaHpiIdrAreaTypeT areatype, +@@ -1415,13 +1293,7 @@ static SaErrorT NewSimulatorGetIdrAreaHe + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorAddIdrArea( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrAreaTypeT, +- SaHpiEntryIdT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorAddIdrArea( void *hnd, ++SaErrorT NewSimulatorAddIdrArea( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, + SaHpiIdrAreaTypeT areatype, +@@ -1452,13 +1324,7 @@ static SaErrorT NewSimulatorAddIdrArea( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorAddIdrAreaById( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrAreaTypeT, +- SaHpiEntryIdT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorAddIdrAreaById( void *hnd, ++SaErrorT NewSimulatorAddIdrAreaById( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, + SaHpiIdrAreaTypeT areatype, +@@ -1487,12 +1353,7 @@ static SaErrorT NewSimulatorAddIdrAreaBy + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorDelIdrArea( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiEntryIdT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorDelIdrArea( void *hnd, ++SaErrorT NewSimulatorDelIdrArea( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, + SaHpiEntryIdT areaid ) { +@@ -1525,16 +1386,7 @@ static SaErrorT NewSimulatorDelIdrArea( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetIdrField( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiEntryIdT, +- SaHpiIdrFieldTypeT, +- SaHpiEntryIdT, +- SaHpiEntryIdT *, +- SaHpiIdrFieldT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetIdrField( void *hnd, ++SaErrorT NewSimulatorGetIdrField( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, + SaHpiEntryIdT areaid, +@@ -1567,12 +1419,7 @@ static SaErrorT NewSimulatorGetIdrField( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorAddIdrField( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrFieldT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorAddIdrField( void *hnd, ++SaErrorT NewSimulatorAddIdrField( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, + SaHpiIdrFieldT *field ) { +@@ -1601,12 +1448,7 @@ static SaErrorT NewSimulatorAddIdrField( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorAddIdrFieldById( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrFieldT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorAddIdrFieldById( void *hnd, ++SaErrorT NewSimulatorAddIdrFieldById( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, + SaHpiIdrFieldT *field ) { +@@ -1634,12 +1476,7 @@ static SaErrorT NewSimulatorAddIdrFieldB + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetIdrField( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrFieldT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetIdrField( void *hnd, ++SaErrorT NewSimulatorSetIdrField( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, + SaHpiIdrFieldT *field ) { +@@ -1668,13 +1505,7 @@ static SaErrorT NewSimulatorSetIdrField( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorDelIdrField( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiEntryIdT, +- SaHpiEntryIdT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorDelIdrField( void *hnd, ++SaErrorT NewSimulatorDelIdrField( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, + SaHpiEntryIdT areaid, +@@ -1702,11 +1533,7 @@ static SaErrorT NewSimulatorDelIdrField( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetSelInfo( void *, +- SaHpiResourceIdT, +- SaHpiEventLogInfoT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetSelInfo( void *hnd, ++SaErrorT NewSimulatorGetSelInfo( void *hnd, + SaHpiResourceIdT id, + SaHpiEventLogInfoT *info ) { + +@@ -1736,9 +1563,7 @@ static SaErrorT NewSimulatorGetSelInfo( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetSelTime( void *, SaHpiResourceIdT, SaHpiTimeT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetSelTime( void *hnd, SaHpiResourceIdT id, SaHpiTimeT t ) { ++SaErrorT NewSimulatorSetSelTime( void *hnd, SaHpiResourceIdT id, SaHpiTimeT t ) { + SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; + + NewSimulator *newsim = VerifyNewSimulator( hnd ); +@@ -1766,9 +1591,7 @@ static SaErrorT NewSimulatorSetSelTime( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorAddSelEntry( void *, SaHpiResourceIdT, const SaHpiEventT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorAddSelEntry( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorAddSelEntry( void *hnd, SaHpiResourceIdT id, + const SaHpiEventT *Event ) { + + SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; +@@ -1803,15 +1626,7 @@ static SaErrorT NewSimulatorAddSelEntry( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetSelEntry( void *hnd, SaHpiResourceIdT, +- SaHpiEventLogEntryIdT, +- SaHpiEventLogEntryIdT *, +- SaHpiEventLogEntryIdT *, +- SaHpiEventLogEntryT *, +- SaHpiRdrT *, +- SaHpiRptEntryT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetSelEntry( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetSelEntry( void *hnd, SaHpiResourceIdT id, + SaHpiEventLogEntryIdT current, + SaHpiEventLogEntryIdT *prev, + SaHpiEventLogEntryIdT *next, +@@ -1844,9 +1659,7 @@ static SaErrorT NewSimulatorGetSelEntry( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorClearSel( void *, SaHpiResourceIdT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorClearSel( void *hnd, SaHpiResourceIdT id ) { ++SaErrorT NewSimulatorClearSel( void *hnd, SaHpiResourceIdT id ) { + SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; + + NewSimulator *newsim = VerifyNewSimulator( hnd ); +@@ -1874,10 +1687,7 @@ static SaErrorT NewSimulatorClearSel( vo + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetSelState(void *, SaHpiResourceIdT, +- SaHpiBoolT) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetSelState( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorSetSelState( void *hnd, SaHpiResourceIdT id, + SaHpiBoolT state ) { + SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; + +@@ -1906,10 +1716,7 @@ static SaErrorT NewSimulatorSetSelState( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetSelState(void *, SaHpiResourceIdT, +- SaHpiBoolT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetSelState( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetSelState( void *hnd, SaHpiResourceIdT id, + SaHpiBoolT *state ) { + SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; + +@@ -1938,10 +1745,7 @@ static SaErrorT NewSimulatorGetSelState( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetSelCapability(void *, SaHpiResourceIdT, +- SaHpiEventLogCapabilitiesT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetSelCapability( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetSelCapability( void *hnd, SaHpiResourceIdT id, + SaHpiEventLogCapabilitiesT *caps ) { + SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; + +@@ -1969,10 +1773,7 @@ static SaErrorT NewSimulatorGetSelCapabi + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorResetSelOverflow(void *, SaHpiResourceIdT) +- __attribute__((used)); +- +-static SaErrorT NewSimulatorResetSelOverflow( void *hnd, SaHpiResourceIdT id ) { ++SaErrorT NewSimulatorResetSelOverflow( void *hnd, SaHpiResourceIdT id ) { + + SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR; + +@@ -2001,10 +1802,7 @@ static SaErrorT NewSimulatorResetSelOver + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorHotswapPolicyCancel( void *, SaHpiResourceIdT, +- SaHpiTimeoutT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorHotswapPolicyCancel( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorHotswapPolicyCancel( void *hnd, SaHpiResourceIdT id, + SaHpiTimeoutT timeout) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -2031,10 +1829,7 @@ static SaErrorT NewSimulatorHotswapPolic + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetHotswapState( void *, SaHpiResourceIdT , +- SaHpiHsStateT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetHotswapState( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetHotswapState( void *hnd, SaHpiResourceIdT id, + SaHpiHsStateT *state ) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -2062,10 +1857,7 @@ static SaErrorT NewSimulatorGetHotswapSt + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetHotswapState( void *, SaHpiResourceIdT, +- SaHpiHsStateT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetHotswapState( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorSetHotswapState( void *hnd, SaHpiResourceIdT id, + SaHpiHsStateT state ) { + SaErrorT rv = SA_OK; + NewSimulator *newsim = 0; +@@ -2104,10 +1896,7 @@ static SaErrorT NewSimulatorSetHotswapSt + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorRequestHotswapAction( void *, SaHpiResourceIdT, +- SaHpiHsActionT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorRequestHotswapAction( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorRequestHotswapAction( void *hnd, SaHpiResourceIdT id, + SaHpiHsActionT act ) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -2136,12 +1925,7 @@ static SaErrorT NewSimulatorRequestHotsw + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetWatchdogInfo(void *, +- SaHpiResourceIdT, +- SaHpiWatchdogNumT, +- SaHpiWatchdogT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetWatchdogInfo(void *hnd, ++SaErrorT NewSimulatorGetWatchdogInfo(void *hnd, + SaHpiResourceIdT id, + SaHpiWatchdogNumT num, + SaHpiWatchdogT *watchdog) { +@@ -2167,12 +1951,7 @@ static SaErrorT NewSimulatorGetWatchdogI + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetWatchdogInfo(void *, +- SaHpiResourceIdT, +- SaHpiWatchdogNumT, +- SaHpiWatchdogT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetWatchdogInfo(void *hnd, ++SaErrorT NewSimulatorSetWatchdogInfo(void *hnd, + SaHpiResourceIdT id, + SaHpiWatchdogNumT num, + SaHpiWatchdogT *watchdog) { +@@ -2197,11 +1976,7 @@ static SaErrorT NewSimulatorSetWatchdogI + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorResetWatchdog(void *, +- SaHpiResourceIdT, +- SaHpiWatchdogNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorResetWatchdog(void *hnd, ++SaErrorT NewSimulatorResetWatchdog(void *hnd, + SaHpiResourceIdT id, + SaHpiWatchdogNumT num) { + NewSimulator *newsim = 0; +@@ -2226,12 +2001,7 @@ static SaErrorT NewSimulatorResetWatchdo + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetFumiSpec(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiFumiSpecInfoT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetFumiSpec(void *hnd, ++SaErrorT NewSimulatorGetFumiSpec(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiFumiSpecInfoT *spec) { +@@ -2257,12 +2027,7 @@ static SaErrorT NewSimulatorGetFumiSpec( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetFumiServImpact(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiFumiServiceImpactDataT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetFumiServImpact(void *hnd, ++SaErrorT NewSimulatorGetFumiServImpact(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiFumiServiceImpactDataT *impact) { +@@ -2290,13 +2055,7 @@ static SaErrorT NewSimulatorGetFumiServI + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetFumiSource(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT, +- SaHpiTextBufferT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetFumiSource(void *hnd, ++SaErrorT NewSimulatorSetFumiSource(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank, +@@ -2324,12 +2083,7 @@ static SaErrorT NewSimulatorSetFumiSourc + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorValidateFumiSource(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorValidateFumiSource(void *hnd, ++SaErrorT NewSimulatorValidateFumiSource(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank) { +@@ -2357,13 +2111,7 @@ static SaErrorT NewSimulatorValidateFumi + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetFumiSource(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT, +- SaHpiFumiSourceInfoT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetFumiSource(void *hnd, ++SaErrorT NewSimulatorGetFumiSource(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank, +@@ -2394,15 +2142,7 @@ static SaErrorT NewSimulatorGetFumiSourc + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetFumiSourceComponent(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT, +- SaHpiEntryIdT, +- SaHpiEntryIdT *, +- SaHpiFumiComponentInfoT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetFumiSourceComponent(void *hnd, ++SaErrorT NewSimulatorGetFumiSourceComponent(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank, +@@ -2433,13 +2173,7 @@ static SaErrorT NewSimulatorGetFumiSourc + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetFumiTarget(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT, +- SaHpiFumiBankInfoT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetFumiTarget(void *hnd, ++SaErrorT NewSimulatorGetFumiTarget(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank, +@@ -2470,15 +2204,7 @@ static SaErrorT NewSimulatorGetFumiTarge + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetFumiTargetComponent(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT, +- SaHpiEntryIdT, +- SaHpiEntryIdT *, +- SaHpiFumiComponentInfoT *) __attribute__((used)); +- +- static SaErrorT NewSimulatorGetFumiTargetComponent(void *hnd, ++SaErrorT NewSimulatorGetFumiTargetComponent(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank, +@@ -2508,12 +2234,7 @@ static SaErrorT NewSimulatorGetFumiTarge + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetFumiLogicalTarget(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiFumiLogicalBankInfoT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetFumiLogicalTarget(void *hnd, ++SaErrorT NewSimulatorGetFumiLogicalTarget(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiFumiLogicalBankInfoT *trg) { +@@ -2542,14 +2263,7 @@ static SaErrorT NewSimulatorGetFumiLogic + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetFumiLogicalTargetComponent(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiEntryIdT, +- SaHpiEntryIdT *, +- SaHpiFumiLogicalComponentInfoT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetFumiLogicalTargetComponent(void *hnd, ++SaErrorT NewSimulatorGetFumiLogicalTargetComponent(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiEntryIdT comp, +@@ -2577,11 +2291,7 @@ static SaErrorT NewSimulatorGetFumiLogic + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorStartFumiBackup(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorStartFumiBackup(void *hnd, ++SaErrorT NewSimulatorStartFumiBackup(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num) { + +@@ -2608,13 +2318,7 @@ static SaErrorT NewSimulatorStartFumiBac + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetFumiBankOrder(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT, +- SaHpiUint32T) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetFumiBankOrder(void *hnd, ++SaErrorT NewSimulatorSetFumiBankOrder(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank, +@@ -2643,13 +2347,7 @@ static SaErrorT NewSimulatorSetFumiBankO + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorStartFumiBankCopy(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT, +- SaHpiBankNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorStartFumiBankCopy(void *hnd, ++SaErrorT NewSimulatorStartFumiBankCopy(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank, +@@ -2677,12 +2375,7 @@ static SaErrorT NewSimulatorStartFumiBan + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorStartFumiInstall(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorStartFumiInstall(void *hnd, ++SaErrorT NewSimulatorStartFumiInstall(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank) { +@@ -2710,13 +2403,7 @@ static SaErrorT NewSimulatorStartFumiIns + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetFumiStatus(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT, +- SaHpiFumiUpgradeStatusT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetFumiStatus(void *hnd, ++SaErrorT NewSimulatorGetFumiStatus(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank, +@@ -2744,12 +2431,7 @@ static SaErrorT NewSimulatorGetFumiStatu + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorStartFumiVerification(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorStartFumiVerification(void *hnd, ++SaErrorT NewSimulatorStartFumiVerification(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank) { +@@ -2774,11 +2456,7 @@ static SaErrorT NewSimulatorStartFumiVer + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorStartFumiVerificationMain(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorStartFumiVerificationMain(void *hnd, ++SaErrorT NewSimulatorStartFumiVerificationMain(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num) { + +@@ -2804,12 +2482,7 @@ static SaErrorT NewSimulatorStartFumiVer + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorCancelFumiUpgrade(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorCancelFumiUpgrade(void *hnd, ++SaErrorT NewSimulatorCancelFumiUpgrade(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank) { +@@ -2835,12 +2508,7 @@ static SaErrorT NewSimulatorCancelFumiUp + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetFumiRollback(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBoolT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetFumiRollback(void *hnd, ++SaErrorT NewSimulatorGetFumiRollback(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBoolT *rollb) { +@@ -2867,12 +2535,7 @@ static SaErrorT NewSimulatorGetFumiRollb + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetFumiRollback(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBoolT) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetFumiRollback(void *hnd, ++SaErrorT NewSimulatorSetFumiRollback(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBoolT rollb) { +@@ -2898,11 +2561,7 @@ static SaErrorT NewSimulatorSetFumiRollb + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorStartFumiRollback(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorStartFumiRollback(void *hnd, ++SaErrorT NewSimulatorStartFumiRollback(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num) { + +@@ -2927,11 +2586,7 @@ static SaErrorT NewSimulatorStartFumiRol + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorActivateFumi(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorActivateFumi(void *hnd, ++SaErrorT NewSimulatorActivateFumi(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num) { + +@@ -2957,12 +2612,7 @@ static SaErrorT NewSimulatorActivateFumi + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorStartFumiActivation(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBoolT) __attribute__((used)); +- +-static SaErrorT NewSimulatorStartFumiActivation(void *hnd, ++SaErrorT NewSimulatorStartFumiActivation(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBoolT log) { +@@ -2989,12 +2639,7 @@ static SaErrorT NewSimulatorStartFumiAct + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorCleanupFumi(void *, +- SaHpiResourceIdT, +- SaHpiFumiNumT, +- SaHpiBankNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorCleanupFumi(void *hnd, ++SaErrorT NewSimulatorCleanupFumi(void *hnd, + SaHpiResourceIdT id, + SaHpiFumiNumT num, + SaHpiBankNumT bank) { +@@ -3020,12 +2665,7 @@ static SaErrorT NewSimulatorCleanupFumi( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetDimiInfo( void *, +- SaHpiResourceIdT, +- SaHpiDimiNumT, +- SaHpiDimiInfoT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetDimiInfo( void *hnd, ++SaErrorT NewSimulatorGetDimiInfo( void *hnd, + SaHpiResourceIdT id, + SaHpiDimiNumT num, + SaHpiDimiInfoT *info) { +@@ -3053,13 +2693,7 @@ static SaErrorT NewSimulatorGetDimiInfo( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetDimiTestInfo( void *, +- SaHpiResourceIdT, +- SaHpiDimiNumT, +- SaHpiDimiTestNumT, +- SaHpiDimiTestT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetDimiTestInfo( void *hnd, ++SaErrorT NewSimulatorGetDimiTestInfo( void *hnd, + SaHpiResourceIdT id, + SaHpiDimiNumT num, + SaHpiDimiTestNumT tnum, +@@ -3088,13 +2722,7 @@ static SaErrorT NewSimulatorGetDimiTestI + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetDimiTestReadiness( void *, +- SaHpiResourceIdT, +- SaHpiDimiNumT, +- SaHpiDimiTestNumT, +- SaHpiDimiReadyT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetDimiTestReadiness( void *hnd, ++SaErrorT NewSimulatorGetDimiTestReadiness( void *hnd, + SaHpiResourceIdT id, + SaHpiDimiNumT num, + SaHpiDimiTestNumT tnum, +@@ -3124,14 +2752,7 @@ static SaErrorT NewSimulatorGetDimiTestR + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorStartDimiTest( void *, +- SaHpiResourceIdT, +- SaHpiDimiNumT, +- SaHpiDimiTestNumT, +- SaHpiUint8T, +- SaHpiDimiTestVariableParamsT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorStartDimiTest( void *hnd, ++SaErrorT NewSimulatorStartDimiTest( void *hnd, + SaHpiResourceIdT id, + SaHpiDimiNumT num, + SaHpiDimiTestNumT tnum, +@@ -3160,12 +2781,7 @@ static SaErrorT NewSimulatorStartDimiTes + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorCancelDimiTest( void *, +- SaHpiResourceIdT, +- SaHpiDimiNumT, +- SaHpiDimiTestNumT) __attribute__((used)); +- +-static SaErrorT NewSimulatorCancelDimiTest( void *hnd, ++SaErrorT NewSimulatorCancelDimiTest( void *hnd, + SaHpiResourceIdT id, + SaHpiDimiNumT num, + SaHpiDimiTestNumT tnum) { +@@ -3194,14 +2810,7 @@ static SaErrorT NewSimulatorCancelDimiTe + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetDimiTestStatus( void *, +- SaHpiResourceIdT, +- SaHpiDimiNumT, +- SaHpiDimiTestNumT, +- SaHpiDimiTestPercentCompletedT *, +- SaHpiDimiTestRunStatusT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetDimiTestStatus( void *hnd, ++SaErrorT NewSimulatorGetDimiTestStatus( void *hnd, + SaHpiResourceIdT id, + SaHpiDimiNumT num, + SaHpiDimiTestNumT tnum, +@@ -3230,13 +2839,7 @@ static SaErrorT NewSimulatorGetDimiTestS + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetDimiTestResults( void *, +- SaHpiResourceIdT, +- SaHpiDimiNumT, +- SaHpiDimiTestNumT, +- SaHpiDimiTestResultsT *) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetDimiTestResults( void *hnd, ++SaErrorT NewSimulatorGetDimiTestResults( void *hnd, + SaHpiResourceIdT id, + SaHpiDimiNumT num, + SaHpiDimiTestNumT tnum, +@@ -3262,10 +2865,7 @@ static SaErrorT NewSimulatorGetDimiTestR + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetAutoInsertTimeout( void *, +- SaHpiTimeoutT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetAutoInsertTimeout( void *hnd, SaHpiTimeoutT timeout) { ++SaErrorT NewSimulatorSetAutoInsertTimeout( void *hnd, SaHpiTimeoutT timeout) { + NewSimulator *newsim = VerifyNewSimulator( hnd ); + + if ( !newsim ) { +@@ -3288,10 +2888,7 @@ static SaErrorT NewSimulatorSetAutoInser + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetAutoExtractTimeout( void *, SaHpiResourceIdT, +- SaHpiTimeoutT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, + SaHpiTimeoutT *timeout ) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -3318,10 +2915,7 @@ static SaErrorT NewSimulatorGetAutoExtra + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetAutoExtractTimeout( void *, SaHpiResourceIdT, +- SaHpiTimeoutT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorSetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, + SaHpiTimeoutT timeout ) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -3349,10 +2943,7 @@ static SaErrorT NewSimulatorSetAutoExtra + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetPowerState( void *, SaHpiResourceIdT, +- SaHpiPowerStateT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetPowerState( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetPowerState( void *hnd, SaHpiResourceIdT id, + SaHpiPowerStateT *state ) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -3381,10 +2972,7 @@ static SaErrorT NewSimulatorGetPowerStat + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetPowerState( void *, SaHpiResourceIdT, +- SaHpiPowerStateT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetPowerState( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorSetPowerState( void *hnd, SaHpiResourceIdT id, + SaHpiPowerStateT state ) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -3413,10 +3001,7 @@ static SaErrorT NewSimulatorSetPowerStat + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetIndicatorState( void *, SaHpiResourceIdT, +- SaHpiHsIndicatorStateT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetIndicatorState( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetIndicatorState( void *hnd, SaHpiResourceIdT id, + SaHpiHsIndicatorStateT *state ) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -3445,10 +3030,7 @@ static SaErrorT NewSimulatorGetIndicator + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetIndicatorState( void *, SaHpiResourceIdT, +- SaHpiHsIndicatorStateT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetIndicatorState( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorSetIndicatorState( void *hnd, SaHpiResourceIdT id, + SaHpiHsIndicatorStateT state ) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -3477,11 +3059,7 @@ static SaErrorT NewSimulatorSetIndicator + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorControlParm( void *, +- SaHpiResourceIdT, +- SaHpiParmActionT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorControlParm( void *hnd, ++SaErrorT NewSimulatorControlParm( void *hnd, + SaHpiResourceIdT id, + SaHpiParmActionT act ) { + NewSimulator *newsim = 0; +@@ -3511,10 +3089,7 @@ static SaErrorT NewSimulatorControlParm( + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorGetResetState( void *, SaHpiResourceIdT, +- SaHpiResetActionT * ) __attribute__((used)); +- +-static SaErrorT NewSimulatorGetResetState( void *hnd, SaHpiResourceIdT id, ++SaErrorT NewSimulatorGetResetState( void *hnd, SaHpiResourceIdT id, + SaHpiResetActionT *act ) { + NewSimulator *newsim = 0; + NewSimulatorResource *res = VerifyResourceAndEnter( hnd, id, newsim ); +@@ -3543,11 +3118,7 @@ static SaErrorT NewSimulatorGetResetStat + * + * @return HPI error code + **/ +-static SaErrorT NewSimulatorSetResetState( void *, +- SaHpiResourceIdT, +- SaHpiResetActionT ) __attribute__((used)); +- +-static SaErrorT NewSimulatorSetResetState( void *hnd, ++SaErrorT NewSimulatorSetResetState( void *hnd, + SaHpiResourceIdT id, + SaHpiResetActionT act ) { + NewSimulator *newsim = 0; diff --git a/sysutils/openhpi/files/patch-plugins-ipmidirect-ipmi.cpp b/sysutils/openhpi/files/patch-plugins-ipmidirect-ipmi.cpp new file mode 100644 index 000000000000..195283d9f102 --- /dev/null +++ b/sysutils/openhpi/files/patch-plugins-ipmidirect-ipmi.cpp @@ -0,0 +1,692 @@ +--- plugins/ipmidirect/ipmi.cpp.orig 2015-09-14 22:48:31 UTC ++++ plugins/ipmidirect/ipmi.cpp +@@ -275,13 +275,11 @@ VerifySelAndEnter( void *hnd, SaHpiResou + + // new plugin_loader + extern "C" { ++#pragma GCC visibility push(hidden) + + // ABI Interface functions + +-static void * +-IpmiOpen( GHashTable *, unsigned int, oh_evt_queue * ) __attribute__((used)); +- +-static void * ++void * + IpmiOpen( GHashTable *handler_config, unsigned int hid, oh_evt_queue *eventq ) + { + // open log +@@ -387,10 +385,7 @@ IpmiOpen( GHashTable *handler_config, un + } + + +-static void +-IpmiClose( void * ) __attribute__((used)); +- +-static void ++void + IpmiClose( void *hnd ) + { + dbg( "IpmiClose" ); +@@ -435,10 +430,7 @@ IpmiClose( void *hnd ) + } + + +-static SaErrorT +-IpmiGetEvent( void * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetEvent( void *hnd ) + { + cIpmi *ipmi = VerifyIpmi( hnd ); +@@ -457,10 +449,7 @@ IpmiGetEvent( void *hnd ) + } + + +-static SaErrorT +-IpmiDiscoverResources( void * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiDiscoverResources( void *hnd ) + { + cIpmi *ipmi = VerifyIpmi( hnd ); +@@ -478,10 +467,7 @@ IpmiDiscoverResources( void *hnd ) + } + + +-static SaErrorT +-IpmiSetResourceTag( void *, SaHpiResourceIdT, SaHpiTextBufferT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetResourceTag( void *hnd, SaHpiResourceIdT id, SaHpiTextBufferT *tag ) + { + cIpmi *ipmi = 0; +@@ -498,10 +484,7 @@ IpmiSetResourceTag( void *hnd, SaHpiReso + } + + +-static SaErrorT +-IpmiSetResourceSeverity( void *, SaHpiResourceIdT, SaHpiSeverityT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetResourceSeverity( void *hnd, SaHpiResourceIdT id, SaHpiSeverityT sev ) + { + cIpmi *ipmi = 0; +@@ -518,14 +501,7 @@ IpmiSetResourceSeverity( void *hnd, SaHp + } + + +-static SaErrorT +-IpmiGetSensorReading( void *, +- SaHpiResourceIdT id, +- SaHpiSensorNumT num, +- SaHpiSensorReadingT *data, +- SaHpiEventStateT *state ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetSensorReading( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, +@@ -546,13 +522,7 @@ IpmiGetSensorReading( void *hnd, + } + + +-static SaErrorT +-IpmiGetSensorThresholds( void *hnd, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiSensorThresholdsT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetSensorThresholds( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, +@@ -577,13 +547,7 @@ IpmiGetSensorThresholds( void + } + + +-static SaErrorT +-IpmiSetSensorThresholds( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- const SaHpiSensorThresholdsT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetSensorThresholds( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, +@@ -608,13 +572,7 @@ IpmiSetSensorThresholds( void *hnd, + } + + +-static SaErrorT +-IpmiGetSensorEnable( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiBoolT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetSensorEnable( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, +@@ -634,13 +592,7 @@ IpmiGetSensorEnable( void *hnd, + } + + +-static SaErrorT +-IpmiSetSensorEnable( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiBoolT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetSensorEnable( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, +@@ -660,13 +612,7 @@ IpmiSetSensorEnable( void *hnd, + } + + +-static SaErrorT +-IpmiGetSensorEventEnables( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiBoolT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetSensorEventEnables( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, +@@ -686,13 +632,7 @@ IpmiGetSensorEventEnables( void *hnd, + } + + +-static SaErrorT +-IpmiSetSensorEventEnables( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiBoolT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetSensorEventEnables( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, +@@ -712,14 +652,7 @@ IpmiSetSensorEventEnables( void *hnd, + } + + +-static SaErrorT +-IpmiGetSensorEventMasks( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiEventStateT *, +- SaHpiEventStateT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetSensorEventMasks( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, +@@ -741,15 +674,7 @@ IpmiGetSensorEventMasks( void *hnd, + } + + +-static SaErrorT +-IpmiSetSensorEventMasks( void *, +- SaHpiResourceIdT, +- SaHpiSensorNumT, +- SaHpiSensorEventMaskActionT, +- SaHpiEventStateT, +- SaHpiEventStateT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetSensorEventMasks( void *hnd, + SaHpiResourceIdT id, + SaHpiSensorNumT num, +@@ -772,13 +697,7 @@ IpmiSetSensorEventMasks( void *hnd, + } + + +-static SaErrorT +-IpmiGetControlState( void *, SaHpiResourceIdT, +- SaHpiCtrlNumT, +- SaHpiCtrlModeT *, +- SaHpiCtrlStateT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetControlState( void *hnd, SaHpiResourceIdT id, + SaHpiCtrlNumT num, + SaHpiCtrlModeT *mode, +@@ -798,13 +717,7 @@ IpmiGetControlState( void *hnd, SaHpiRes + } + + +-static SaErrorT +-IpmiSetControlState( void *, SaHpiResourceIdT, +- SaHpiCtrlNumT, +- SaHpiCtrlModeT, +- SaHpiCtrlStateT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetControlState( void *hnd, SaHpiResourceIdT id, + SaHpiCtrlNumT num, + SaHpiCtrlModeT mode, +@@ -824,13 +737,7 @@ IpmiSetControlState( void *hnd, SaHpiRes + } + + +-static SaErrorT +-IpmiGetIdrInfo( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrInfoT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetIdrInfo( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, +@@ -850,16 +757,7 @@ IpmiGetIdrInfo( void *hnd, + } + + +-static SaErrorT +-IpmiGetIdrAreaHeader( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrAreaTypeT, +- SaHpiEntryIdT, +- SaHpiEntryIdT *, +- SaHpiIdrAreaHeaderT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetIdrAreaHeader( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, +@@ -882,14 +780,7 @@ IpmiGetIdrAreaHeader( void *hnd, + } + + +-static SaErrorT +-IpmiAddIdrArea( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrAreaTypeT, +- SaHpiEntryIdT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiAddIdrArea( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, +@@ -910,13 +801,7 @@ IpmiAddIdrArea( void *hnd, + } + + +-static SaErrorT +-IpmiDelIdrArea( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiEntryIdT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiDelIdrArea( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, +@@ -936,17 +821,7 @@ IpmiDelIdrArea( void *hnd, + } + + +-static SaErrorT +-IpmiGetIdrField( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiEntryIdT, +- SaHpiIdrFieldTypeT, +- SaHpiEntryIdT, +- SaHpiEntryIdT *, +- SaHpiIdrFieldT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetIdrField( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, +@@ -970,13 +845,7 @@ IpmiGetIdrField( void *hnd, + } + + +-static SaErrorT +-IpmiAddIdrField( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrFieldT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiAddIdrField( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, +@@ -996,13 +865,7 @@ IpmiAddIdrField( void *hnd, + } + + +-static SaErrorT +-IpmiSetIdrField( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiIdrFieldT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetIdrField( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, +@@ -1022,14 +885,7 @@ IpmiSetIdrField( void *hnd, + } + + +-static SaErrorT +-IpmiDelIdrField( void *, +- SaHpiResourceIdT, +- SaHpiIdrIdT, +- SaHpiEntryIdT, +- SaHpiEntryIdT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiDelIdrField( void *hnd, + SaHpiResourceIdT id, + SaHpiIdrIdT idrid, +@@ -1050,12 +906,7 @@ IpmiDelIdrField( void *hnd, + } + + +-static SaErrorT +-IpmiGetSelInfo( void *, +- SaHpiResourceIdT, +- SaHpiEventLogInfoT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetSelInfo( void *hnd, + SaHpiResourceIdT id, + SaHpiEventLogInfoT *info ) +@@ -1074,10 +925,7 @@ IpmiGetSelInfo( void *hnd, + } + + +-static SaErrorT +-IpmiSetSelTime( void *, SaHpiResourceIdT, SaHpiTimeT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetSelTime( void *hnd, SaHpiResourceIdT id, SaHpiTimeT t ) + { + cIpmi *ipmi = 0; +@@ -1094,11 +942,7 @@ IpmiSetSelTime( void *hnd, SaHpiResource + } + + +-static SaErrorT +-IpmiAddSelEntry( void *, SaHpiResourceIdT, +- const SaHpiEventT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiAddSelEntry( void *hnd, SaHpiResourceIdT id, + const SaHpiEventT *Event ) + { +@@ -1116,11 +960,7 @@ IpmiAddSelEntry( void *hnd, SaHpiResourc + } + + #ifdef NOTUSED +-static SaErrorT +-IpmiDelSelEntry( void *, SaHpiResourceIdT, +- SaHpiEventLogEntryIdT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiDelSelEntry( void *hnd, SaHpiResourceIdT id, + SaHpiEventLogEntryIdT sid ) + { +@@ -1139,15 +979,7 @@ IpmiDelSelEntry( void *hnd, SaHpiResourc + #endif + + +-static SaErrorT +-IpmiGetSelEntry( void *hnd, SaHpiResourceIdT, +- SaHpiEventLogEntryIdT, +- SaHpiEventLogEntryIdT *, SaHpiEventLogEntryIdT *, +- SaHpiEventLogEntryT *, +- SaHpiRdrT *, +- SaHpiRptEntryT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetSelEntry( void *hnd, SaHpiResourceIdT id, + SaHpiEventLogEntryIdT current, + SaHpiEventLogEntryIdT *prev, SaHpiEventLogEntryIdT *next, +@@ -1169,10 +1001,7 @@ IpmiGetSelEntry( void *hnd, SaHpiResourc + } + + +-static SaErrorT +-IpmiClearSel( void *, SaHpiResourceIdT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiClearSel( void *hnd, SaHpiResourceIdT id ) + { + cIpmi *ipmi = 0; +@@ -1188,11 +1017,7 @@ IpmiClearSel( void *hnd, SaHpiResourceId + return rv; + } + +-static SaErrorT +-IpmiHotswapPolicyCancel( void *, SaHpiResourceIdT, +- SaHpiTimeoutT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiHotswapPolicyCancel( void *hnd, SaHpiResourceIdT id, + SaHpiTimeoutT timeout) + { +@@ -1209,10 +1034,7 @@ IpmiHotswapPolicyCancel( void *hnd, SaHp + return rv; + } + +-static SaErrorT +-IpmiSetAutoInsertTimeout( void *, SaHpiTimeoutT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetAutoInsertTimeout( void *hnd, SaHpiTimeoutT timeout) + { + cIpmi *ipmi = VerifyIpmi( hnd ); +@@ -1227,11 +1049,7 @@ IpmiSetAutoInsertTimeout( void *hnd, SaH + return rv; + } + +-static SaErrorT +-IpmiGetAutoExtractTimeout( void *, SaHpiResourceIdT, +- SaHpiTimeoutT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, + SaHpiTimeoutT *timeout ) + { +@@ -1248,11 +1066,7 @@ IpmiGetAutoExtractTimeout( void *hnd, Sa + return rv; + } + +-static SaErrorT +-IpmiSetAutoExtractTimeout( void *, SaHpiResourceIdT, +- SaHpiTimeoutT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id, + SaHpiTimeoutT timeout ) + { +@@ -1269,11 +1083,7 @@ IpmiSetAutoExtractTimeout( void *hnd, Sa + return rv; + } + +-static SaErrorT +-IpmiGetHotswapState( void *, SaHpiResourceIdT , +- SaHpiHsStateT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetHotswapState( void *hnd, SaHpiResourceIdT id, + SaHpiHsStateT *state ) + { +@@ -1291,11 +1101,7 @@ IpmiGetHotswapState( void *hnd, SaHpiRes + } + + +-static SaErrorT +-IpmiSetHotswapState( void *, SaHpiResourceIdT, +- SaHpiHsStateT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetHotswapState( void *hnd, SaHpiResourceIdT id, + SaHpiHsStateT state ) + { +@@ -1313,11 +1119,7 @@ IpmiSetHotswapState( void *hnd, SaHpiRes + } + + +-static SaErrorT +-IpmiRequestHotswapAction( void *, SaHpiResourceIdT, +- SaHpiHsActionT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiRequestHotswapAction( void *hnd, SaHpiResourceIdT id, + SaHpiHsActionT act ) + { +@@ -1335,11 +1137,7 @@ IpmiRequestHotswapAction( void *hnd, SaH + } + + +-static SaErrorT +-IpmiGetPowerState( void *, SaHpiResourceIdT, +- SaHpiPowerStateT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetPowerState( void *hnd, SaHpiResourceIdT id, + SaHpiPowerStateT *state ) + { +@@ -1357,11 +1155,7 @@ IpmiGetPowerState( void *hnd, SaHpiResou + } + + +-static SaErrorT +-IpmiSetPowerState( void *, SaHpiResourceIdT, +- SaHpiPowerStateT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetPowerState( void *hnd, SaHpiResourceIdT id, + SaHpiPowerStateT state ) + { +@@ -1379,11 +1173,7 @@ IpmiSetPowerState( void *hnd, SaHpiResou + } + + +-static SaErrorT +-IpmiGetIndicatorState( void *, SaHpiResourceIdT, +- SaHpiHsIndicatorStateT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetIndicatorState( void *hnd, SaHpiResourceIdT id, + SaHpiHsIndicatorStateT *state ) + { +@@ -1401,11 +1191,7 @@ IpmiGetIndicatorState( void *hnd, SaHpiR + } + + +-static SaErrorT +-IpmiSetIndicatorState( void *, SaHpiResourceIdT, +- SaHpiHsIndicatorStateT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetIndicatorState( void *hnd, SaHpiResourceIdT id, + SaHpiHsIndicatorStateT state ) + { +@@ -1423,12 +1209,7 @@ IpmiSetIndicatorState( void *hnd, SaHpiR + } + + +-static SaErrorT +-IpmiControlParm( void *, +- SaHpiResourceIdT, +- SaHpiParmActionT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiControlParm( void *hnd, + SaHpiResourceIdT id, + SaHpiParmActionT act ) +@@ -1447,11 +1228,7 @@ IpmiControlParm( void *hnd, + } + + +-static SaErrorT +-IpmiGetResetState( void *, SaHpiResourceIdT, +- SaHpiResetActionT * ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetResetState( void *hnd, SaHpiResourceIdT id, + SaHpiResetActionT *act ) + { +@@ -1469,12 +1246,7 @@ IpmiGetResetState( void *hnd, SaHpiResou + } + + +-static SaErrorT +-IpmiSetResetState( void *, +- SaHpiResourceIdT, +- SaHpiResetActionT ) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetResetState( void *hnd, + SaHpiResourceIdT id, + SaHpiResetActionT act ) +@@ -1492,13 +1264,7 @@ IpmiSetResetState( void *hnd, + return rv; + } + +-static SaErrorT +-IpmiGetWatchdogInfo(void *, +- SaHpiResourceIdT, +- SaHpiWatchdogNumT, +- SaHpiWatchdogT *) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiGetWatchdogInfo(void *hnd, + SaHpiResourceIdT id, + SaHpiWatchdogNumT num, +@@ -1513,13 +1279,7 @@ IpmiGetWatchdogInfo(void *hnd, + return rv; + } + +-static SaErrorT +-IpmiSetWatchdogInfo(void *, +- SaHpiResourceIdT, +- SaHpiWatchdogNumT, +- SaHpiWatchdogT *) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiSetWatchdogInfo(void *hnd, + SaHpiResourceIdT id, + SaHpiWatchdogNumT num, +@@ -1534,12 +1294,7 @@ IpmiSetWatchdogInfo(void *hnd, + return rv; + } + +-static SaErrorT +-IpmiResetWatchdog(void *, +- SaHpiResourceIdT, +- SaHpiWatchdogNumT) __attribute__((used)); +- +-static SaErrorT ++SaErrorT + IpmiResetWatchdog(void *hnd, + SaHpiResourceIdT id, + SaHpiWatchdogNumT num) +@@ -1554,6 +1309,7 @@ IpmiResetWatchdog(void *hnd, + } + + ++#pragma GCC visibility pop + } // new plugin_loader + + extern "C" { diff --git a/sysutils/openhpi/pkg-descr b/sysutils/openhpi/pkg-descr new file mode 100644 index 000000000000..75752c48db0c --- /dev/null +++ b/sysutils/openhpi/pkg-descr @@ -0,0 +1,10 @@ +OpenHPI provides an open source implementation of the Service Availability +Forum (SAF) Hardware Platform Interface (HPI). + +HPI is an abstracted interface for managing computer hardware, typically +chassis and rack based servers. HPI includes resource modeling; access to +and control over sensor, control, watchdog, and inventory data associated +with resources; abstracted System Event Log interfaces; hardware events and +alarms; and a managed hotswap interface. + +WWW: http://openhpi.org/ diff --git a/sysutils/openhpi/pkg-plist b/sysutils/openhpi/pkg-plist new file mode 100644 index 000000000000..2ef3c1a7d995 --- /dev/null +++ b/sysutils/openhpi/pkg-plist @@ -0,0 +1,136 @@ +bin/hpi_shell +bin/hpialarms +bin/hpicrypt +bin/hpidomain +bin/hpiel +bin/hpievents +bin/hpifan +bin/hpigensimdata +bin/hpiinv +bin/hpionIBMblade +bin/hpipower +bin/hpireset +bin/hpisensor +bin/hpisettime +bin/hpithres +bin/hpitop +bin/hpitree +bin/hpiwdt +bin/hpixml +bin/ohdomainlist +bin/ohhandler +bin/ohparam +@comment etc/init.d/openhpid +@sample %%ETCDIR%%/openhpi.conf.sample +@sample %%ETCDIR%%/openhpiclient.conf.sample +@sample %%ETCDIR%%/simulation.data.sample +include/openhpi/SaHpi.h +include/openhpi/SaHpiAtca.h +include/openhpi/SaHpiBladeCenter.h +include/openhpi/SaHpiXtca.h +include/openhpi/announcement_utils.h +include/openhpi/el_utils.h +include/openhpi/epath_utils.h +include/openhpi/event_utils.h +include/openhpi/oHpi.h +include/openhpi/oh_clients.h +include/openhpi/oh_utils.h +include/openhpi/rpt_utils.h +include/openhpi/sahpi_enum_utils.h +include/openhpi/sahpi_event_encode.h +include/openhpi/sahpi_event_utils.h +include/openhpi/sahpi_gcrypt_utils.h +include/openhpi/sahpi_struct_utils.h +include/openhpi/sahpi_time_utils.h +include/openhpi/sahpiatca_enum_utils.h +include/openhpi/sahpixtca_enum_utils.h +include/openhpi/uid_utils.h +lib/libopenhpi.a +lib/libopenhpi.so +lib/libopenhpi.so.3 +lib/libopenhpi.so.3.6.1 +lib/libopenhpi_snmp.a +lib/libopenhpi_snmp.so +lib/libopenhpi_snmp.so.3 +lib/libopenhpi_snmp.so.3.6.1 +lib/libopenhpi_ssl.a +lib/libopenhpi_ssl.so +lib/libopenhpi_ssl.so.3 +lib/libopenhpi_ssl.so.3.6.1 +lib/libopenhpimarshal.a +lib/libopenhpimarshal.so +lib/libopenhpimarshal.so.3 +lib/libopenhpimarshal.so.3.6.1 +lib/libopenhpitransport.a +lib/libopenhpitransport.so +lib/libopenhpitransport.so.3 +lib/libopenhpitransport.so.3.6.1 +lib/libopenhpiutils.a +lib/libopenhpiutils.so +lib/libopenhpiutils.so.3 +lib/libopenhpiutils.so.3.6.1 +lib/openhpi/libdyn_simulator.a +lib/openhpi/libdyn_simulator.so +lib/openhpi/libdyn_simulator.so.3 +lib/openhpi/libdyn_simulator.so.3.6.1 +lib/openhpi/libilo2_ribcl.a +lib/openhpi/libilo2_ribcl.so +lib/openhpi/libilo2_ribcl.so.3 +lib/openhpi/libilo2_ribcl.so.3.6.1 +lib/openhpi/libipmidirect.a +lib/openhpi/libipmidirect.so +lib/openhpi/libipmidirect.so.3 +lib/openhpi/libipmidirect.so.3.6.1 +lib/openhpi/liboa_soap.a +lib/openhpi/liboa_soap.so +lib/openhpi/liboa_soap.so.3 +lib/openhpi/liboa_soap.so.3.6.1 +lib/openhpi/libsimulator.a +lib/openhpi/libsimulator.so +lib/openhpi/libsimulator.so.3 +lib/openhpi/libsimulator.so.3.6.1 +lib/openhpi/libslave.a +lib/openhpi/libslave.so +lib/openhpi/libslave.so.3 +lib/openhpi/libslave.so.3.6.1 +lib/openhpi/libsnmp_bc.a +lib/openhpi/libsnmp_bc.so +lib/openhpi/libsnmp_bc.so.3 +lib/openhpi/libsnmp_bc.so.3.6.1 +lib/openhpi/libtest_agent.a +lib/openhpi/libtest_agent.so +lib/openhpi/libtest_agent.so.3 +lib/openhpi/libtest_agent.so.3.6.1 +libdata/pkgconfig/openhpi.pc +libdata/pkgconfig/openhpiutils.pc +man/man1/hpi_shell.1.gz +man/man1/hpialarms.1.gz +man/man1/hpicrypt.1.gz +man/man1/hpidomain.1.gz +man/man1/hpiel.1.gz +man/man1/hpievents.1.gz +man/man1/hpifan.1.gz +man/man1/hpigensimdata.1.gz +man/man1/hpiinv.1.gz +man/man1/hpionIBMblade.1.gz +man/man1/hpipower.1.gz +man/man1/hpireset.1.gz +man/man1/hpisensor.1.gz +man/man1/hpisettime.1.gz +man/man1/hpithres.1.gz +man/man1/hpitop.1.gz +man/man1/hpitree.1.gz +man/man1/hpiwdt.1.gz +man/man1/hpixml.1.gz +man/man1/ohdomainlist.1.gz +man/man1/ohhandler.1.gz +man/man1/ohparam.1.gz +man/man7/openhpi.7.gz +man/man8/openhpid.8.gz +sbin/openhpid +@comment %%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.daemon +@dir /var/lib/openhpi +@dir /var/lib