Date: Mon, 21 Mar 2016 21:14:05 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411620 - in head/sysutils: . openhpi openhpi/files Message-ID: <201603212114.u2LLE52t026987@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Mon Mar 21 21:14:05 2016 New Revision: 411620 URL: https://svnweb.freebsd.org/changeset/ports/411620 Log: Add sysutils/openhpi. 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. Added: head/sysutils/openhpi/ head/sysutils/openhpi/Makefile (contents, props changed) head/sysutils/openhpi/distinfo (contents, props changed) head/sysutils/openhpi/files/ head/sysutils/openhpi/files/openhpid.in (contents, props changed) head/sysutils/openhpi/files/patch-baselib-session.cpp (contents, props changed) head/sysutils/openhpi/files/patch-configure (contents, props changed) head/sysutils/openhpi/files/patch-plugins-dynamic_simulator-new_sim.cpp (contents, props changed) head/sysutils/openhpi/files/patch-plugins-ipmidirect-ipmi.cpp (contents, props changed) head/sysutils/openhpi/pkg-descr (contents, props changed) head/sysutils/openhpi/pkg-plist (contents, props changed) Modified: head/sysutils/Makefile Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Mon Mar 21 21:11:11 2016 (r411619) +++ head/sysutils/Makefile Mon Mar 21 21:14:05 2016 (r411620) @@ -626,6 +626,7 @@ SUBDIR += ods2 SUBDIR += ohmu SUBDIR += open + SUBDIR += openhpi SUBDIR += openipmi SUBDIR += openupsd SUBDIR += ori Added: head/sysutils/openhpi/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/openhpi/Makefile Mon Mar 21 21:14:05 2016 (r411620) @@ -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 <bsd.port.mk> Added: head/sysutils/openhpi/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/openhpi/distinfo Mon Mar 21 21:14:05 2016 (r411620) @@ -0,0 +1,2 @@ +SHA256 (openhpi-3.6.1.tar.gz) = e0a810cb401c4bdcfc9551f2e6afd5a8ca4b411f5ee3bc60c19f82fd6e84a3dc +SIZE (openhpi-3.6.1.tar.gz) = 7718590 Added: head/sysutils/openhpi/files/openhpid.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/openhpi/files/openhpid.in Mon Mar 21 21:14:05 2016 (r411620) @@ -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" Added: head/sysutils/openhpi/files/patch-baselib-session.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/openhpi/files/patch-baselib-session.cpp Mon Mar 21 21:14:05 2016 (r411620) @@ -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 Added: head/sysutils/openhpi/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/openhpi/files/patch-configure Mon Mar 21 21:14:05 2016 (r411620) @@ -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*) Added: head/sysutils/openhpi/files/patch-plugins-dynamic_simulator-new_sim.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/openhpi/files/patch-plugins-dynamic_simulator-new_sim.cpp Mon Mar 21 21:14:05 2016 (r411620) @@ -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)); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603212114.u2LLE52t026987>