[src/trunk]: src/sys/dev/usb Revert revision 1.3 "add sysctl support to firmw...

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

details:   https://anonhg.NetBSD.org/src/rev/7d2867d790ef
branches:  trunk
changeset: 555843:7d2867d790ef
user:      atatat <atatat%NetBSD.org@localhost>
date:      Mon Dec 01 01:09:24 2003 +0000

description:
Revert revision 1.3 "add sysctl support to firmware loader" by
"removing sysctl support from firmware loader".  It was never
referenced or called from anywhere...

Suggested by augustss%netbsd.org@localhost in private email.

diffstat:

 sys/dev/usb/ubtbcmfw.c |  30 ++----------------------------
 sys/dev/usb/ubtbcmfw.h |  48 ------------------------------------------------
 2 files changed, 2 insertions(+), 76 deletions(-)

diffs (107 lines):

diff -r aad1b52ab091 -r 7d2867d790ef sys/dev/usb/ubtbcmfw.c
--- a/sys/dev/usb/ubtbcmfw.c    Mon Dec 01 00:00:07 2003 +0000
+++ b/sys/dev/usb/ubtbcmfw.c    Mon Dec 01 01:09:24 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubtbcmfw.c,v 1.6 2003/06/29 22:30:55 fvdl Exp $        */
+/*     $NetBSD: ubtbcmfw.c,v 1.7 2003/12/01 01:09:24 atatat Exp $      */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubtbcmfw.c,v 1.6 2003/06/29 22:30:55 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubtbcmfw.c,v 1.7 2003/12/01 01:09:24 atatat Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,7 +54,6 @@
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
-#include <dev/usb/ubtbcmfw.h>
 
 /*
  * Download firmware to BCM2033.
@@ -295,28 +294,3 @@
        usbd_free_xfer(xfer);
        return (err);
 }
-
-int
-hw_dev_ubtbcmfw_sysctl(int *name, u_int nlen, void *oldp,
-    size_t *oldlenp, void *newp, size_t newlen, struct proc *p)
-{
-       int error;
-
-       /* Must be super user. */
-       error = suser(p->p_ucred, &p->p_acflag);
-       if (error)
-               return error;
-
-       /* all sysctl names at this level are terminal */
-       if (nlen != 1)
-               return (ENOTDIR);               /* overloaded */
-
-       switch (name[0]) {
-       case HW_DEV_UBTBCMFW_FWPATH:
-               return sysctl_string(oldp, oldlenp, newp, newlen,
-                   ubtbcmfw_fwpath, sizeof(ubtbcmfw_fwpath));
-       default:
-               return EOPNOTSUPP;
-       }
-}
-
diff -r aad1b52ab091 -r 7d2867d790ef sys/dev/usb/ubtbcmfw.h
--- a/sys/dev/usb/ubtbcmfw.h    Mon Dec 01 00:00:07 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*     $NetBSD: ubtbcmfw.h,v 1.1 2002/08/24 17:24:04 augustss Exp $    */
-
-/*
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by  Lennart Augustsson <lennart%augustsson.net@localhost>.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#define HW_DEV_UBTBCMFW_FWPATH 1
-#define HW_DEV_UBTBCMFW_MAXID  2
-
-#define HW_DEV_UBTBCMFW_NAMES { \
-       { 0, 0 }, \
-       { "fwpath", CTLTYPE_STRING }, \
-}
-
-int hw_dev_ubtbcmfw_sysctl(int *name, u_int nlen, void *oldp,
-       size_t *oldlenp, void *newp, size_t newlen, struct proc *p);