Author: jimharris
Date: Wed Jul 3 23:51:03 2013
New Revision: 252660
URL: http://svnweb.freebsd.org/changeset/base/252660
Log:
MFC r252268:
Break out code related to the reset command into a separate source file.
Sponsored by: Intel
Added:
stable/9/sbin/nvmecontrol/reset.c
- copied unchanged from r252268, head/sbin/nvmecontrol/reset.c
Modified:
stable/9/sbin/nvmecontrol/Makefile
stable/9/sbin/nvmecontrol/nvmecontrol.c
stable/9/sbin/nvmecontrol/nvmecontrol.h
Directory Properties:
stable/9/sbin/nvmecontrol/ (props changed)
Modified: stable/9/sbin/nvmecontrol/Makefile
==============================================================================
--- stable/9/sbin/nvmecontrol/Makefile Wed Jul 3 23:48:58 2013
(r252659)
+++ stable/9/sbin/nvmecontrol/Makefile Wed Jul 3 23:51:03 2013
(r252660)
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= nvmecontrol
-SRCS= nvmecontrol.c devlist.c identify.c perftest.c
+SRCS= nvmecontrol.c devlist.c identify.c perftest.c reset.c
MAN= nvmecontrol.8
.include <bsd.prog.mk>
Modified: stable/9/sbin/nvmecontrol/nvmecontrol.c
==============================================================================
--- stable/9/sbin/nvmecontrol/nvmecontrol.c Wed Jul 3 23:48:58 2013
(r252659)
+++ stable/9/sbin/nvmecontrol/nvmecontrol.c Wed Jul 3 23:51:03 2013
(r252660)
@@ -133,36 +133,6 @@ open_dev(const char *str, int *fd, int s
return (EX_OK);
}
-static void
-reset_usage(void)
-{
- fprintf(stderr, "usage:\n");
- fprintf(stderr, RESET_USAGE);
- exit(EX_USAGE);
-}
-
-static void
-reset_ctrlr(int argc, char *argv[])
-{
- int ch, fd;
-
- while ((ch = getopt(argc, argv, "")) != -1) {
- switch ((char)ch) {
- default:
- reset_usage();
- }
- }
-
- open_dev(argv[optind], &fd, 1, 1);
- if (ioctl(fd, NVME_RESET_CONTROLLER) < 0) {
- printf("Reset request to %s failed. errno=%d (%s)\n",
- argv[optind], errno, strerror(errno));
- exit(EX_IOERR);
- }
-
- exit(EX_OK);
-}
-
int
main(int argc, char *argv[])
{
@@ -177,7 +147,7 @@ main(int argc, char *argv[])
else if (strcmp(argv[1], "perftest") == 0)
perftest(argc-1, &argv[1]);
else if (strcmp(argv[1], "reset") == 0)
- reset_ctrlr(argc-1, &argv[1]);
+ reset(argc-1, &argv[1]);
usage();
Modified: stable/9/sbin/nvmecontrol/nvmecontrol.h
==============================================================================
--- stable/9/sbin/nvmecontrol/nvmecontrol.h Wed Jul 3 23:48:58 2013
(r252659)
+++ stable/9/sbin/nvmecontrol/nvmecontrol.h Wed Jul 3 23:51:03 2013
(r252660)
@@ -53,6 +53,7 @@ void read_namespace_data(int fd, int nsi
void devlist(int argc, char *argv[]);
void identify(int argc, char *argv[]);
void perftest(int argc, char *argv[]);
+void reset(int argc, char *argv[]);
#endif
Copied: stable/9/sbin/nvmecontrol/reset.c (from r252268,
head/sbin/nvmecontrol/reset.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/sbin/nvmecontrol/reset.c Wed Jul 3 23:51:03 2013
(r252660, copy of r252268, head/sbin/nvmecontrol/reset.c)
@@ -0,0 +1,71 @@
+/*-
+ * Copyright (C) 2012-2013 Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/ioccom.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <unistd.h>
+
+#include "nvmecontrol.h"
+
+static void
+reset_usage(void)
+{
+ fprintf(stderr, "usage:\n");
+ fprintf(stderr, RESET_USAGE);
+ exit(EX_USAGE);
+}
+
+void
+reset(int argc, char *argv[])
+{
+ int ch, fd;
+
+ while ((ch = getopt(argc, argv, "")) != -1) {
+ switch ((char)ch) {
+ default:
+ reset_usage();
+ }
+ }
+
+ open_dev(argv[optind], &fd, 1, 1);
+ if (ioctl(fd, NVME_RESET_CONTROLLER) < 0) {
+ printf("Reset request to %s failed. errno=%d (%s)\n",
+ argv[optind], errno, strerror(errno));
+ exit(EX_IOERR);
+ }
+
+ exit(EX_OK);
+}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
