diff options
Diffstat (limited to 'usr/src/cmd/picl/plugins/sun4u/excalibur')
4 files changed, 23 insertions, 48 deletions
diff --git a/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile b/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile index afe5362311..e441499565 100644 --- a/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile @@ -28,7 +28,7 @@ include $(SRC)/Makefile.psm LIBRARY= libpiclenvd.a VERS= .1 -OBJECTS= piclenvd.o piclenvsetup.o +OBJECTS= piclenvd.o piclenvsetup.o # include library definitions include $(SRC)/lib/Makefile.lib @@ -53,12 +53,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= envmodel.info -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) $(LINTLIB) - CFLAGS += $(CCVERBOSE) DYNFLAGS += -R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins LDLIBS += -L$(SRC)/lib/libpicltree/$(MACH) @@ -79,7 +73,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg all: $(LIBS) $(LIBLINKS) @@ -109,11 +102,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/excalibur/envd/piclenvsetup.c b/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/piclenvsetup.c index c33b7ab029..64420e7306 100644 --- a/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/piclenvsetup.c +++ b/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/piclenvsetup.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This file contains code for setting up environmental related nodes * and properties in the PICL tree. @@ -133,7 +131,7 @@ static sensor_node_t sensor_nodes[] = { */ typedef struct { char *fan_name; /* fan name */ - env_fan_t *fanp; /* fan information */ + env_fan_t *fanp; /* fan information */ char *speed_unit; /* speed unit string */ picl_nodehdl_t nodeh; /* "fan" node handle */ picl_prophdl_t proph; /* "Speed" property handle */ @@ -203,7 +201,7 @@ get_current_target_temp(ptree_rarg_t *parg, void *buf) static int get_current_temp(ptree_rarg_t *parg, void *buf) { - tempr_t temp; + tempr_t temp; picl_prophdl_t proph; sensor_node_t *snodep; @@ -298,7 +296,7 @@ add_node_to_list(picl_nodehdl_t nodeh, node_list_t *listp) */ static node_list_t * get_node_list_by_class(picl_nodehdl_t nodeh, const char *classname, - node_list_t *listp) + node_list_t *listp) { int err; char clname[PICL_CLASSNAMELEN_MAX+1]; @@ -507,7 +505,7 @@ add_sensor_nodes_and_props(picl_nodehdl_t plath) * Skip if already initialized or no sensor info */ sensorp = snodep->sensorp; - if (snodep->nodeh != NULL || sensorp == NULL) + if (snodep->nodeh != 0 || sensorp == NULL) continue; /* @@ -628,18 +626,18 @@ delete_sensor_nodes_and_props(void) */ for (snodep = sensor_nodes; snodep->sensor_name != NULL; snodep++) { - if (snodep->sdev_proph != NULL) { + if (snodep->sdev_proph != 0) { (void) ptree_delete_prop(snodep->sdev_proph); (void) ptree_destroy_prop(snodep->sdev_proph); - snodep->sdev_proph = NULL; + snodep->sdev_proph = 0; } - if (snodep->nodeh != NULL) { + if (snodep->nodeh != 0) { /* delete node and all properties under it */ (void) ptree_delete_node(snodep->nodeh); (void) ptree_destroy_node(snodep->nodeh); - snodep->nodeh = NULL; - snodep->proph = NULL; + snodep->nodeh = 0; + snodep->proph = 0; } } } @@ -682,7 +680,7 @@ add_fan_nodes_and_props(picl_nodehdl_t plath) for (fnodep = fan_nodes; fnodep->fan_name != NULL; fnodep++) { /* Skip if already initialized or no fan info */ - if (fnodep->nodeh != NULL || fnodep->fanp == NULL) + if (fnodep->nodeh != 0 || fnodep->fanp == NULL) continue; /* @@ -731,9 +729,9 @@ add_fan_nodes_and_props(picl_nodehdl_t plath) */ pname = PICL_PROP_FAN_SPEED_UNIT; err = add_regular_prop(cnodeh, pname, - PICL_PTYPE_CHARSTRING, PICL_READ, - strlen(fnodep->speed_unit)+1, - (void *)fnodep->speed_unit, &proph); + PICL_PTYPE_CHARSTRING, PICL_READ, + strlen(fnodep->speed_unit)+1, + (void *)fnodep->speed_unit, &proph); if (err != PICL_SUCCESS) break; @@ -770,10 +768,10 @@ delete_fan_nodes_and_props(void) */ for (fnodep = fan_nodes; fnodep->fan_name != NULL; fnodep++) { - if (fnodep->nodeh != NULL) { + if (fnodep->nodeh != 0) { (void) ptree_delete_node(fnodep->nodeh); (void) ptree_destroy_node(fnodep->nodeh); - fnodep->nodeh = NULL; + fnodep->nodeh = 0; } } } @@ -806,7 +804,7 @@ get_envmodel_conf_file(char *outfilename) } (void) snprintf(pname, PATH_MAX, "%s/%s", PICLD_COMMON_PLUGIN_DIR, - ENVMODEL_CONF_FILE); + ENVMODEL_CONF_FILE); if (access(pname, R_OK) == 0) { (void) strlcpy(outfilename, pname, PATH_MAX); @@ -842,10 +840,10 @@ env_picl_setup(void) */ for (snodep = sensor_nodes; snodep->sensor_name != NULL; snodep++) { snodep->sensorp = sensor_lookup(snodep->sensor_name); - snodep->nodeh = NULL; - snodep->proph = NULL; - snodep->target_proph = NULL; - snodep->sdev_proph = NULL; + snodep->nodeh = 0; + snodep->proph = 0; + snodep->target_proph = 0; + snodep->sdev_proph = 0; } /* @@ -853,8 +851,8 @@ env_picl_setup(void) */ for (fnodep = fan_nodes; fnodep->fan_name != NULL; fnodep++) { fnodep->fanp = fan_lookup(fnodep->fan_name); - fnodep->nodeh = NULL; - fnodep->proph = NULL; + fnodep->nodeh = 0; + fnodep->proph = 0; } /* diff --git a/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile index 00fda41e12..1f9357e218 100644 --- a/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile @@ -39,8 +39,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 #INFOS= piclfrutree.info system-board.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -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/excalibur/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile index 799e66fc55..0cf1ee4f96 100644 --- a/usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile +++ b/usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile @@ -39,8 +39,6 @@ ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%) $(ROOTCONF) := FILEMODE = 0644 INFOS= piclfrutree.info system-board.info -ROOTLINTDIR = $(ROOTLIBDIR) - .KEEP_STATE: SUBDIRS= @@ -49,7 +47,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint all: $(CONF) @@ -63,9 +60,6 @@ $(CONF): $(INFOS) include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/picl/plugins/Makefile.targ -$(ROOTLINTDIR)/%: ../% - $(INS.file) - lint: $(SUBDIRS): FRC |