diff options
Diffstat (limited to 'usr/src/cmd/picl/plugins/sun4v/mdesc')
| -rw-r--r-- | usr/src/cmd/picl/plugins/sun4v/mdesc/Makefile | 23 | ||||
| -rw-r--r-- | usr/src/cmd/picl/plugins/sun4v/mdesc/mdescplugin.c | 8 |
2 files changed, 5 insertions, 26 deletions
diff --git a/usr/src/cmd/picl/plugins/sun4v/mdesc/Makefile b/usr/src/cmd/picl/plugins/sun4v/mdesc/Makefile index e2adc58af5..fd05cab88f 100644 --- a/usr/src/cmd/picl/plugins/sun4v/mdesc/Makefile +++ b/usr/src/cmd/picl/plugins/sun4v/mdesc/Makefile @@ -23,10 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/picl/plugins/sun4v/mdesc/Makefile -# + LIBRARY= libmdescplugin.a VERS= .1 @@ -48,19 +45,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.com SRCS= $(OBJECTS:%.o=%.c) -LINT_SRC= ./mdescplugin.c ./init.c ./dr.c \ - ./cpu_prop_update.c ./disk_discovery.c \ - $(SRC)/common/mdesc/mdesc_findname.c \ - $(SRC)/common/mdesc/mdesc_findnodeprop.c \ - $(SRC)/common/mdesc/mdesc_fini.c \ - $(SRC)/common/mdesc/mdesc_getpropdata.c \ - $(SRC)/common/mdesc/mdesc_getpropstr.c \ - $(SRC)/common/mdesc/mdesc_getpropval.c \ - $(SRC)/common/mdesc/mdesc_init_intern.c \ - $(SRC)/common/mdesc/mdesc_nodecount.c \ - $(SRC)/common/mdesc/mdesc_rootnode.c \ - $(SRC)/common/mdesc/mdesc_scandag.c - $(OBJS_DIR)/%.o: $(SRC)/common/mdesc/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) @@ -74,8 +58,6 @@ DYNFLAGS_COM = /usr/lib/picl/plugins ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/common/mdesc CPPFLAGS += -I$(SRC)/uts/common/sys CPPFLAGS += -D_REENTRANT @@ -87,8 +69,6 @@ DYNFLAGS += -R$(DYNFLAGS_COM) LDLIBS += -lc -lpicltree -ldevinfo -lpicldevtree -lcfgadm -lnvpair -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -v - .KEEP_STATE: all: $(LIBS) $(LIBLINKS) @@ -103,6 +83,5 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(LINT_SRC) FRC: diff --git a/usr/src/cmd/picl/plugins/sun4v/mdesc/mdescplugin.c b/usr/src/cmd/picl/plugins/sun4v/mdesc/mdescplugin.c index f02c7af356..08c203a7f7 100644 --- a/usr/src/cmd/picl/plugins/sun4v/mdesc/mdescplugin.c +++ b/usr/src/cmd/picl/plugins/sun4v/mdesc/mdescplugin.c @@ -112,7 +112,7 @@ dr_handler(const char *ename, const void *earg, size_t size, void *cookie) return; } - if (nvlist_unpack((char *)earg, size, &nvlp, NULL)) { + if (nvlist_unpack((char *)earg, size, &nvlp, 0)) { return; } @@ -176,13 +176,13 @@ dsc_handler(const char *ename, const void *earg, size_t size, void *cookie) * retrieve the device's physical path from the event arg * and determine which disk (if any) we are working with */ - if (nvlist_unpack((char *)earg, size, &nvlp, NULL)) + if (nvlist_unpack((char *)earg, size, &nvlp, 0)) return; if (nvlist_lookup_string(nvlp, "devfs-path", &path)) return; lookup.path = strdup(path); - lookup.disk = NULL; + lookup.disk = 0; lookup.result = DISK_NOT_FOUND; status = ptree_walk_tree_by_class(root_node, "disk", (void *)&lookup, @@ -218,7 +218,7 @@ signal_devtree(void) size_t nvl_size; int status; - if (nvlist_alloc(&nvl, NV_UNIQUE_NAME_TYPE, NULL) != 0) + if (nvlist_alloc(&nvl, NV_UNIQUE_NAME_TYPE, 0) != 0) return; /* |