diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/cmd/picl/plugins/sun4v/piclsbl | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/cmd/picl/plugins/sun4v/piclsbl')
| -rw-r--r-- | usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile | 14 | ||||
| -rw-r--r-- | usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c | 14 |
2 files changed, 7 insertions, 21 deletions
diff --git a/usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile b/usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile index 92077496f7..e6b0cf842f 100644 --- a/usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile +++ b/usr/src/cmd/picl/plugins/sun4v/piclsbl/Makefile @@ -22,9 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/picl/plugins/sun4v/piclsbl/Makefile LIBRARY= libpiclsbl.a VERS= .1 @@ -39,16 +36,10 @@ include $(SRC)/cmd/picl/plugins/Makefile.com SRCS= $(OBJECTS:%.o=%.c) -LINT_SRC= $(LINTLIB:%.ln=%) - $(OBJS_DIR)/%.o: $(SRC)/sun4v/piclsbl/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -$(LINTS_DIR)/%.ln: $(SRC)/sun4v/piclsbl/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - - LIBS = $(DYNLIB) ROOT_PLATFORM = $(USR_PLAT_DIR)/sun4v @@ -57,8 +48,6 @@ DYNFLAGS_SUN4V = /usr/platform/sun4v/lib/picl/plugins DYNFLAGS_COM = /usr/lib/picl/plugins ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR) -CLEANFILES= $(LINTOUT) $(LINTLIB) - CPPFLAGS += -I$(SRC)/sun4v/piclsbl CPPFLAGS += -I$(SRC)/uts/common/sys CPPFLAGS += -I$(SRC)/lib/libpcp/common @@ -71,8 +60,6 @@ DYNFLAGS += -R$(DYNFLAGS_COM) LDLIBS += -lc -lpicltree -lumem -lnvpair -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -v - .KEEP_STATE: all: $(LIBS) $(LIBLINKS) @@ -90,6 +77,5 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ include $(SRC)/lib/Makefile.targ lint : - $(LINT.c) $(SRCS) FRC: diff --git a/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c b/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c index e70ea55d54..4d4e3233f4 100644 --- a/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c +++ b/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c @@ -192,12 +192,12 @@ check_raid(int target) /* * Ontario SBL event handler, subscribed to: - * PICLEVENT_SYSEVENT_DEVICE_ADDED - * PICLEVENT_SYSEVENT_DEVICE_REMOVED + * PICLEVENT_SYSEVENT_DEVICE_ADDED + * PICLEVENT_SYSEVENT_DEVICE_REMOVED */ static void piclsbl_handler(const char *ename, const void *earg, size_t size, - void *cookie) + void *cookie) { char *devfs_path; char hdd_location[PICL_PROPNAMELEN_MAX]; @@ -236,7 +236,7 @@ piclsbl_handler(const char *ename, const void *earg, size_t size, /* * retrieve the device's physical path from the event payload */ - if (nvlist_unpack((char *)earg, size, &nvlp, NULL)) + if (nvlist_unpack((char *)earg, size, &nvlp, 0)) goto sbl_return; if (nvlist_lookup_string(nvlp, "devfs-path", &devfs_path)) goto sbl_return; @@ -248,7 +248,7 @@ piclsbl_handler(const char *ename, const void *earg, size_t size, * otherwise, return as it is not one of our disks. */ lookup.path = strdup(devfs_path); - lookup.disk = NULL; + lookup.disk = 0; lookup.result = DISK_NOT_FOUND; /* first, find the disk */ @@ -315,7 +315,7 @@ piclsbl_handler(const char *ename, const void *earg, size_t size, * populate the message for libpcp */ send_msg.msg_type = PCP_SBL_CONTROL; - send_msg.sub_type = NULL; + send_msg.sub_type = 0; send_msg.msg_len = sizeof (pcp_sbl_req_t); send_msg.msg_data = (uint8_t *)req_ptr; @@ -387,7 +387,7 @@ piclsbl_init(void) return; /* retrieve the root node for lookups in the event handler */ - if ((ptree_get_root(&root_node)) != NULL) + if ((ptree_get_root(&root_node)) != 0) return; /* load libpcp */ |