[src/trunk]: src/sys/rump/dev/lib/libugenhc rename rumpcomp_user.* -> ugenhc_...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d5c097a72789
branches:  trunk
changeset: 327617:d5c097a72789
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Mar 13 01:38:11 2014 +0000

description:
rename rumpcomp_user.* -> ugenhc_user.*

diffstat:

 sys/rump/dev/lib/libugenhc/Makefile        |   4 +-
 sys/rump/dev/lib/libugenhc/rumpcomp_user.c |  54 ------------------------------
 sys/rump/dev/lib/libugenhc/rumpcomp_user.h |  28 ---------------
 sys/rump/dev/lib/libugenhc/ugenhc.c        |   6 +-
 sys/rump/dev/lib/libugenhc/ugenhc_user.c   |  54 ++++++++++++++++++++++++++++++
 sys/rump/dev/lib/libugenhc/ugenhc_user.h   |  28 +++++++++++++++
 6 files changed, 87 insertions(+), 87 deletions(-)

diffs (225 lines):

diff -r 0822c13b6141 -r d5c097a72789 sys/rump/dev/lib/libugenhc/Makefile
--- a/sys/rump/dev/lib/libugenhc/Makefile       Thu Mar 13 01:34:06 2014 +0000
+++ b/sys/rump/dev/lib/libugenhc/Makefile       Thu Mar 13 01:38:11 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2013/09/19 17:55:22 pooka Exp $
+#      $NetBSD: Makefile,v 1.8 2014/03/13 01:38:11 pooka Exp $
 #
 
 LIB=   rumpdev_ugenhc
@@ -8,7 +8,7 @@
 
 CPPFLAGS+=     -I${RUMPTOP}/librump/rumpkern
 
-RUMPCOMP_USER= #ioctl
+RUMPCOMP_USER_SRCS=    ugenhc_user.c
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r 0822c13b6141 -r d5c097a72789 sys/rump/dev/lib/libugenhc/rumpcomp_user.c
--- a/sys/rump/dev/lib/libugenhc/rumpcomp_user.c        Thu Mar 13 01:34:06 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*     $NetBSD: rumpcomp_user.c,v 1.6 2013/07/04 10:09:55 pooka Exp $  */
-
-/*
- * Copyright (c) 2007-2010 Antti Kantee.  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 ``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.
- */
-#ifndef _KERNEL
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-#include <rump/rumpuser_component.h>
-
-#include "rumpcomp_user.h"
-
-int
-rumpcomp_ugenhc_ioctl(int fd, u_long cmd, void *data, int *ioctlrv)
-{
-       void *cookie;
-       int rv;
-
-       cookie = rumpuser_component_unschedule();
-       *ioctlrv = ioctl(fd, cmd, data);
-       if (*ioctlrv == -1)
-               rv = errno;
-       else
-               rv = 0;
-       rumpuser_component_schedule(cookie);
-
-       return rumpuser_component_errtrans(rv);
-}
-#endif
diff -r 0822c13b6141 -r d5c097a72789 sys/rump/dev/lib/libugenhc/rumpcomp_user.h
--- a/sys/rump/dev/lib/libugenhc/rumpcomp_user.h        Thu Mar 13 01:34:06 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*     $NetBSD: rumpcomp_user.h,v 1.1 2013/04/28 09:58:11 pooka Exp $  */
-
-/*
- * Copyright (c) 2007-2010 Antti Kantee.  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 ``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.
- */
-
-int    rumpcomp_ugenhc_ioctl(int, u_long, void *, int *);
diff -r 0822c13b6141 -r d5c097a72789 sys/rump/dev/lib/libugenhc/ugenhc.c
--- a/sys/rump/dev/lib/libugenhc/ugenhc.c       Thu Mar 13 01:34:06 2014 +0000
+++ b/sys/rump/dev/lib/libugenhc/ugenhc.c       Thu Mar 13 01:38:11 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ugenhc.c,v 1.16 2013/09/13 20:38:39 joerg Exp $        */
+/*     $NetBSD: ugenhc.c,v 1.17 2014/03/13 01:38:11 pooka Exp $        */
 
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  All Rights Reserved.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.16 2013/09/13 20:38:39 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.17 2014/03/13 01:38:11 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -81,7 +81,7 @@
 
 #include <rump/rumpuser.h>
 
-#include "rumpcomp_user.h"
+#include "ugenhc_user.h"
 
 #include "rump_private.h"
 #include "rump_dev_private.h"
diff -r 0822c13b6141 -r d5c097a72789 sys/rump/dev/lib/libugenhc/ugenhc_user.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libugenhc/ugenhc_user.c  Thu Mar 13 01:38:11 2014 +0000
@@ -0,0 +1,54 @@
+/*     $NetBSD: ugenhc_user.c,v 1.1 2014/03/13 01:38:11 pooka Exp $    */
+
+/*
+ * Copyright (c) 2007-2010 Antti Kantee.  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 ``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.
+ */
+#ifndef _KERNEL
+#include <sys/types.h>
+#include <sys/ioctl.h>
+
+#include <errno.h>
+#include <unistd.h>
+
+#include <rump/rumpuser_component.h>
+
+#include "ugenhc_user.h"
+
+int
+rumpcomp_ugenhc_ioctl(int fd, u_long cmd, void *data, int *ioctlrv)
+{
+       void *cookie;
+       int rv;
+
+       cookie = rumpuser_component_unschedule();
+       *ioctlrv = ioctl(fd, cmd, data);
+       if (*ioctlrv == -1)
+               rv = errno;
+       else
+               rv = 0;
+       rumpuser_component_schedule(cookie);
+
+       return rumpuser_component_errtrans(rv);
+}
+#endif
diff -r 0822c13b6141 -r d5c097a72789 sys/rump/dev/lib/libugenhc/ugenhc_user.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libugenhc/ugenhc_user.h  Thu Mar 13 01:38:11 2014 +0000
@@ -0,0 +1,28 @@
+/*     $NetBSD: ugenhc_user.h,v 1.1 2014/03/13 01:38:11 pooka Exp $    */
+
+/*
+ * Copyright (c) 2007-2010 Antti Kantee.  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 ``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.
+ */
+
+int    rumpcomp_ugenhc_ioctl(int, u_long, void *, int *);