diff options
Diffstat (limited to 'usr/src/cmd/picl/plugins/sun4u/cherrystone')
7 files changed, 9 insertions, 57 deletions
diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/conf/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/conf/Makefile index 197b3a4b80..bc3320138c 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/conf/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/conf/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/picl/plugins/sun4u/cherrystone/conf/Makefile -# OBJECTS= @@ -44,16 +40,12 @@ install := FILEMODE = 0444 CONF= platsvcd.conf psvcobj.conf ROOTCONF= $(CONF:%=$(USR_PSM_LIB_DIR)/%) -SRCS= +SRCS= LIBS = $(DYNLIB) -CLEANFILES= $(LINTOUT) $(LINTLIB) - ZDEFS = -LINTFLAGS += - .KEEP_STATE: SUBDIRS= @@ -62,7 +54,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile index 1532dd3343..ed24f0138b 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile @@ -39,8 +39,6 @@ install := FILEMODE = 0444 CONF= picldevtree.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,9 +47,8 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -all: +all: install: $(ROOTLIBDIR) $(ROOTCONF) @@ -59,9 +56,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile index f53806da57..5461817470 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile @@ -38,9 +38,6 @@ CONF= libpiclfrudata.conf ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 - -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +46,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -59,9 +55,6 @@ install: $(ROOTLIBDIR) $(ROOTCONF) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile index f8cdfe960c..75a8b4c285 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile @@ -53,11 +53,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= $(CONF:%.conf=%.info) -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) CLOBBERFILES += $(LIBLINKS) DEVTREE_SRC_DIR = $(SRC)/cmd/picl/plugins/common/devtree @@ -78,7 +73,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) $(CONF) @@ -99,11 +93,7 @@ $(LIBLINKS): FRC include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/piclfrutree.c b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/piclfrutree.c index bc565320be..286567a046 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/piclfrutree.c +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/piclfrutree.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * PICL plug-in that creates the FRU Hierarchy for the * SUNW,Sun-Fire-480R (Cherrystone) platform @@ -267,8 +265,8 @@ picl_frutree_fini(void) * * It processes the following events: * - * PICLEVENT_SYSEVENT_DEVICE_ADDED - * PICLEVENT_SYSEVENT_DEVICE_REMOVED + * PICLEVENT_SYSEVENT_DEVICE_ADDED + * PICLEVENT_SYSEVENT_DEVICE_REMOVED */ /* ARGSUSED */ static void @@ -1024,10 +1022,10 @@ frudr_completion_handler(char *ename, void *earg, size_t size) * now frudata has been notified that the node is to be * removed, we can actually remove it */ - fruh = NULL; + fruh = 0; (void) nvlist_lookup_uint64(earg, PICLEVENTARG_FRUHANDLE, &fruh); - if (fruh != NULL) { + if (fruh != 0) { (void) remove_picl_node(fruh); } } @@ -1048,7 +1046,7 @@ post_frudr_event(char *ename, picl_nodehdl_t parenth, picl_nodehdl_t fruh) ev_name = strdup(ename); if (ev_name == NULL) return; - if (nvlist_alloc(&nvl, NV_UNIQUE_NAME_TYPE, NULL)) { + if (nvlist_alloc(&nvl, NV_UNIQUE_NAME_TYPE, 0)) { free(ev_name); return; } @@ -1111,7 +1109,7 @@ add_power_supply(int slotnum) return (err); /* Post picl-fru-added event */ - post_frudr_event(PICL_FRU_ADDED, NULL, powermodh); + post_frudr_event(PICL_FRU_ADDED, 0, powermodh); } } return (PICL_SUCCESS); @@ -1141,7 +1139,7 @@ remove_power_supply(int slotnum) } (void) ptree_destroy_node(powermodh); /* Post picl-fru-removed event */ - post_frudr_event(PICL_FRU_REMOVED, NULL, powermodh); + post_frudr_event(PICL_FRU_REMOVED, 0, powermodh); } return (PICL_SUCCESS); } diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcplugin/Makefile index 77267c4004..9c5e25dfe6 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcplugin/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcplugin/Makefile @@ -42,8 +42,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-480R ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u CPPFLAGS += -I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj CPPFLAGS += -D_REENTRANT @@ -56,8 +54,6 @@ DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib LDLIBS += -lc -lpicltree -lpicl -lpsvcobj -lpsvcplugin -LINTFLAGS += - .KEEP_STATE: SUBDIRS= @@ -69,7 +65,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -91,7 +86,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcpolicy/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcpolicy/Makefile index fbc632dfb6..827839e69e 100644 --- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcpolicy/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/psvcpolicy/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libpsvcpolicy_psr.a VERS= .1 @@ -43,8 +41,6 @@ LIBS = $(DYNLIB) PLATFORM=SUNW,Sun-Fire-480R -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/uts/sun4u CPPFLAGS += -I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj CPPFLAGS += -D_REENTRANT @@ -59,8 +55,6 @@ DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib LDLIBS += -lpicltree -lpsvcobj -lpsvcplugin LDLIBS += -lc -ldevice -ldevinfo -lHBAAPI -LINTFLAGS += - .KEEP_STATE: PLATLIBS= $(USR_PLAT_DIR)/$(PLATFORM)/lib/ @@ -76,7 +70,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -107,7 +100,6 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(SYMLINK) ./libpsvcpolicy_psr.so$(VERS) $(USR_PSM_LIB_DIR)/libpsvcpolicy_psr.so lint : - $(LINT.c) $(SRCS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) |