From owner-svn-src-user@FreeBSD.ORG Sun Oct 26 14:43:03 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB11DA19; Sun, 26 Oct 2014 14:43:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B76F9EF6; Sun, 26 Oct 2014 14:43:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9QEh3Ts035854; Sun, 26 Oct 2014 14:43:03 GMT (envelope-from jceel@FreeBSD.org) Received: (from jceel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9QEh32X035853; Sun, 26 Oct 2014 14:43:03 GMT (envelope-from jceel@FreeBSD.org) Message-Id: <201410261443.s9QEh32X035853@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jceel set sender to jceel@FreeBSD.org using -f From: Jakub Wojciech Klama Date: Sun, 26 Oct 2014 14:43:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r273692 - user/jceel/soc2014_evdev/head/sys/dev/usb/input X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Oct 2014 14:43:03 -0000 Author: jceel Date: Sun Oct 26 14:43:02 2014 New Revision: 273692 URL: https://svnweb.freebsd.org/changeset/base/273692 Log: Unbreak uep(4) when compiled without EVDEV. Modified: user/jceel/soc2014_evdev/head/sys/dev/usb/input/uep.c Modified: user/jceel/soc2014_evdev/head/sys/dev/usb/input/uep.c ============================================================================== --- user/jceel/soc2014_evdev/head/sys/dev/usb/input/uep.c Sun Oct 26 14:25:42 2014 (r273691) +++ user/jceel/soc2014_evdev/head/sys/dev/usb/input/uep.c Sun Oct 26 14:43:02 2014 (r273692) @@ -122,8 +122,10 @@ static usb_fifo_cmd_t uep_stop_read; static usb_fifo_open_t uep_open; static usb_fifo_close_t uep_close; +#ifdef EVDEV static evdev_open_t uep_ev_open; static evdev_close_t uep_ev_close; +#endif static void uep_put_queue(struct uep_softc *, u_char *); @@ -135,10 +137,12 @@ static struct usb_fifo_methods uep_fifo_ .basename[0] = "uep", }; +#ifdef EVDEV static struct evdev_methods uep_evdev_methods = { .ev_open = &uep_ev_open, .ev_close = &uep_ev_close, }; +#endif static int get_pkt_len(u_char *buf) @@ -484,6 +488,7 @@ uep_close(struct usb_fifo *fifo, int ffl } } +#ifdef EVDEV static void uep_ev_close(struct evdev_dev *evdev, void *ev_softc) { @@ -513,6 +518,7 @@ uep_ev_open(struct evdev_dev *evdev, voi return (0); } +#endif static devclass_t uep_devclass;