From owner-p4-projects@FreeBSD.ORG Tue Jul 28 08:33:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B69B1065670; Tue, 28 Jul 2009 08:33:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 127CD106566C for ; Tue, 28 Jul 2009 08:33:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EBC448FC0C for ; Tue, 28 Jul 2009 08:33:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6S8XIOe026262 for ; Tue, 28 Jul 2009 08:33:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6S8XIrs026260 for perforce@freebsd.org; Tue, 28 Jul 2009 08:33:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 28 Jul 2009 08:33:18 GMT Message-Id: <200907280833.n6S8XIrs026260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 166670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2009 08:33:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=166670 Change 166670 by hselasky@hselasky_laptop001 on 2009/07/28 08:32:40 Revert more local changes. Affected files ... .. //depot/projects/usb/src/share/man/man4/Makefile#1 branch .. //depot/projects/usb/src/sys/arm/conf/KB920X#20 integrate .. //depot/projects/usb/src/sys/kern/kern_conf.c#18 integrate .. //depot/projects/usb/src/sys/modules/sbni/Makefile#4 integrate .. //depot/projects/usb/src/sys/sys/conf.h#19 integrate .. //depot/projects/usb/src/usr.bin/usbhidctl/usbhid.c#3 integrate Differences ... ==== //depot/projects/usb/src/sys/arm/conf/KB920X#20 (text) ==== @@ -94,7 +94,6 @@ device icee device bpf - # USB support device ohci # OHCI localbus->USB interface device usb # USB Bus (required) @@ -105,7 +104,7 @@ device ural # Ralink Technology RT2500USB wireless NICs device rum # Ralink Technology RT2501USB wireless NICs device urio # Diamond Rio 500 MP3 player - +# USB Ethernet, requires miibus device miibus device aue # ADMtek USB Ethernet device axe # ASIX Electronics USB Ethernet ==== //depot/projects/usb/src/sys/kern/kern_conf.c#18 (text+ko) ==== @@ -264,7 +264,7 @@ #define dead_read (d_read_t *)enxio #define dead_write (d_write_t *)enxio #define dead_ioctl (d_ioctl_t *)enxio -#define dead_poll (d_poll_t *)devfs_no_poll +#define dead_poll (d_poll_t *)enodev #define dead_mmap (d_mmap_t *)enodev static void @@ -313,8 +313,8 @@ biofinish(bp, NULL, ENODEV); } -int -devfs_no_poll(struct cdev *dev __unused, int events, struct thread *td __unused) +static int +no_poll(struct cdev *dev __unused, int events, struct thread *td __unused) { return (poll_no_poll(events)); @@ -633,7 +633,7 @@ FIXUP(d_read, no_read, giant_read); FIXUP(d_write, no_write, giant_write); FIXUP(d_ioctl, no_ioctl, giant_ioctl); - FIXUP(d_poll, devfs_no_poll, giant_poll); + FIXUP(d_poll, no_poll, giant_poll); FIXUP(d_mmap, no_mmap, giant_mmap); FIXUP(d_strategy, no_strategy, giant_strategy); FIXUP(d_kqfilter, no_kqfilter, giant_kqfilter); ==== //depot/projects/usb/src/sys/modules/sbni/Makefile#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/sys/conf.h#19 (text+ko) ==== @@ -281,7 +281,6 @@ int devfs_set_cdevpriv(void *priv, cdevpriv_dtr_t dtr); void devfs_clear_cdevpriv(void); void devfs_fpdrop(struct file *fp); /* XXX This is not public KPI */ -d_poll_t devfs_no_poll; #define UID_ROOT 0 #define UID_BIN 3 ==== //depot/projects/usb/src/usr.bin/usbhidctl/usbhid.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: usbhid.c,v 1.14 2000/07/03 02:51:37 matt Exp $ */ -/* $FreeBSD: head/usr.bin/usbhidctl/usbhid.c 188945 2009-02-23 18:36:54Z thompsa $ */ +/* $FreeBSD: src/usr.bin/usbhidctl/usbhid.c,v 1.15 2009/06/23 23:16:00 delphij Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -91,16 +91,15 @@ void usage(void) { - extern char *__progname; fprintf(stderr, "usage: %s -f device " "[-l] [-n] [-r] [-t tablefile] [-v] [-x] name ...\n", - __progname); + getprogname()); fprintf(stderr, " %s -f device " "[-l] [-n] [-r] [-t tablefile] [-v] [-x] -a\n", - __progname); + getprogname()); exit(1); }