Menu
▾
▴
[Ltp-cvs] ltp/testcases/open_hpi_testsuite/plugins/ipmi Makefile.in, 1.1, 1.2 ipmi_control_event.c, 1.1, 1.2 ipmi_controls.c, 1.1, 1.2
|
From: Subrata <sub...@us...> - 2007-08-29 09:59:33
|
Update of /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmi In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5529/ltp/testcases/open_hpi_testsuite/plugins/ipmi Modified Files: Makefile.in ipmi_control_event.c ipmi_controls.c Log Message: Update to OpenHPI 2.9.3 (www.openhpi.org for more info) Index: ipmi_controls.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmi/ipmi_controls.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_controls.c 25 Jun 2007 15:44:53 -0000 1.1 --- ipmi_controls.c 29 Aug 2007 09:28:39 -0000 1.2 *************** *** 171,175 **** state->StateUnion.Oem.Body[4] = 0; state->StateUnion.Oem.Body[5] = 0; - state->StateUnion.Oem.Body[6] = 0; state->StateUnion.Oem.MId = ATCAHPI_PICMG_MID; state->StateUnion.Oem.BodyLength = 6; --- 171,174 ---- *************** *** 545,548 **** --- 544,585 ---- } + /** + * is_supported_color + * @hpi_color: HPI Color to test if supported + * @rdr: RDR object containing control record for LED. + * + * Check if hpi_color is supported by the LED associated with rdr. + * + * Return value: 0 if color is supported, 1 otherwise. + **/ + static int is_supported_color(AtcaHpiLedColorT hpi_color, + SaHpiRdrT *rdr) + { + AtcaHpiColorCapabilitiesT supported_colors = rdr->RdrTypeUnion.CtrlRec.TypeUnion.Oem.ConfigData[0]; + + switch(hpi_color) + { + case ATCAHPI_LED_COLOR_BLUE: + return ((supported_colors & ATCAHPI_LED_BLUE) != 0); + case ATCAHPI_LED_COLOR_RED: + return ((supported_colors & ATCAHPI_LED_RED) != 0); + case ATCAHPI_LED_COLOR_GREEN: + return ((supported_colors & ATCAHPI_LED_GREEN) != 0); + case ATCAHPI_LED_COLOR_AMBER: + return ((supported_colors & ATCAHPI_LED_AMBER) != 0); + case ATCAHPI_LED_COLOR_ORANGE: + return ((supported_colors & ATCAHPI_LED_ORANGE) != 0); + case ATCAHPI_LED_COLOR_WHITE: + return ((supported_colors & ATCAHPI_LED_WHITE) != 0); + case ATCAHPI_LED_COLOR_NO_CHANGE: + return 1; + case ATCAHPI_LED_COLOR_USE_DEFAULT: + return 1; + case ATCAHPI_LED_COLOR_RESERVED: + return 0; + } + + return 0; + } SaErrorT orig_set_control_state(struct oh_handler_state *handler, *************** *** 569,574 **** return SA_ERR_HPI_INVALID_DATA; } ! if (state->StateUnion.Oem.BodyLength != 7) { ! dbg("state->StateUnion.Oem.BodyLength(%d) != 7", state->StateUnion.Oem.BodyLength); return SA_ERR_HPI_INVALID_DATA; --- 606,611 ---- return SA_ERR_HPI_INVALID_DATA; } ! if (state->StateUnion.Oem.BodyLength != 6) { ! dbg("state->StateUnion.Oem.BodyLength(%d) != 6", state->StateUnion.Oem.BodyLength); return SA_ERR_HPI_INVALID_DATA; *************** *** 579,583 **** return SA_ERR_HPI_INVALID_DATA; } ! if (!(body[2] & rdr->RdrTypeUnion.CtrlRec.TypeUnion.Oem.ConfigData[0])) { /* LED doesn't support this color */ return SA_ERR_HPI_INVALID_DATA; --- 616,620 ---- return SA_ERR_HPI_INVALID_DATA; } ! if (!is_supported_color(body[2], rdr)) { /* LED doesn't support this color */ return SA_ERR_HPI_INVALID_DATA; Index: Makefile.in =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmi/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 25 Jun 2007 15:44:52 -0000 1.1 --- Makefile.in 29 Aug 2007 09:28:39 -0000 1.2 *************** *** 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, --- 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, *************** *** 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 --- 46,54 ---- *************** *** 97,119 **** atca_fru_rdrs.lo atca_shelf_fru.lo libipmi_la_OBJECTS = $(am_libipmi_la_OBJECTS) ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles 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 = $(libipmi_la_SOURCES) DIST_SOURCES = $(libipmi_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 --- 93,122 ---- atca_fru_rdrs.lo atca_shelf_fru.lo libipmi_la_OBJECTS = $(am_libipmi_la_OBJECTS) ! libipmi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ! $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ! $(libipmi_la_LDFLAGS) $(LDFLAGS) -o $@ ! DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles 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 = $(libipmi_la_SOURCES) DIST_SOURCES = $(libipmi_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 *************** *** 121,126 **** DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ - AMDEP_FALSE = @AMDEP_FALSE@ - AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ --- 124,127 ---- *************** *** 152,159 **** --- 153,162 ---- F77 = @F77@ FFLAGS = @FFLAGS@ + GREP = @GREP@ HPI_CLIENT_PKG = @HPI_CLIENT_PKG@ HPI_LIB_VERSION = @HPI_LIB_VERSION@ HPI_PKG = @HPI_PKG@ HPI_UTIL_PKG = @HPI_UTIL_PKG@ + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ *************** *** 171,181 **** 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@ --- 174,181 ---- MAKEINFO = @MAKEINFO@ MARSHALDIR = @MARSHALDIR@ + MKDIR_P = @MKDIR_P@ NOCFLAGS = @NOCFLAGS@ NOCXXFLAGS = @NOCXXFLAGS@ OBJEXT = @OBJEXT@ OPENHPI_INCLUDES = @OPENHPI_INCLUDES@ OPENIPMI_CFLAGS = @OPENIPMI_CFLAGS@ *************** *** 213,227 **** WITH_SNMP_BC = @WITH_SNMP_BC@ WITH_SYSFS = @WITH_SYSFS@ ac_configure_args = @ac_configure_args@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ - 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@ --- 213,224 ---- 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@ *************** *** 236,240 **** --- 233,241 ---- build_os = @build_os@ build_vendor = @build_vendor@ + builddir = @builddir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ found_pkg_config = @found_pkg_config@ *************** *** 244,247 **** --- 245,249 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 249,262 **** --- 251,270 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = ipmi.sym ekeyfru.h *************** *** 329,333 **** 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 \ --- 337,341 ---- 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 \ *************** *** 340,344 **** 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'"; \ --- 348,352 ---- 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'"; \ *************** *** 355,359 **** done libipmi.la: $(libipmi_la_OBJECTS) $(libipmi_la_DEPENDENCIES) ! $(LINK) -rpath $(pkglibdir) $(libipmi_la_LDFLAGS) $(libipmi_la_OBJECTS) $(libipmi_la_LIBADD) $(LIBS) mostlyclean-compile: --- 363,367 ---- done libipmi.la: $(libipmi_la_OBJECTS) $(libipmi_la_DEPENDENCIES) ! $(libipmi_la_LINK) -rpath $(pkglibdir) $(libipmi_la_OBJECTS) $(libipmi_la_LIBADD) $(LIBS) mostlyclean-compile: *************** *** 389,394 **** .c.o: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --- 397,402 ---- .c.o: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ *************** *** 396,401 **** .c.obj: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --- 404,409 ---- .c.obj: ! @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ! @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ *************** *** 403,408 **** .c.lo: ! @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --- 411,416 ---- .c.lo: ! @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ! @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ *************** *** 415,422 **** -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. --- 423,426 ---- *************** *** 450,455 **** fi; test -z "$$fail" ! mostlyclean-recursive clean-recursive distclean-recursive \ ! maintainer-clean-recursive: @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ --- 454,458 ---- fi; test -z "$$fail" ! $(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ *************** *** 552,571 **** 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; \ --- 555,573 ---- 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; \ *************** *** 581,585 **** if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ ! || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ --- 583,587 ---- if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ ! || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ *************** *** 589,592 **** --- 591,596 ---- top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ *************** *** 599,603 **** installdirs-am: for dir in "$(DESTDIR)$(pkglibdir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive --- 603,607 ---- installdirs-am: for dir in "$(DESTDIR)$(pkglibdir)"; do \ ! test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive *************** *** 635,639 **** -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-recursive --- 639,643 ---- -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-tags dvi: dvi-recursive *************** *** 649,658 **** --- 653,670 ---- 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: *************** *** 675,696 **** 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-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 # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 687,710 ---- 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-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 # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: ipmi_control_event.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/plugins/ipmi/ipmi_control_event.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ipmi_control_event.c 25 Jun 2007 15:44:53 -0000 1.1 --- ipmi_control_event.c 29 Aug 2007 09:28:39 -0000 1.2 *************** *** 81,85 **** default: dbg("strange color %d, return WHITE", ipmi_color); ! return ATCAHPI_LED_WHITE; } } --- 81,85 ---- default: dbg("strange color %d, return WHITE", ipmi_color); ! return ATCAHPI_LED_COLOR_WHITE; } } *************** *** 382,386 **** return 1; } ! rdr.RdrTypeUnion.CtrlRec.Num = ++info->ctrl_count; rid = oh_uid_lookup(&rdr.Entity); --- 382,408 ---- return 1; } ! if (strcasecmp((char *)rdr.IdString.Data, "blue led") == 0) { ! rdr.RdrTypeUnion.CtrlRec.Num = ATCAHPI_CTRL_NUM_BLUE_LED; ! } else if (strcasecmp((char *)rdr.IdString.Data, "led 1") == 0) { ! rdr.RdrTypeUnion.CtrlRec.Num = ATCAHPI_CTRL_NUM_LED1; ! } else if (strcasecmp((char *)rdr.IdString.Data, "led 2") == 0) { ! rdr.RdrTypeUnion.CtrlRec.Num = ATCAHPI_CTRL_NUM_LED2; ! } else if (strcasecmp((char *)rdr.IdString.Data, "led 3") == 0) { ! rdr.RdrTypeUnion.CtrlRec.Num = ATCAHPI_CTRL_NUM_LED3; ! } else if (strcasestr((char *)rdr.IdString.Data, "application-specific led ") == ! (char *)rdr.IdString.Data) { ! char *appnum = ! (char *)&rdr.IdString.Data[strlen("application-specific led ")]; ! if (strlen(appnum) <= 3) { ! rdr.RdrTypeUnion.CtrlRec.Num = ATCAHPI_CTRL_NUM_APP_LED + ! strtoul(appnum, NULL, 0); ! } else { ! dbg("Invalid data in LED Control\n"); ! return 1; ! } ! } else { ! dbg("Invalid data in LED Control\n"); ! return 1; ! } rid = oh_uid_lookup(&rdr.Entity); |