Menu
▾
▴
[Ltp-cvs] ltp/testcases/open_hpi_testsuite/plugins/ipmidirect Makefile.in, 1.2, 1.3 hotswap.cpp, 1.1, 1.2 ipmi_discover.cpp, 1.1, 1.2 ipmi_domain.cpp, 1.1, 1.2 ipmi_domain.h, 1.1, 1.2 ipmi_entity.cpp, 1.1, 1.2 ipmi_entity.h, 1.1, 1.2 ipmi_fru_info.cpp, 1.1, 1.2 ipmi_fru_info.h, 1.1, 1.2 ipmi_mc.cpp, 1.1, 1.2 ipmi_mc.h, 1.1, 1.2 ipmi_mc_vendor.cpp, 1.1, 1.2 ipmi_mc_vendor_intel.cpp, 1.1, 1.2 ipmi_resource.cpp, 1.1, 1.2
|
From: Subrata <sub...@us...> - 2007-09-24 09:12:45
|
Update of /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16139/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect Modified Files: Makefile.in hotswap.cpp ipmi_discover.cpp ipmi_domain.cpp ipmi_domain.h ipmi_entity.cpp ipmi_entity.h ipmi_fru_info.cpp ipmi_fru_info.h ipmi_mc.cpp ipmi_mc.h ipmi_mc_vendor.cpp ipmi_mc_vendor_intel.cpp ipmi_resource.cpp Log Message: Update to OpenHPI 2.10.0 (see www.openhpi.org for more info) Index: ipmi_mc_vendor_intel.cpp =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_mc_vendor_intel.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_mc_vendor_intel.cpp 25 Jun 2007 15:44:55 -0000 1.1 --- ipmi_mc_vendor_intel.cpp 24 Sep 2007 09:12:00 -0000 1.2 *************** *** 61,65 **** } ! if (mc->IsAtcaBoard()) return true; /* * If here, the MC has (manuf_id == 0x000157) Intel, and --- 61,65 ---- } ! if (mc->IsTcaMc()) return true; /* * If here, the MC has (manuf_id == 0x000157) Intel, and *************** *** 88,92 **** int i; ! if (mc->IsAtcaBoard()) return true; for ( int j = 0; j < mc->NumResources(); j++ ) --- 88,92 ---- int i; ! if (mc->IsTcaMc()) return true; for ( int j = 0; j < mc->NumResources(); j++ ) *************** *** 164,168 **** << g_enableHSC << "\n"; ! if (mc->IsAtcaBoard()) return true; if (type == SAHPI_ENT_SYSTEM_BOARD) { --- 164,168 ---- << g_enableHSC << "\n"; ! if (mc->IsTcaMc()) return true; if (type == SAHPI_ENT_SYSTEM_BOARD) { Index: ipmi_fru_info.cpp =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_fru_info.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_fru_info.cpp 25 Jun 2007 15:44:54 -0000 1.1 --- ipmi_fru_info.cpp 24 Sep 2007 09:12:00 -0000 1.2 *************** *** 17,20 **** --- 17,24 ---- */ + extern "C" { + #include "SaHpiAtca.h" + } + #include <assert.h> #include "ipmi_fru_info.h" *************** *** 27,42 **** { SAHPI_ENT_PHYSICAL_SLOT, ! SAHPI_ENT_POWER_SUPPLY, ! SAHPI_ENT_EXTERNAL_ENVIRONMENT, ! SAHPI_ENT_SHELF_MANAGER, ! SAHPI_ENT_COOLING_UNIT, ! SAHPI_ENT_CHASSIS_SPECIFIC, ! (SaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC+1), ! (SaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC+2), ! (SaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC+3), ! (SaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC+4) }; ! if ( type > eIpmiAtcaSiteTypeRearTransitionModule ) { return SAHPI_ENT_UNKNOWN; --- 31,48 ---- { SAHPI_ENT_PHYSICAL_SLOT, ! SaHpiEntityTypeT(ATCAHPI_ENT_POWER_ENTRY_MODULE_SLOT), ! SaHpiEntityTypeT(ATCAHPI_ENT_SHELF_FRU_DEVICE_SLOT), ! SaHpiEntityTypeT(ATCAHPI_ENT_SHELF_MANAGER_SLOT), ! SaHpiEntityTypeT(ATCAHPI_ENT_FAN_TRAY_SLOT), ! SaHpiEntityTypeT(ATCAHPI_ENT_FAN_FILTER_TRAY_SLOT), ! SaHpiEntityTypeT(ATCAHPI_ENT_ALARM_SLOT), ! SaHpiEntityTypeT(ATCAHPI_ENT_AMC_SLOT), ! SaHpiEntityTypeT(ATCAHPI_ENT_PMC_SLOT), ! SaHpiEntityTypeT(ATCAHPI_ENT_RTM_SLOT), ! SaHpiEntityTypeT(ATCAHPI_ENT_SHELF_MANAGER_SLOT), ! SaHpiEntityTypeT(ATCAHPI_ENT_POWER_ENTRY_MODULE_SLOT) }; ! if ( type >= eIpmiAtcaSiteTypeUnknown ) { return SAHPI_ENT_UNKNOWN; Index: Makefile.in =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 29 Aug 2007 09:28:40 -0000 1.2 --- Makefile.in 24 Sep 2007 09:11:59 -0000 1.3 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 46,54 **** --- 46,58 ---- # + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c *************** *** 98,140 **** ipmi_text_buffer.lo ipmi_utils.lo ipmi_watchdog.lo thread.lo libipmidirect_la_OBJECTS = $(am_libipmidirect_la_OBJECTS) ! libipmidirect_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ ! $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ ! $(CXXFLAGS) $(libipmidirect_la_LDFLAGS) $(LDFLAGS) -o $@ ! DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ! --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ! --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ! $(LDFLAGS) -o $@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ! --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ! --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ! $(LDFLAGS) -o $@ SOURCES = $(libipmidirect_la_SOURCES) DIST_SOURCES = $(libipmidirect_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ ! install-dvi-recursive install-exec-recursive \ ! install-html-recursive install-info-recursive \ ! install-pdf-recursive install-ps-recursive install-recursive \ ! installcheck-recursive installdirs-recursive pdf-recursive \ ! ps-recursive uninstall-recursive ! RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ! distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AR = @AR@ --- 102,138 ---- ipmi_text_buffer.lo ipmi_utils.lo ipmi_watchdog.lo thread.lo libipmidirect_la_OBJECTS = $(am_libipmidirect_la_OBJECTS) ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ ! $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ! $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ ! $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ ! $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ! $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ! $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libipmidirect_la_SOURCES) DIST_SOURCES = $(libipmidirect_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ ! install-exec-recursive install-info-recursive \ ! install-recursive installcheck-recursive installdirs-recursive \ ! pdf-recursive ps-recursive uninstall-info-recursive \ ! uninstall-recursive ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ *************** *** 171,175 **** HPI_PKG = @HPI_PKG@ HPI_UTIL_PKG = @HPI_UTIL_PKG@ - INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ --- 169,172 ---- *************** *** 187,194 **** MAKEINFO = @MAKEINFO@ MARSHALDIR = @MARSHALDIR@ - MKDIR_P = @MKDIR_P@ NOCFLAGS = @NOCFLAGS@ NOCXXFLAGS = @NOCXXFLAGS@ OBJEXT = @OBJEXT@ OPENHPI_INCLUDES = @OPENHPI_INCLUDES@ OPENIPMI_CFLAGS = @OPENIPMI_CFLAGS@ --- 184,194 ---- MAKEINFO = @MAKEINFO@ MARSHALDIR = @MARSHALDIR@ NOCFLAGS = @NOCFLAGS@ NOCXXFLAGS = @NOCXXFLAGS@ OBJEXT = @OBJEXT@ + OH_DAEMON_ENABLED_FALSE = @OH_DAEMON_ENABLED_FALSE@ + OH_DAEMON_ENABLED_TRUE = @OH_DAEMON_ENABLED_TRUE@ + OPENHPID_STATIC_FALSE = @OPENHPID_STATIC_FALSE@ + OPENHPID_STATIC_TRUE = @OPENHPID_STATIC_TRUE@ OPENHPI_INCLUDES = @OPENHPI_INCLUDES@ OPENIPMI_CFLAGS = @OPENIPMI_CFLAGS@ *************** *** 226,237 **** WITH_SNMP_BC = @WITH_SNMP_BC@ WITH_SYSFS = @WITH_SYSFS@ - abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ ac_configure_args = @ac_configure_args@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ --- 226,237 ---- WITH_SNMP_BC = @WITH_SNMP_BC@ WITH_SYSFS = @WITH_SYSFS@ ac_configure_args = @ac_configure_args@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ + am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ *************** *** 246,250 **** build_os = @build_os@ build_vendor = @build_vendor@ - builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ --- 246,249 ---- *************** *** 275,283 **** sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in *~ core core.* INCLUDES = @OPENHPI_INCLUDES@ --- 274,279 ---- *************** *** 401,405 **** install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) ! test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ --- 397,401 ---- install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) ! test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ *************** *** 412,416 **** uninstall-pkglibLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ --- 408,412 ---- uninstall-pkglibLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ *************** *** 427,431 **** done libipmidirect.la: $(libipmidirect_la_OBJECTS) $(libipmidirect_la_DEPENDENCIES) ! $(libipmidirect_la_LINK) -rpath $(pkglibdir) $(libipmidirect_la_OBJECTS) $(libipmidirect_la_LIBADD) $(LIBS) mostlyclean-compile: --- 423,427 ---- done libipmidirect.la: $(libipmidirect_la_OBJECTS) $(libipmidirect_la_DEPENDENCIES) ! $(CXXLINK) -rpath $(pkglibdir) $(libipmidirect_la_LDFLAGS) $(libipmidirect_la_OBJECTS) $(libipmidirect_la_LIBADD) $(LIBS) mostlyclean-compile: *************** *** 475,480 **** .cpp.o: ! @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --- 471,476 ---- .cpp.o: ! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ *************** *** 482,487 **** .cpp.obj: ! @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --- 478,483 ---- .cpp.obj: ! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ *************** *** 489,494 **** .cpp.lo: ! @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --- 485,490 ---- .cpp.lo: ! @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ *************** *** 501,504 **** --- 497,504 ---- -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + uninstall-info-am: + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. *************** *** 532,536 **** fi; test -z "$$fail" ! $(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ --- 532,537 ---- fi; test -z "$$fail" ! mostlyclean-recursive clean-recursive distclean-recursive \ ! maintainer-clean-recursive: @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ *************** *** 633,651 **** distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ! list='$(DISTFILES)'; \ ! dist_files=`for file in $$list; do echo $$file; done | \ ! sed -e "s|^$$srcdirstrip/||;t" \ ! -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ! case $$dist_files in \ ! */*) $(MKDIR_P) `echo "$$dist_files" | \ ! sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ! sort -u` ;; \ ! esac; \ ! for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ --- 634,653 ---- distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ *************** *** 661,665 **** if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ ! || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ --- 663,667 ---- if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ ! || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ *************** *** 669,674 **** top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ distdir) \ || exit 1; \ --- 671,674 ---- *************** *** 681,685 **** installdirs-am: for dir in "$(DESTDIR)$(pkglibdir)"; do \ ! test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive --- 681,685 ---- installdirs-am: for dir in "$(DESTDIR)$(pkglibdir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive *************** *** 717,721 **** -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-tags dvi: dvi-recursive --- 717,721 ---- -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-recursive *************** *** 731,748 **** install-data-am: - install-dvi: install-dvi-recursive - install-exec-am: install-pkglibLTLIBRARIES - install-html: install-html-recursive - install-info: install-info-recursive install-man: - install-pdf: install-pdf-recursive - - install-ps: install-ps-recursive - installcheck-am: --- 731,740 ---- *************** *** 765,788 **** ps-am: ! uninstall-am: uninstall-pkglibLTLIBRARIES ! .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ! install-strip ! .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ! all all-am check check-am clean clean-generic clean-libtool \ ! clean-local clean-pkglibLTLIBRARIES ctags ctags-recursive \ distclean distclean-compile distclean-generic \ ! distclean-libtool distclean-tags distdir dvi dvi-am html \ ! html-am info info-am install install-am install-data \ ! install-data-am install-dvi install-dvi-am install-exec \ ! install-exec-am install-html install-html-am install-info \ ! install-info-am install-man install-pdf install-pdf-am \ ! install-pkglibLTLIBRARIES install-ps install-ps-am \ ! install-strip installcheck installcheck-am installdirs \ ! installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ! uninstall uninstall-am uninstall-pkglibLTLIBRARIES --- 757,779 ---- ps-am: ! uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES ! uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ ! clean clean-generic clean-libtool clean-local \ ! clean-pkglibLTLIBRARIES clean-recursive ctags ctags-recursive \ distclean distclean-compile distclean-generic \ ! distclean-libtool distclean-recursive distclean-tags distdir \ ! dvi dvi-am html html-am info info-am install install-am \ ! install-data install-data-am install-exec install-exec-am \ ! install-info install-info-am install-man \ ! install-pkglibLTLIBRARIES install-strip installcheck \ ! installcheck-am installdirs installdirs-am maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive \ mostlyclean mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ ! tags tags-recursive uninstall uninstall-am uninstall-info-am \ ! uninstall-pkglibLTLIBRARIES Index: ipmi_fru_info.h =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_fru_info.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_fru_info.h 25 Jun 2007 15:44:54 -0000 1.1 --- ipmi_fru_info.h 24 Sep 2007 09:12:00 -0000 1.2 *************** *** 38,41 **** --- 38,43 ---- eIpmiAtcaSiteTypePMC = 8, eIpmiAtcaSiteTypeRearTransitionModule = 9, + eIpmiAtcaSiteTypeMicroTcaCarrierHub = 10, + eIpmiAtcaSiteTypePowerModule = 11, eIpmiAtcaSiteTypeUnknown }; Index: ipmi_mc_vendor.cpp =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_mc_vendor.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_mc_vendor.cpp 25 Jun 2007 15:44:54 -0000 1.1 --- ipmi_mc_vendor.cpp 24 Sep 2007 09:12:00 -0000 1.2 *************** *** 515,518 **** --- 515,556 ---- instance -= 0x60; + switch (type) + { + default: + break; + + case eIpmiEntityIdPicMgFrontBoard: + type = SaHpiEntityTypeT(ATCAHPI_ENT_PICMG_FRONT_BLADE); + break; + + case eIpmiEntityIdPicMgRearTransitionModule: + type = SAHPI_ENT_BACK_PANEL_BOARD; + break; + + case eIpmiEntityIdPicMgAdvancedMcModule: + type = SaHpiEntityTypeT(ATCAHPI_ENT_AMC); + break; + + case eIpmiEntityIdPicMgMicroTcaCarrierHub: + type = SAHPI_ENT_SWITCH_BLADE; + break; + + case eIpmiEntityIdPicmgShelfManager: + type = SAHPI_ENT_SHELF_MANAGER; + break; + + case eIpmiEntityIdPicmgFiltrationUnit: + type = SaHpiEntityTypeT(ATCAHPI_ENT_FILTRATION_UNIT); + break; + + case eIpmiEntityIdPicmgShelfFruInformation: + type = SaHpiEntityTypeT(ATCAHPI_ENT_SHELF_FRU_DEVICE); + break; + + case eIpmiEntityIdPicmgAlarmPanel: + type = SAHPI_ENT_ALARM_MANAGER; + break; + } + bottom.SetEntry( 0, type, instance ); bottom.AppendRoot( 1 ); *************** *** 861,865 **** return true; ! if ( source_mc->IsAtcaBoard() ) { return CreateControlsAtca( domain, source_mc, sdrs ); --- 899,903 ---- return true; ! if ( source_mc->IsTcaMc() ) { return CreateControlsAtca( domain, source_mc, sdrs ); Index: ipmi_domain.h =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_domain.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_domain.h 25 Jun 2007 15:44:54 -0000 1.1 --- ipmi_domain.h 24 Sep 2007 09:11:59 -0000 1.2 *************** *** 123,131 **** } ! // true => ATCA ! bool m_is_atca; public: ! bool IsAtca() { return m_is_atca; } protected: --- 123,131 ---- } ! // true => TCA ! bool m_is_tca; public: ! bool IsTca() { return m_is_tca; } protected: *************** *** 195,199 **** bool m_bmc_discovered; ! SaErrorT CheckAtca(); public: --- 195,199 ---- bool m_bmc_discovered; ! SaErrorT CheckTca(); public: Index: ipmi_resource.cpp =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_resource.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_resource.cpp 25 Jun 2007 15:44:55 -0000 1.1 --- ipmi_resource.cpp 24 Sep 2007 09:12:00 -0000 1.2 *************** *** 161,165 **** // Reset supported on ATCA FRUs - Don't allow it on fru #0 of the active ShMC ! if ( m_mc->IsAtcaBoard() ) { if (!( (m_mc->GetAddress() == dIpmiBmcSlaveAddr) && (m_fru_id == 0) )) --- 161,165 ---- // Reset supported on ATCA FRUs - Don't allow it on fru #0 of the active ShMC ! if ( m_mc->IsTcaMc() ) { if (!( (m_mc->GetAddress() == dIpmiBmcSlaveAddr) && (m_fru_id == 0) )) Index: ipmi_mc.cpp =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_mc.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_mc.cpp 25 Jun 2007 15:44:54 -0000 1.1 --- ipmi_mc.cpp 24 Sep 2007 09:12:00 -0000 1.2 *************** *** 50,54 **** m_major_fw_revision( 0 ), m_minor_fw_revision( 0 ), m_major_version( 0 ), m_minor_version( 0 ), ! m_manufacturer_id( 0 ), m_product_id( 0 ), m_is_atca_board( false ), m_is_rms_board( false ) { stdlog << "adding MC: " << addr.m_channel << " " << addr.m_slave_addr << "\n"; --- 50,54 ---- m_major_fw_revision( 0 ), m_minor_fw_revision( 0 ), m_major_version( 0 ), m_minor_version( 0 ), ! m_manufacturer_id( 0 ), m_product_id( 0 ), m_is_tca_mc( false ), m_is_rms_board( false ) { stdlog << "adding MC: " << addr.m_channel << " " << addr.m_slave_addr << "\n"; *************** *** 270,274 **** m_sel->m_fetched = false; ! if (IsAtcaBoard()) { rv = m_sel->ClearSel(); if ( rv != SA_OK ) --- 270,274 ---- m_sel->m_fetched = false; ! if (IsTcaMc()) { rv = m_sel->ClearSel(); if ( rv != SA_OK ) *************** *** 304,308 **** } ! if ( event_rcvr && IsAtcaBoard()) { // This is a re-arm of all sensors of the MC --- 304,308 ---- } ! if ( event_rcvr && IsTcaMc()) { // This is a re-arm of all sensors of the MC *************** *** 402,406 **** void ! cIpmiMc::CheckAtca() { cIpmiMsg msg( eIpmiNetfnPicmg, eIpmiCmdGetPicMgProperties ); --- 402,406 ---- void ! cIpmiMc::CheckTca() { cIpmiMsg msg( eIpmiNetfnPicmg, eIpmiCmdGetPicMgProperties ); *************** *** 411,415 **** SaErrorT rv; ! m_is_atca_board = false; m_picmg_major = 0; m_picmg_minor = 0; --- 411,415 ---- SaErrorT rv; ! m_is_tca_mc = false; m_picmg_major = 0; m_picmg_minor = 0; *************** *** 419,423 **** if ( rv != SA_OK || rsp.m_data[0] || rsp.m_data[1] != dIpmiPicMgId ) { ! stdlog << "WARNING: MC " << m_addr.m_slave_addr << " is not an ATCA board !!!\n"; return; } --- 419,423 ---- if ( rv != SA_OK || rsp.m_data[0] || rsp.m_data[1] != dIpmiPicMgId ) { ! stdlog << "WARNING: MC " << m_addr.m_slave_addr << " is not a TCA MC !!!\n"; return; } *************** *** 428,437 **** if ( m_picmg_major == 2 ) { ! stdlog << "MC " << m_addr.m_slave_addr << " is an ATCA board, PICMG Extension version " << (int)m_picmg_major << "." << (int)m_picmg_minor << "\n"; ! m_is_atca_board = true; return; } ! stdlog << "WARNING: MC " << m_addr.m_slave_addr << " is not an ATCA board !!!\n"; return; } --- 428,443 ---- if ( m_picmg_major == 2 ) { ! stdlog << "MC " << m_addr.m_slave_addr << " is an ATCA MC, PICMG Extension version " << (int)m_picmg_major << "." << (int)m_picmg_minor << "\n"; ! m_is_tca_mc = true; ! return; ! } ! else if ( m_picmg_major == 5 ) ! { ! stdlog << "MC " << m_addr.m_slave_addr << " is a MicroTCA MC, PICMG Extension version " << (int)m_picmg_major << "." << (int)m_picmg_minor << "\n"; ! m_is_tca_mc = true; return; } ! stdlog << "WARNING: MC " << m_addr.m_slave_addr << " is not an ATCA MC !!!\n"; return; } Index: ipmi_entity.h =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_entity.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_entity.h 25 Jun 2007 15:44:54 -0000 1.1 --- ipmi_entity.h 24 Sep 2007 09:11:59 -0000 1.2 *************** *** 89,95 **** --- 89,97 ---- eIpmiEntityIdPicMgRearTransitionModule = 0xc0, eIpmiEntityIdPicMgAdvancedMcModule = 0xc1, + eIpmiEntityIdPicMgMicroTcaCarrierHub = 0xc2, eIpmiEntityIdPicmgShelfManager = 0xf0, eIpmiEntityIdPicmgFiltrationUnit = 0xf1, eIpmiEntityIdPicmgShelfFruInformation = 0xf2, + eIpmiEntityIdPicmgAlarmPanel = 0xf3, }; Index: ipmi_discover.cpp =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_discover.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_discover.cpp 25 Jun 2007 15:44:54 -0000 1.1 --- ipmi_discover.cpp 24 Sep 2007 09:11:59 -0000 1.2 *************** *** 325,334 **** } ! m_mc->CheckAtca(); ! if ( m_domain->IsAtca() ) { // If board is not ATCA, just give up ! if (!m_mc->IsAtcaBoard()) { m_mc->Cleanup(); --- 325,334 ---- } ! m_mc->CheckTca(); ! if ( m_domain->IsTca() ) { // If board is not ATCA, just give up ! if (!m_mc->IsTcaMc()) { m_mc->Cleanup(); Index: ipmi_domain.cpp =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_domain.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_domain.cpp 25 Jun 2007 15:44:54 -0000 1.1 --- ipmi_domain.cpp 24 Sep 2007 09:11:59 -0000 1.2 *************** *** 29,33 **** cIpmiDomain::cIpmiDomain() ! : m_con( 0 ), m_is_atca( false ), m_main_sdrs( 0 ), m_sensors_in_main_sdr( 0 ), m_major_version( 0 ), m_minor_version( 0 ), m_sdr_repository_support( false ), --- 29,33 ---- cIpmiDomain::cIpmiDomain() ! : m_con( 0 ), m_is_tca( false ), m_main_sdrs( 0 ), m_sensors_in_main_sdr( 0 ), m_major_version( 0 ), m_minor_version( 0 ), m_sdr_repository_support( false ), *************** *** 91,94 **** --- 91,100 ---- // rear transition module SetAtcaSiteProperty( eIpmiAtcaSiteTypeRearTransitionModule, prop, 32 ); + + // MicroTca Carrier Hub + SetAtcaSiteProperty( eIpmiAtcaSiteTypeMicroTcaCarrierHub, prop, 8 ); + + // Power Module + SetAtcaSiteProperty( eIpmiAtcaSiteTypePowerModule, prop, 8 ); } *************** *** 245,253 **** stdlog << "Domain ID " << m_did << "\n"; ! // check for ATCA an modify m_mc_to_check ! CheckAtca(); ! // Non ATCA system -> adjust BMC info ! if ( !m_is_atca ) { cIpmiFruInfo *fi = FindFruInfo( dIpmiBmcSlaveAddr, 0 ); --- 251,259 ---- stdlog << "Domain ID " << m_did << "\n"; ! // check for TCA an modify m_mc_to_check ! CheckTca(); ! // Non TCA system -> adjust BMC info ! if ( !m_is_tca ) { cIpmiFruInfo *fi = FindFruInfo( dIpmiBmcSlaveAddr, 0 ); *************** *** 271,275 **** // fails. stdlog << "could not get main SDRs, error " << rv << " !\n"; ! else if ( !m_is_atca ) { // for each mc device locator record in main repository --- 277,281 ---- // fails. stdlog << "could not get main SDRs, error " << rv << " !\n"; ! else if ( !m_is_tca ) { // for each mc device locator record in main repository *************** *** 446,450 **** SaErrorT ! cIpmiDomain::CheckAtca() { cIpmiMsg msg( eIpmiNetfnPicmg, eIpmiCmdGetPicMgProperties ); --- 452,456 ---- SaErrorT ! cIpmiDomain::CheckTca() { cIpmiMsg msg( eIpmiNetfnPicmg, eIpmiCmdGetPicMgProperties ); *************** *** 456,465 **** int i; ! m_is_atca = false; if ( !m_si_mc ) return SA_ERR_HPI_INTERNAL_ERROR; ! stdlog << "checking for ATCA system.\n"; rv = m_si_mc->SendCommand( msg, rsp ); --- 462,471 ---- int i; ! m_is_tca = false; if ( !m_si_mc ) return SA_ERR_HPI_INTERNAL_ERROR; ! stdlog << "checking for TCA system.\n"; rv = m_si_mc->SendCommand( msg, rsp ); *************** *** 467,471 **** if ( rv != SA_OK || rsp.m_data[0] || rsp.m_data[1] != dIpmiPicMgId ) { ! stdlog << "not an ATCA system.\n"; return (rv != SA_OK) ? rv : SA_ERR_HPI_INVALID_DATA; --- 473,477 ---- if ( rv != SA_OK || rsp.m_data[0] || rsp.m_data[1] != dIpmiPicMgId ) { ! stdlog << "not a TCA system.\n"; return (rv != SA_OK) ? rv : SA_ERR_HPI_INVALID_DATA; *************** *** 475,484 **** unsigned char major = rsp.m_data[2] & 0x0f; ! stdlog << "found a PicMg system version " << (unsigned int)major << "." << (unsigned int)minor << ".\n"; ! if ( major != 2 ) return SA_OK; ! ! stdlog << "found an ATCA system.\n"; // use atca timeout --- 481,497 ---- unsigned char major = rsp.m_data[2] & 0x0f; ! stdlog << "found a PICMG system, Extension Version " << (unsigned int)major << "." << (unsigned int)minor << ".\n"; ! switch ( major ) ! { ! default: return SA_OK; ! case 2: ! stdlog << "found an ATCA system.\n"; ! break; ! case 5: ! stdlog << "found a MicroTCA system.\n"; ! break; ! } // use atca timeout *************** *** 486,490 **** m_con->m_timeout = m_con_atca_timeout; ! m_is_atca = true; // read all fru addr --- 499,503 ---- m_con->m_timeout = m_con_atca_timeout; ! m_is_tca = true; // read all fru addr *************** *** 507,511 **** "AdvancedMC Module", "PMC", ! "Rear Transition Module" }; --- 520,526 ---- "AdvancedMC Module", "PMC", ! "Rear Transition Module", ! "MicroTCA Carrier Hub", ! "Power Module" }; *************** *** 619,624 **** cIpmiMc *mc = m_mcs[i]; ! // Event receiver on ATCA must be set to the active ShMc ! if ( IsAtca() ) { if ( mc->GetAddress() == dIpmiBmcSlaveAddr ) --- 634,639 ---- cIpmiMc *mc = m_mcs[i]; ! // Event receiver on TCA must be set to the active ShMc ! if ( IsTca() ) { if ( mc->GetAddress() == dIpmiBmcSlaveAddr ) Index: ipmi_entity.cpp =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_entity.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_entity.cpp 25 Jun 2007 15:44:54 -0000 1.1 --- ipmi_entity.cpp 24 Sep 2007 09:11:59 -0000 1.2 *************** *** 100,103 **** --- 100,106 ---- return "PicMgAdvancedMcModule"; + case eIpmiEntityIdPicMgMicroTcaCarrierHub: + return "PicMgMicroTcaCarrierHub"; + case eIpmiEntityIdPicmgShelfManager: return "PicmgShelfManager"; *************** *** 108,111 **** --- 111,118 ---- case eIpmiEntityIdPicmgShelfFruInformation: return "PicmgShelfFruInformation"; + + case eIpmiEntityIdPicmgAlarmPanel: + return "PicmgAlarmPanel"; + default: break; Index: hotswap.cpp =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/hotswap.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hotswap.cpp 25 Jun 2007 15:44:53 -0000 1.1 --- hotswap.cpp 24 Sep 2007 09:11:59 -0000 1.2 *************** *** 70,74 **** cIpmi::IfSetHotswapState( cIpmiResource *res, SaHpiHsStateT state ) { ! if ( !m_is_atca ) { stdlog << "ATCA not supported by SI !\n"; --- 70,74 ---- cIpmi::IfSetHotswapState( cIpmiResource *res, SaHpiHsStateT state ) { ! if ( !m_is_tca ) { stdlog << "ATCA not supported by SI !\n"; *************** *** 126,130 **** SaHpiHsActionT act ) { ! if ( !m_is_atca ) { stdlog << "ATCA not supported by SI !\n"; --- 126,130 ---- SaHpiHsActionT act ) { ! if ( !m_is_tca ) { stdlog << "ATCA not supported by SI !\n"; *************** *** 175,179 **** SaHpiTimeoutT timeout ) { ! if ( !m_is_atca ) { stdlog << "ATCA not supported by SI !\n"; --- 175,179 ---- SaHpiTimeoutT timeout ) { ! if ( !m_is_tca ) { stdlog << "ATCA not supported by SI !\n"; *************** *** 189,193 **** cIpmi::IfSetAutoInsertTimeout( SaHpiTimeoutT timeout ) { ! if ( !m_is_atca ) { stdlog << "ATCA not supported by SI !\n"; --- 189,193 ---- cIpmi::IfSetAutoInsertTimeout( SaHpiTimeoutT timeout ) { ! if ( !m_is_tca ) { stdlog << "ATCA not supported by SI !\n"; *************** *** 203,207 **** cIpmi::IfGetAutoExtractTimeout( cIpmiResource *res, SaHpiTimeoutT &timeout ) { ! if ( !m_is_atca ) { stdlog << "ATCA not supported by SI !\n"; --- 203,207 ---- cIpmi::IfGetAutoExtractTimeout( cIpmiResource *res, SaHpiTimeoutT &timeout ) { ! if ( !m_is_tca ) { stdlog << "ATCA not supported by SI !\n"; *************** *** 217,221 **** cIpmi::IfSetAutoExtractTimeout( cIpmiResource *res, SaHpiTimeoutT timeout ) { ! if ( !m_is_atca ) { stdlog << "ATCA not supported by SI !\n"; --- 217,221 ---- cIpmi::IfSetAutoExtractTimeout( cIpmiResource *res, SaHpiTimeoutT timeout ) { ! if ( !m_is_tca ) { stdlog << "ATCA not supported by SI !\n"; Index: ipmi_mc.h =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_mc.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_mc.h 25 Jun 2007 15:44:54 -0000 1.1 --- ipmi_mc.h 24 Sep 2007 09:12:00 -0000 1.2 *************** *** 122,126 **** unsigned char m_aux_fw_revision[4]; ! bool m_is_atca_board; bool m_is_rms_board; --- 122,126 ---- unsigned char m_aux_fw_revision[4]; ! bool m_is_tca_mc; bool m_is_rms_board; *************** *** 162,168 **** const cIpmiAddr &Addr() { return m_addr; } ! void CheckAtca(); ! bool IsAtcaBoard() { return m_is_atca_board; } bool &IsRmsBoard() { return m_is_rms_board; } --- 162,168 ---- const cIpmiAddr &Addr() { return m_addr; } ! void CheckTca(); ! bool IsTcaMc() { return m_is_tca_mc; } bool &IsRmsBoard() { return m_is_rms_board; } |